[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 26b21a4662040680b51a9345ebe0f68b7652dd39
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Thu Oct 4 02:33:46 2012 +0300

    sort out make complaints about linking against libsigfile.so object

diff --git a/src/Makefile.am b/src/Makefile.am
index 9e0b465..00093b8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ aghermann_LDADD = \
 	ui/libaghui.a \
 	model/libmodel.a \
 	expdesign/libexpdesign.a \
-	libsigfile/libsigfile.la \
+	libsigfile/libsigfile.a \
 	sigproc/libsigproc.a \
 	common/libcommon.a \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(GTK_LIBS) $(GSL_LIBS) $(LIBCONFIGXX_LIBS) \
diff --git a/src/libsigfile/Makefile.am b/src/libsigfile/Makefile.am
index 0889448..71a4344 100644
--- a/src/libsigfile/Makefile.am
+++ b/src/libsigfile/Makefile.am
@@ -4,6 +4,12 @@ AM_CXXFLAGS = \
 
 pkglib_LTLIBRARIES = \
 	libsigfile.la
+
+noinst_LIBRARIES = \
+	libsigfile.a
+libsigfile_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
@@ -27,8 +33,8 @@ libsigfile_la_SOURCES = \
 	psd.hh \
 	mc.cc \
 	mc.hh
-# libsigfile_a_SOURCES = \
-# 	$(libsigfile_la_SOURCES)
+libsigfile_a_SOURCES = \
+	$(libsigfile_la_SOURCES)
 
 # libsigfile_la_parts = \
 # 	source-base.o \
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index d49d896..73dc74a 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = \
 edfcat_SOURCES = \
 	edfcat.cc
 edfcat_LDADD = \
-	../libsigfile/libsigfile.la \
+	../libsigfile/libsigfile.a \
 	../sigproc/libsigproc.a \
 	../common/libcommon.a \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(GSL_LIBS) \
@@ -17,7 +17,7 @@ edfcat_LDADD = \
 edfhed_SOURCES = \
 	edfhed.cc
 edfhed_LDADD = \
-	../libsigfile/libsigfile.la \
+	../libsigfile/libsigfile.a \
 	../sigproc/libsigproc.a \
 	../common/libcommon.a \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(GSL_LIBS) \
@@ -28,7 +28,7 @@ edfhed_gtk_SOURCES = \
 edfhed_gtk_CXXFLAGS = \
 	$(AM_CXXFLAGS) 	$(GTK_CFLAGS) -DPACKAGE_DATADIR=\"$(datadir)\"
 edfhed_gtk_LDADD = \
-	../libsigfile/libsigfile.la \
+	../libsigfile/libsigfile.a \
 	../sigproc/libsigproc.a \
 	../common/libcommon.a \
 	../ui/libaghui.a \

-- 
Sleep experiment manager