[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461
andrei zavada
johnhommer at gmail.com
Fri Nov 16 00:50:38 UTC 2012
The following commit has been merged in the master branch:
commit 17eb0d83cfd82b31a054d2957c2c8f43ef51fcc3
Author: andrei zavada <johnhommer at gmail.com>
Date: Sun Oct 28 23:00:14 2012 +0200
Makefile tweaks
diff --git a/data/Makefile.am b/data/Makefile.am
index e7a2386..a2968ba 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,18 +11,16 @@ ui_DATA := \
idle-bg.svg
CLEANFILES := \
- aghermann.desktop edfhed-gtk.desktop \
- aghermann.gresource
+ aghermann.desktop edfhed-gtk.desktop
EXTRA_DIST := \
aghermann.png \
aghermann.desktop.in edfhed-gtk.desktop.in \
icon.svg \
aghermann.gresource.xml \
- session-chooser.glade main.glade dialogs.glade.in \
+ session-chooser.glade main.glade dialogs.glade \
sf.glade mf.glade edfhed.glade \
- idle-bg.svg aghermann.png equations1.png equation-uc.png
-
+ idle-bg.svg equations1.png equation-uc.png
GRESOURCES := \
session-chooser.glade main.glade dialogs.glade \
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 3da0b98..fe299ee 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,10 +1,11 @@
-AM_CXXFLAGS = \
- -Wall -std=c++0x
+AM_CXXFLAGS := \
+ -Wall -std=c++0x \
+ -I$(top_srcdir)/src
-noinst_LIBRARIES = \
+noinst_LIBRARIES := \
libcommon.a
-libcommon_a_SOURCES = \
+libcommon_a_SOURCES := \
libcommon.cc \
config-validate.hh \
string.hh \
@@ -14,7 +15,7 @@ libcommon_a_SOURCES = \
lang.hh
if DO_PCH
-BUILT_SOURCES = \
+BUILT_SOURCES := \
config-validate.hh.gch \
string.hh.gch \
globals.hh.gch \
diff --git a/src/expdesign/Makefile.am b/src/expdesign/Makefile.am
index b96d6c4..a053ac3 100644
--- a/src/expdesign/Makefile.am
+++ b/src/expdesign/Makefile.am
@@ -1,10 +1,11 @@
-AM_CXXFLAGS = \
+AM_CXXFLAGS := \
-Wall -std=c++0x \
- $(OPENMP_CXXFLAGS)
+ $(OPENMP_CXXFLAGS) \
+ -I$(top_srcdir)/src
-noinst_LIBRARIES = libexpdesign.a
+noinst_LIBRARIES := libexpdesign.a
-libexpdesign_a_SOURCES = \
+libexpdesign_a_SOURCES := \
forward-decls.hh \
primaries.cc \
primaries-loadsave.cc \
@@ -14,7 +15,7 @@ libexpdesign_a_SOURCES = \
recording.hh
if DO_PCH
-BUILT_SOURCES = \
+BUILT_SOURCES := \
forward-decls.hh.gch \
recording.hh.gch \
primaries.hh.gch
diff --git a/src/ica/Makefile.am b/src/ica/Makefile.am
index 257f72f..d06ab09 100644
--- a/src/ica/Makefile.am
+++ b/src/ica/Makefile.am
@@ -1,9 +1,12 @@
-AM_CXXFLAGS = -Wall -std=c++0x
+AM_CXXFLAGS := \
+ -Wall -std=c++0x \
+ -I$(top_srcdir)/src
+
# BUILT_SOURCES = \
# ica.hh.gch
# %.hh.gch: %.hh
# $(CXXCOMPILE) -c $<
-EXTRA_DIST = \
+EXTRA_DIST := \
ica.hh
diff --git a/src/libsigfile/Makefile.am b/src/libsigfile/Makefile.am
index d0942a0..0663540 100644
--- a/src/libsigfile/Makefile.am
+++ b/src/libsigfile/Makefile.am
@@ -1,11 +1,12 @@
-AM_CXXFLAGS = \
+AM_CXXFLAGS := \
-Wall -std=c++0x -shared \
- $(OPENMP_CXXFLAGS)
+ $(OPENMP_CXXFLAGS) \
+ -I$(top_srcdir)/src
-pkglib_LTLIBRARIES = \
+pkglib_LTLIBRARIES := \
libsigfile.la
-noinst_LIBRARIES = \
+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
@@ -14,7 +15,7 @@ libsigfile_a_CXXFLAGS = $(AM_CXXFLAGS)
# libsigfile.o
# two days knocking about, googling it: no, thank you
-libsigfile_la_SOURCES = \
+libsigfile_la_SOURCES := \
forward-decls.hh \
channel.cc \
channel.hh \
@@ -35,7 +36,7 @@ libsigfile_la_SOURCES = \
mc.hh \
artifacts.hh \
artifacts.cc
-libsigfile_a_SOURCES = \
+libsigfile_a_SOURCES := \
$(libsigfile_la_SOURCES)
# libsigfile_la_parts = \
@@ -50,7 +51,7 @@ libsigfile_a_SOURCES = \
# page.o \
# psd.o
-libsigfile_la_LDFLAGS = \
+libsigfile_la_LDFLAGS := \
-avoid-version \
-rpath $(libdir)/$(PACKAGE) \
-module
@@ -75,7 +76,7 @@ libsigfile_la_LDFLAGS = \
# psd.hh
if DO_PCH
-BUILT_SOURCES = \
+BUILT_SOURCES := \
forward-decls.hh.gch \
channel.hh.gch \
source-base.hh.gch \
@@ -93,11 +94,11 @@ CLEANFILES = \
endif
if DO_UPDATE_MIME_DB
-xdgdatadir = $(XDGDATADIR)
-mimedir = $(xdgdatadir)/mime
-xmldir = $(mimedir)/packages
-xml_DATA = edf-file.xml
+xdgdatadir := $(XDGDATADIR)
+mimedir := $(xdgdatadir)/mime
+xmldir := $(mimedir)/packages
+xml_DATA := edf-file.xml
-EXTRA_DIST = edf-file.xml
+EXTRA_DIST := edf-file.xml
endif
diff --git a/src/model/Makefile.am b/src/model/Makefile.am
index 3f8e899..eb3379a 100644
--- a/src/model/Makefile.am
+++ b/src/model/Makefile.am
@@ -1,9 +1,10 @@
-AM_CXXFLAGS = \
- -Wall -std=c++0x
+AM_CXXFLAGS := \
+ -Wall -std=c++0x \
+ -I$(top_srcdir)/src
-noinst_LIBRARIES = libmodel.a
+noinst_LIBRARIES := libmodel.a
-libmodel_a_SOURCES = \
+libmodel_a_SOURCES := \
achermann-tunable.cc \
achermann-tunable.hh \
achermann.cc \
@@ -16,7 +17,7 @@ libmodel_a_SOURCES = \
forward-decls.hh
if DO_PCH
-BUILT_SOURCES = \
+BUILT_SOURCES := \
achermann.hh.gch \
beersma.hh.gch \
achermann-tunable.hh.gch \
diff --git a/src/sigproc/Makefile.am b/src/sigproc/Makefile.am
index 200bb75..65836ff 100644
--- a/src/sigproc/Makefile.am
+++ b/src/sigproc/Makefile.am
@@ -1,15 +1,16 @@
-AM_CXXFLAGS = \
- -Wall -std=c++0x
+AM_CXXFLAGS := \
+ -Wall -std=c++0x \
+ -I$(top_srcdir)/src
-noinst_LIBRARIES = libsigproc.a
+noinst_LIBRARIES := libsigproc.a
-libsigproc_a_SOURCES = \
+libsigproc_a_SOURCES := \
exstrom.cc exstrom.hh \
ext-filters.cc ext-filters.hh \
sigproc.cc sigproc.hh
if DO_PCH
-BUILT_SOURCES = \
+BUILT_SOURCES := \
ext-filters.hh.gch \
exstrom.hh.gch \
sigproc.hh.gch
@@ -19,5 +20,5 @@ CLEANFILES := \
$(BUILT_SOURCES)
endif
-EXTRA_DIST = \
+EXTRA_DIST := \
sigproc.ii
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 1347d14..9d7838e 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,33 +1,35 @@
-AM_CXXFLAGS = -Wall -std=c++0x
+AM_CXXFLAGS := \
+ -Wall -std=c++0x \
+ -I$(top_srcdir)/src
-bin_PROGRAMS = \
+bin_PROGRAMS := \
edfcat \
edfhed \
edfhed-gtk
-edfcat_SOURCES = \
+edfcat_SOURCES := \
edfcat.cc
-edfcat_LDADD = \
+edfcat_LDADD := \
../libsigfile/libsigfile.a \
../sigproc/libsigproc.a \
../common/libcommon.a \
$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
-edfhed_SOURCES = \
+edfhed_SOURCES := \
edfhed.cc
-edfhed_LDADD = \
+edfhed_LDADD := \
../libsigfile/libsigfile.a \
../sigproc/libsigproc.a \
../common/libcommon.a \
$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
-edfhed_gtk_SOURCES = \
+edfhed_gtk_SOURCES := \
edfhed-gtk.cc
-edfhed_gtk_CXXFLAGS = \
+edfhed_gtk_CXXFLAGS := \
$(AM_CXXFLAGS) $(GTK_CFLAGS) -DPACKAGE_DATADIR=\"$(datadir)\"
-edfhed_gtk_LDADD = \
+edfhed_gtk_LDADD := \
../libsigfile/libsigfile.a \
../sigproc/libsigproc.a \
../common/libcommon.a \
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 457bd9e..ec5d9bc 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -4,7 +4,7 @@ AM_CXXFLAGS := \
$(GTK_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
- -I..
+ -I$(top_srcdir)/src
noinst_LIBRARIES := liba.a
diff --git a/src/ui/mf/Makefile.am b/src/ui/mf/Makefile.am
index d80abb0..fd02488 100644
--- a/src/ui/mf/Makefile.am
+++ b/src/ui/mf/Makefile.am
@@ -1,13 +1,13 @@
-AM_CXXFLAGS = \
+AM_CXXFLAGS := \
-std=c++0x -Wdeprecated-declarations -Wall \
$(GTK_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
- -I../..
+ -I$(top_srcdir)/src
-noinst_LIBRARIES = liba.a
+noinst_LIBRARIES := liba.a
-liba_a_SOURCES = \
+liba_a_SOURCES := \
mf.hh \
mf_cb.hh \
mf.cc \
@@ -15,7 +15,7 @@ liba_a_SOURCES = \
mf_cb.cc
if DO_PCH
-BUILT_SOURCES = \
+BUILT_SOURCES := \
mf.hh.gch \
mf_cb.hh.gch
%.hh.gch: %.hh
diff --git a/src/ui/mw/Makefile.am b/src/ui/mw/Makefile.am
index f7bd33f..362b85a 100644
--- a/src/ui/mw/Makefile.am
+++ b/src/ui/mw/Makefile.am
@@ -3,7 +3,7 @@ AM_CXXFLAGS = \
$(GTK_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
- -I../..
+ -I$(top_srcdir)/src
noinst_LIBRARIES = liba.a
diff --git a/src/ui/sf/Makefile.am b/src/ui/sf/Makefile.am
index e9257a0..7f9e446 100644
--- a/src/ui/sf/Makefile.am
+++ b/src/ui/sf/Makefile.am
@@ -3,7 +3,7 @@ AM_CXXFLAGS := \
$(GTK_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
- -I../..
+ -I$(top_srcdir)/src
noinst_LIBRARIES := liba.a
diff --git a/src/ui/sm/Makefile.am b/src/ui/sm/Makefile.am
index c4d3db1..5e4da79 100644
--- a/src/ui/sm/Makefile.am
+++ b/src/ui/sm/Makefile.am
@@ -3,7 +3,7 @@ AM_CXXFLAGS := \
$(GTK_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
- -I../..
+ -I$(top_srcdir)/src
noinst_LIBRARIES := liba.a
--
Sleep experiment manager
More information about the debian-med-commit
mailing list