The following commit has been merged in the master branch:
commit 1346da1c52e2a3c260925df919b25ff291a4cd97
Author: andrei zavada <[email protected]>
Date: Tue Oct 2 20:04:25 2012 +0000
rename some dirs in src
diff --git a/src/Makefile.am b/src/Makefile.am
index 39a8c46..9e0b465 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
SUBDIRS = \
- common libsigproc libsigfile libica \
+ common sigproc libsigfile ica \
expdesign model \
ui tools
@@ -19,7 +19,7 @@ aghermann_LDADD = \
model/libmodel.a \
expdesign/libexpdesign.a \
libsigfile/libsigfile.la \
- libsigproc/libsigproc.a \
+ sigproc/libsigproc.a \
common/libcommon.a \
$(FFTW3_LIBS) $(ITPP_LIBS) $(GTK_LIBS) $(GSL_LIBS) $(LIBCONFIGXX_LIBS) \
$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
diff --git a/src/libica/Makefile.am b/src/ica/Makefile.am
similarity index 100%
rename from src/libica/Makefile.am
rename to src/ica/Makefile.am
diff --git a/src/libica/ica.hh b/src/ica/ica.hh
similarity index 98%
rename from src/libica/ica.hh
rename to src/ica/ica.hh
index 0a97f00..dfef037 100644
--- a/src/libica/ica.hh
+++ b/src/ica/ica.hh
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: libica/ica.hh
+ * File name: ica/ica.hh
* Project: Aghermann
* Author: Andrei Zavada <[email protected]>
* Initial version: 2011-10-13
diff --git a/src/libsigfile/edf.hh b/src/libsigfile/edf.hh
index ed2c76b..927a2e6 100644
--- a/src/libsigfile/edf.hh
+++ b/src/libsigfile/edf.hh
@@ -23,7 +23,7 @@
#include <map>
#include <stdexcept>
-#include "../libsigproc/sigproc.hh"
+#include "../sigproc/sigproc.hh"
#include "channel.hh"
#include "source-base.hh"
diff --git a/src/libsigfile/mc.hh b/src/libsigfile/mc.hh
index b386e6f..fc3abc0 100644
--- a/src/libsigfile/mc.hh
+++ b/src/libsigfile/mc.hh
@@ -15,7 +15,7 @@
#ifndef _SIGFILE_MC_H
#define _SIGFILE_MC_H
-#include "../libsigproc/ext-filters.hh"
+#include "../sigproc/ext-filters.hh"
#include "forward-decls.hh"
#include "page-metrics-base.hh"
diff --git a/src/libsigfile/psd.cc b/src/libsigfile/psd.cc
index a96d459..6e7930f 100644
--- a/src/libsigfile/psd.cc
+++ b/src/libsigfile/psd.cc
@@ -24,7 +24,7 @@
#include "../common/lang.hh"
#include "../common/fs.hh"
-#include "../libsigproc/sigproc.hh"
+#include "../sigproc/sigproc.hh"
#include "psd.hh"
#include "source.hh"
diff --git a/src/libsigproc/Makefile.am b/src/sigproc/Makefile.am
similarity index 100%
rename from src/libsigproc/Makefile.am
rename to src/sigproc/Makefile.am
diff --git a/src/libsigproc/exstrom.cc b/src/sigproc/exstrom.cc
similarity index 100%
rename from src/libsigproc/exstrom.cc
rename to src/sigproc/exstrom.cc
diff --git a/src/libsigproc/exstrom.com/bwbs.c b/src/sigproc/exstrom.com/bwbs.c
similarity index 100%
rename from src/libsigproc/exstrom.com/bwbs.c
rename to src/sigproc/exstrom.com/bwbs.c
diff --git a/src/libsigproc/exstrom.com/liir.c b/src/sigproc/exstrom.com/liir.c
similarity index 100%
rename from src/libsigproc/exstrom.com/liir.c
rename to src/sigproc/exstrom.com/liir.c
diff --git a/src/libsigproc/exstrom.com/rdf.c b/src/sigproc/exstrom.com/rdf.c
similarity index 100%
rename from src/libsigproc/exstrom.com/rdf.c
rename to src/sigproc/exstrom.com/rdf.c
diff --git a/src/libsigproc/exstrom.hh b/src/sigproc/exstrom.hh
similarity index 100%
rename from src/libsigproc/exstrom.hh
rename to src/sigproc/exstrom.hh
diff --git a/src/libsigproc/ext-filters.cc b/src/sigproc/ext-filters.cc
similarity index 100%
rename from src/libsigproc/ext-filters.cc
rename to src/sigproc/ext-filters.cc
diff --git a/src/libsigproc/ext-filters.hh b/src/sigproc/ext-filters.hh
similarity index 100%
rename from src/libsigproc/ext-filters.hh
rename to src/sigproc/ext-filters.hh
diff --git a/src/libsigproc/sigproc.cc b/src/sigproc/sigproc.cc
similarity index 100%
rename from src/libsigproc/sigproc.cc
rename to src/sigproc/sigproc.cc
diff --git a/src/libsigproc/sigproc.hh b/src/sigproc/sigproc.hh
similarity index 100%
rename from src/libsigproc/sigproc.hh
rename to src/sigproc/sigproc.hh
diff --git a/src/libsigproc/sigproc.ii b/src/sigproc/sigproc.ii
similarity index 100%
rename from src/libsigproc/sigproc.ii
rename to src/sigproc/sigproc.ii
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 92ca253..d49d896 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -9,7 +9,7 @@ edfcat_SOURCES = \
edfcat.cc
edfcat_LDADD = \
../libsigfile/libsigfile.la \
- ../libsigproc/libsigproc.a \
+ ../sigproc/libsigproc.a \
../common/libcommon.a \
$(FFTW3_LIBS) $(ITPP_LIBS) $(GSL_LIBS) \
$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
@@ -18,7 +18,7 @@ edfhed_SOURCES = \
edfhed.cc
edfhed_LDADD = \
../libsigfile/libsigfile.la \
- ../libsigproc/libsigproc.a \
+ ../sigproc/libsigproc.a \
../common/libcommon.a \
$(FFTW3_LIBS) $(ITPP_LIBS) $(GSL_LIBS) \
$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
@@ -29,7 +29,7 @@ edfhed_gtk_CXXFLAGS = \
$(AM_CXXFLAGS) $(GTK_CFLAGS) -DPACKAGE_DATADIR=\"$(datadir)\"
edfhed_gtk_LDADD = \
../libsigfile/libsigfile.la \
- ../libsigproc/libsigproc.a \
+ ../sigproc/libsigproc.a \
../common/libcommon.a \
../ui/libaghui.a \
$(FFTW3_LIBS) $(ITPP_LIBS) $(GTK_LIBS) $(GSL_LIBS) \
diff --git a/src/ui/scoring-facility-channel.cc
b/src/ui/scoring-facility-channel.cc
index fd6490a..1ebda36 100644
--- a/src/ui/scoring-facility-channel.cc
+++ b/src/ui/scoring-facility-channel.cc
@@ -15,7 +15,7 @@
#include "../common/lang.hh"
#include "../common/config-validate.hh"
-#include "../libsigproc/exstrom.hh"
+#include "../sigproc/exstrom.hh"
#include "globals.hh"
#include "scoring-facility.hh"
diff --git a/src/ui/scoring-facility-ica.cc b/src/ui/scoring-facility-ica.cc
index eab1711..2641c14 100644
--- a/src/ui/scoring-facility-ica.cc
+++ b/src/ui/scoring-facility-ica.cc
@@ -13,7 +13,7 @@
#include <unistd.h>
#include <itpp/base/algebra/inv.h>
-#include "../libica/ica.hh"
+#include "../ica/ica.hh"
#include "misc.hh"
#include "scoring-facility.hh"
#include "scoring-facility_cb.hh"
diff --git a/src/ui/scoring-facility.hh b/src/ui/scoring-facility.hh
index 2b45bb5..509dfd3 100644
--- a/src/ui/scoring-facility.hh
+++ b/src/ui/scoring-facility.hh
@@ -18,10 +18,10 @@
#include <gtk/gtk.h>
#include "../common/config-validate.hh"
-#include "../libsigproc/sigproc.hh"
+#include "../sigproc/sigproc.hh"
#include "../libsigfile/page-metrics-base.hh"
#include "../expdesign/primaries.hh"
-#include "../libica/ica.hh"
+#include "../ica/ica.hh"
#include "globals.hh"
#include "expdesign.hh"
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
