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

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 2a968c44c1ef2401e49fa864fb510ef397f40f6e
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Fri May 24 16:25:40 2013 +0300

    make actual use of libsigfile.so, ignore portability warnings

diff --git a/src/aghermann/Makefile.am b/src/aghermann/Makefile.am
index 114fb83..82302c0 100644
--- a/src/aghermann/Makefile.am
+++ b/src/aghermann/Makefile.am
@@ -30,15 +30,18 @@ aghermann_LDADD := \
 	rk1968/liba.a \
 	patterns/liba.a \
 	metrics/liba.a \
-	../libsigfile/liba.a \
 	../sigproc/liba.a \
 	../common/liba.a \
 	expdesign/liba.a \
+	../libsigfile/libsigfile.la \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
 	$(GTK_LIBS) $(CAIRO_LIBS) $(UNIQUE_LIBS) $(VTE_LIBS) \
 	$(LIBCONFIGXX_LIBS) \
 	$(LIBFFTW3_LDADD) $(OPENMP_CXXFLAGS)
 
+aghermann_LDFLAGS := \
+	-shared
+
 install-exec-hook:
 	rm -f $(DESTDIR)/$(pkglibdir)/*.la
 uninstall-hook:
diff --git a/src/libsigfile/Makefile.am b/src/libsigfile/Makefile.am
index 8ddffb1..1272ad9 100644
--- a/src/libsigfile/Makefile.am
+++ b/src/libsigfile/Makefile.am
@@ -6,15 +6,6 @@ AM_CXXFLAGS := \
 pkglib_LTLIBRARIES := \
 	libsigfile.la
 
-noinst_LIBRARIES := \
-	liba.a
-liba_a_CXXFLAGS = $(AM_CXXFLAGS)
-# see http://www.gnu.org/software/automake/manual/html_node/Objects-created-both-with-libtool-and-without.html#Objects-created-both-with-libtool-and-without
-
-# noinst_RELOCATABLES = \
-# 	libsigfile.o
-# two days knocking about, googling it: no, thank you
-
 libsigfile_la_SOURCES := \
 	forward-decls.hh \
 	channel.cc \
@@ -28,24 +19,11 @@ libsigfile_la_SOURCES := \
 	edf.hh \
 	page.cc \
 	page.hh
-liba_a_SOURCES := \
-	$(libsigfile_la_SOURCES)
-
-# libsigfile_la_parts = \
-# 	source-base.o \ ...
 
 libsigfile_la_LDFLAGS := \
 	-avoid-version \
 	-rpath $(libdir)/$(PACKAGE) \
-	-module
-
-# libsigfile.la: $(libsigfile_la_parts)
-# 	$(LINK) -shared -o $@ -Wl,-whole-archive $(libsigfile_la_parts) -no-whole-archive \
-# 	-avoid-version \
-# 	-rpath $(libdir)/$(PACKAGE) \
-# 	$(FFTW3_LIBS) $(LIBFFTW3_LDADD) $(GSL_LIBS) \
-# 	-Ur
-# I will give $10 to anyone knows how to do it
+	-shared -module
 
 # libsigfileincdir = $(includedir)/libsigfile
 # libsigfileinc_HEADERS = \
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 66509d3..56e8dc7 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -10,18 +10,18 @@ bin_PROGRAMS := \
 edfcat_SOURCES := \
 	edfcat.cc
 edfcat_LDADD := \
-	../libsigfile/liba.a \
 	../sigproc/liba.a \
 	../common/liba.a \
+	../libsigfile/libsigfile.la \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
 	$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
 
 edfhed_SOURCES := \
 	edfhed.cc
 edfhed_LDADD := \
-	../libsigfile/liba.a \
 	../sigproc/liba.a \
 	../common/liba.a \
+	../libsigfile/libsigfile.la \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
 	$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
 
@@ -30,9 +30,9 @@ edfhed_gtk_SOURCES := \
 edfhed_gtk_CXXFLAGS := \
 	$(AM_CXXFLAGS) 	$(GTK_CFLAGS) -DPACKAGE_DATADIR=\"$(datadir)\"
 edfhed_gtk_LDADD := \
-	../libsigfile/liba.a \
 	../sigproc/liba.a \
 	../common/liba.a \
+	../libsigfile/libsigfile.la \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
 	$(GTK_LIBS) \
 	$(OPENMP_LDADD) $(LIBFFTW3_LDADD)

-- 
Sleep experiment manager