[med-svn] [SCM] aghermann branch, master, updated. 99b1d5a023eee9df74b0e0d6f894516fc79435ad

Andrei Zavada johnhommer at gmail.com
Sun Jul 7 23:03:56 UTC 2013 

The following commit has been merged in the master branch:
commit ab1d8fe457e8493046fbf5aadebcb677bdc506e6
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Tue Jun 18 16:14:34 2013 +0300

    make sigproc a shared lib

diff --git a/configure.ac b/configure.ac
index 5352535..8b38781 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,7 +192,7 @@ AC_OUTPUT([
 	Makefile
 	src/Makefile
 	src/common/Makefile
-	src/sigproc/Makefile
+	src/libsigproc/Makefile
 	src/libsigfile/Makefile
 
 	src/aghermann/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 936d0cd..4e7cc8d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS := \
-	common sigproc libsigfile \
+	common libsigproc libsigfile \
 	aghermann \
 	tools
diff --git a/src/aghermann/Makefile.am b/src/aghermann/Makefile.am
index cb7dcca..9d3491c 100644
--- a/src/aghermann/Makefile.am
+++ b/src/aghermann/Makefile.am
@@ -35,7 +35,7 @@ aghermann_LDADD := \
 	rk1968/liba.a \
 	patterns/liba.a \
 	metrics/liba.a \
-	../sigproc/liba.a \
+	../libsigproc/libsigproc.la \
 	../common/liba.a \
 	expdesign/liba.a \
 	../libsigfile/libsigfile.la \
diff --git a/src/aghermann/expdesign/primaries.hh b/src/aghermann/expdesign/primaries.hh
index c969b92..0ee5989 100644
--- a/src/aghermann/expdesign/primaries.hh
+++ b/src/aghermann/expdesign/primaries.hh
@@ -24,7 +24,7 @@
 
 #include "common/config-validate.hh"
 #include "common/subject_id.hh"
-#include "sigproc/winfun.hh"
+#include "libsigproc/winfun.hh"
 #include "aghermann/metrics/bands.hh"
 #include "aghermann/model/achermann.hh"
 
diff --git a/src/aghermann/metrics/mc-artifacts.cc b/src/aghermann/metrics/mc-artifacts.cc
index 8d31a3c..12e40bc 100644
--- a/src/aghermann/metrics/mc-artifacts.cc
+++ b/src/aghermann/metrics/mc-artifacts.cc
@@ -14,7 +14,7 @@
 
 #include "common/lang.hh"
 #include "common/alg.hh"
-#include "sigproc/sigproc.hh"
+#include "libsigproc/sigproc.hh"
 #include "mc.hh"
 #include "mc-artifacts.hh"
 
diff --git a/src/aghermann/metrics/mc-artifacts.hh b/src/aghermann/metrics/mc-artifacts.hh
index 820acaa..efe91e3 100644
--- a/src/aghermann/metrics/mc-artifacts.hh
+++ b/src/aghermann/metrics/mc-artifacts.hh
@@ -15,7 +15,7 @@
 
 #include <vector>
 #include <valarray>
-#include "sigproc/sigproc.hh"
+#include "libsigproc/sigproc.hh"
 
 #if HAVE_CONFIG_H && !defined(VERSION)
 #  include "config.h"
diff --git a/src/aghermann/metrics/mc.hh b/src/aghermann/metrics/mc.hh
index fb14e18..5e17f8d 100644
--- a/src/aghermann/metrics/mc.hh
+++ b/src/aghermann/metrics/mc.hh
@@ -14,7 +14,7 @@
 #ifndef _METRICS_MC_H
 #define _METRICS_MC_H
 
-#include "sigproc/ext-filters.hh"
+#include "libsigproc/ext-filters.hh"
 #include "forward-decls.hh"
 #include "page-metrics-base.hh"
 
diff --git a/src/aghermann/metrics/psd.cc b/src/aghermann/metrics/psd.cc
index ccdb5fe..f7c9861 100644
--- a/src/aghermann/metrics/psd.cc
+++ b/src/aghermann/metrics/psd.cc
@@ -24,7 +24,7 @@
 
 #include "common/lang.hh"
 #include "common/fs.hh"
-#include "sigproc/sigproc.hh"
+#include "libsigproc/sigproc.hh"
 #include "libsigfile/source.hh"
 #include "psd.hh"
 
diff --git a/src/aghermann/metrics/psd.hh b/src/aghermann/metrics/psd.hh
index 2599f56..b70401f 100644
--- a/src/aghermann/metrics/psd.hh
+++ b/src/aghermann/metrics/psd.hh
@@ -19,7 +19,7 @@
 
 #include <fftw3.h>
 
-#include "sigproc/winfun.hh"
+#include "libsigproc/winfun.hh"
 #include "forward-decls.hh"
 #include "page-metrics-base.hh"
 
diff --git a/src/aghermann/metrics/swu.cc b/src/aghermann/metrics/swu.cc
index effb9bc..70fa4de 100644
--- a/src/aghermann/metrics/swu.cc
+++ b/src/aghermann/metrics/swu.cc
@@ -16,7 +16,7 @@
 
 #include "common/lang.hh"
 #include "common/fs.hh"
-#include "sigproc/sigproc.hh"
+#include "libsigproc/sigproc.hh"
 #include "libsigfile/source.hh"
 #include "swu.hh"
 
diff --git a/src/aghermann/patterns/patterns.hh b/src/aghermann/patterns/patterns.hh
index cc24886..5b40ef6 100644
--- a/src/aghermann/patterns/patterns.hh
+++ b/src/aghermann/patterns/patterns.hh
@@ -18,7 +18,7 @@
 
 #include <gsl/gsl_math.h>
 
-#include "sigproc/sigproc.hh"
+#include "libsigproc/sigproc.hh"
 
 #if HAVE_CONFIG_H && !defined(VERSION)
 #  include "config.h"
diff --git a/src/aghermann/ui/sf/channel.cc b/src/aghermann/ui/sf/channel.cc
index ed9782a..1e5754a 100644
--- a/src/aghermann/ui/sf/channel.cc
+++ b/src/aghermann/ui/sf/channel.cc
@@ -14,7 +14,7 @@
 
 #include "common/lang.hh"
 #include "common/config-validate.hh"
-#include "sigproc/exstrom.hh"
+#include "libsigproc/exstrom.hh"
 #include "aghermann/metrics/bands.hh"
 #include "aghermann/ui/globals.hh"
 
diff --git a/src/aghermann/ui/sf/sf.hh b/src/aghermann/ui/sf/sf.hh
index 6baf103..0eaf85a 100644
--- a/src/aghermann/ui/sf/sf.hh
+++ b/src/aghermann/ui/sf/sf.hh
@@ -20,8 +20,8 @@
 
 #include "common/alg.hh"
 #include "common/config-validate.hh"
-#include "sigproc/winfun.hh"
-#include "sigproc/sigproc.hh"
+#include "libsigproc/winfun.hh"
+#include "libsigproc/sigproc.hh"
 #include "aghermann/patterns/patterns.hh"
 #include "aghermann/metrics/mc-artifacts.hh"
 #include "aghermann/expdesign/primaries.hh"
diff --git a/src/libsigfile/Makefile.am b/src/libsigfile/Makefile.am
index 392ad08..ac733a1 100644
--- a/src/libsigfile/Makefile.am
+++ b/src/libsigfile/Makefile.am
@@ -1,7 +1,6 @@
 AM_CXXFLAGS := \
-	-Wall -std=c++0x -fno-rtti -shared \
-	-I$(top_srcdir)/src \
-	-fPIC
+	-Wall -std=c++0x -fno-rtti -shared -fPIC \
+	-I$(top_srcdir)/src
 
 pkglib_LTLIBRARIES := \
 	libsigfile.la
diff --git a/src/libsigfile/edf.hh b/src/libsigfile/edf.hh
index e9b4393..c917f29 100644
--- a/src/libsigfile/edf.hh
+++ b/src/libsigfile/edf.hh
@@ -22,7 +22,7 @@
 #include <map>
 #include <stdexcept>
 
-#include "sigproc/sigproc.hh"
+#include "libsigproc/sigproc.hh"
 #include "channel.hh"
 #include "source-base.hh"
 
diff --git a/src/libsigfile/source-base.hh b/src/libsigfile/source-base.hh
index 2ee2be4..945d3f0 100644
--- a/src/libsigfile/source-base.hh
+++ b/src/libsigfile/source-base.hh
@@ -15,7 +15,7 @@
 #include "common/fs.hh"
 #include "common/alg.hh"
 #include "common/subject_id.hh"
-#include "sigproc/winfun.hh"
+#include "libsigproc/winfun.hh"
 #include "channel.hh"
 
 #if HAVE_CONFIG_H && !defined(VERSION)
diff --git a/src/sigproc/Makefile.am b/src/libsigproc/Makefile.am
similarity index 65%
rename from src/sigproc/Makefile.am
rename to src/libsigproc/Makefile.am
index 85be06e..ce51628 100644
--- a/src/sigproc/Makefile.am
+++ b/src/libsigproc/Makefile.am
@@ -1,15 +1,21 @@
 AM_CXXFLAGS := \
-	-Wall -std=c++0x -fno-rtti \
+	-Wall -std=c++0x -fno-rtti -shared -fPIC \
 	-I$(top_srcdir)/src
 
-noinst_LIBRARIES := liba.a
+pkglib_LTLIBRARIES := \
+	libsigproc.la
 
-liba_a_SOURCES := \
+libsigproc_la_SOURCES := \
 	exstrom.cc exstrom.hh \
 	ext-filters.cc ext-filters.hh ext-filters.ii \
 	sigproc.cc sigproc.hh sigproc.ii \
 	winfun.cc winfun.hh
 
+libsigproc_la_LDFLAGS := \
+	-avoid-version \
+	-rpath $(libdir)/$(PACKAGE) \
+	-shared -module
+
 if DO_PCH
 BUILT_SOURCES := \
 	ext-filters.hh.gch \
diff --git a/src/sigproc/exstrom.cc b/src/libsigproc/exstrom.cc
similarity index 100%
rename from src/sigproc/exstrom.cc
rename to src/libsigproc/exstrom.cc
diff --git a/src/sigproc/exstrom.com/bwbs.c b/src/libsigproc/exstrom.com/bwbs.c
similarity index 100%
rename from src/sigproc/exstrom.com/bwbs.c
rename to src/libsigproc/exstrom.com/bwbs.c
diff --git a/src/sigproc/exstrom.com/liir.c b/src/libsigproc/exstrom.com/liir.c
similarity index 100%
rename from src/sigproc/exstrom.com/liir.c
rename to src/libsigproc/exstrom.com/liir.c
diff --git a/src/sigproc/exstrom.com/rdf.c b/src/libsigproc/exstrom.com/rdf.c
similarity index 100%
rename from src/sigproc/exstrom.com/rdf.c
rename to src/libsigproc/exstrom.com/rdf.c
diff --git a/src/sigproc/exstrom.hh b/src/libsigproc/exstrom.hh
similarity index 100%
rename from src/sigproc/exstrom.hh
rename to src/libsigproc/exstrom.hh
diff --git a/src/sigproc/ext-filters.cc b/src/libsigproc/ext-filters.cc
similarity index 100%
rename from src/sigproc/ext-filters.cc
rename to src/libsigproc/ext-filters.cc
diff --git a/src/sigproc/ext-filters.hh b/src/libsigproc/ext-filters.hh
similarity index 100%
rename from src/sigproc/ext-filters.hh
rename to src/libsigproc/ext-filters.hh
diff --git a/src/sigproc/ext-filters.ii b/src/libsigproc/ext-filters.ii
similarity index 100%
rename from src/sigproc/ext-filters.ii
rename to src/libsigproc/ext-filters.ii
diff --git a/src/sigproc/sigproc.cc b/src/libsigproc/sigproc.cc
similarity index 100%
rename from src/sigproc/sigproc.cc
rename to src/libsigproc/sigproc.cc
diff --git a/src/sigproc/sigproc.hh b/src/libsigproc/sigproc.hh
similarity index 100%
rename from src/sigproc/sigproc.hh
rename to src/libsigproc/sigproc.hh
diff --git a/src/sigproc/sigproc.ii b/src/libsigproc/sigproc.ii
similarity index 100%
rename from src/sigproc/sigproc.ii
rename to src/libsigproc/sigproc.ii
diff --git a/src/sigproc/winfun.cc b/src/libsigproc/winfun.cc
similarity index 100%
rename from src/sigproc/winfun.cc
rename to src/libsigproc/winfun.cc
diff --git a/src/sigproc/winfun.hh b/src/libsigproc/winfun.hh
similarity index 100%
rename from src/sigproc/winfun.hh
rename to src/libsigproc/winfun.hh
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 7a49e35..a74ea21 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -12,7 +12,7 @@ edfcat_SOURCES := \
 edfcat_LDADD := \
 	../libsigfile/libsigfile.la \
 	../common/liba.a \
-	../sigproc/liba.a \
+	../libsigproc/libsigproc.la \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
 	$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
 
@@ -21,7 +21,7 @@ edfhed_SOURCES := \
 edfhed_LDADD := \
 	../libsigfile/libsigfile.la \
 	../common/liba.a \
-	../sigproc/liba.a \
+	../libsigproc/libsigproc.la \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
 	$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
 
@@ -32,7 +32,7 @@ edfhed_gtk_CXXFLAGS := \
 edfhed_gtk_LDADD := \
 	../libsigfile/libsigfile.la \
 	../common/liba.a \
-	../sigproc/liba.a \
+	../libsigproc/libsigproc.la \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
 	$(GTK_LIBS) \
 	$(OPENMP_LDADD) $(LIBFFTW3_LDADD)

-- 
Sleep experiment manager

More information about the debian-med-commit mailing list