The following commit has been merged in the master branch:
commit a216ce3d210cee56931602c6ca9002954fe1eb85
Author: Andrei Zavada <[email protected]>
Date: Wed May 29 10:45:48 2013 +0300
tools/Makefile.am: correct deps in *_LDADD
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 56e8dc7..7a49e35 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -10,18 +10,18 @@ bin_PROGRAMS := \
edfcat_SOURCES := \
edfcat.cc
edfcat_LDADD := \
- ../sigproc/liba.a \
- ../common/liba.a \
../libsigfile/libsigfile.la \
+ ../common/liba.a \
+ ../sigproc/liba.a \
$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
edfhed_SOURCES := \
edfhed.cc
edfhed_LDADD := \
- ../sigproc/liba.a \
- ../common/liba.a \
../libsigfile/libsigfile.la \
+ ../common/liba.a \
+ ../sigproc/liba.a \
$(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 := \
- ../sigproc/liba.a \
- ../common/liba.a \
../libsigfile/libsigfile.la \
+ ../common/liba.a \
+ ../sigproc/liba.a \
$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
$(GTK_LIBS) \
$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
