The following commit has been merged in the master branch:
commit 8bcbf0c6573c1efbee9f95c8a8b0f0d6265cd42a
Author: Andrei Zavada <[email protected]>
Date: Sun Nov 4 22:53:08 2012 +0200
separate CFLAGS for some bits pulled in by pkg-config
diff --git a/configure.ac b/configure.ac
index d94d552..16729bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,10 @@ PKG_CHECK_MODULES([SAMPLERATE], [samplerate >= 0.1.7])
PKG_CHECK_MODULES([GSL], [gsl])
PKG_CHECK_MODULES([FFTW3], [fftw3])
PKG_CHECK_MODULES([ITPP], [itpp])
-PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.4 glib-2.0 gthread-2.0 gio-unix-2.0
unique-3.0 gmodule-export-2.0 cairo >= 1.8.10])
+PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.4 glib-2.0 gthread-2.0 gio-unix-2.0
gmodule-export-2.0])
+PKG_CHECK_MODULES([CAIRO], [cairo >= 1.8.10])
+PKG_CHECK_MODULES([UNIQUE], [unique-3.0])
+PKG_CHECK_MODULES([VTE], [vte-2.90])
AC_CHECK_LIB(
fftw3_omp, fftw_init_threads,
diff --git a/src/Makefile.am b/src/Makefile.am
index 21c65bb..b288643 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS := \
AM_CXXFLAGS := \
-Wall -std=c++0x \
- $(GTK_CFLAGS) $(OPENMP_CXXFLAGS) \
+ $(GTK_CFLAGS) $(UNIQUE_CFLAGS) \
-DBUILT_BY=\"@user@\"
bin_PROGRAMS := aghermann
@@ -25,7 +25,9 @@ aghermann_LDADD := \
libsigfile/libsigfile.a \
sigproc/libsigproc.a \
common/libcommon.a \
- $(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GTK_LIBS) $(GSL_LIBS)
$(LIBCONFIGXX_LIBS) \
+ $(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
+ $(GTK_LIBS) $(CAIRO_LIBS) $(UNIQUE_LIBS) $(VTE_LIBS) \
+ $(LIBCONFIGXX_LIBS) \
$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
CLEANFILES := \
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 9d7838e..39e48e7 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -34,6 +34,7 @@ edfhed_gtk_LDADD := \
../sigproc/libsigproc.a \
../common/libcommon.a \
../ui/liba.a \
- $(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GTK_LIBS) $(GSL_LIBS) \
+ $(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
+ $(GTK_LIBS) \
$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index ec5d9bc..7ffc9a2 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -1,14 +1,14 @@
SUBDIRS := sm mw sf mf
AM_CXXFLAGS := \
-std=c++0x -Wdeprecated-declarations \
- $(GTK_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
+ $(GTK_CFLAGS) $(UNIQUE_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
-I$(top_srcdir)/src
noinst_LIBRARIES := liba.a
-liba_a_SOURCES = \
+liba_a_SOURCES := \
forward-decls.hh \
ui.hh \
ui++.hh \
diff --git a/src/ui/mf/Makefile.am b/src/ui/mf/Makefile.am
index fd02488..e640c29 100644
--- a/src/ui/mf/Makefile.am
+++ b/src/ui/mf/Makefile.am
@@ -1,6 +1,6 @@
AM_CXXFLAGS := \
-std=c++0x -Wdeprecated-declarations -Wall \
- $(GTK_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
+ $(GTK_CFLAGS) $(LIBCONFIGXX_CFLAGS) $(UNIQUE_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
-I$(top_srcdir)/src
diff --git a/src/ui/mw/Makefile.am b/src/ui/mw/Makefile.am
index 362b85a..61549a4 100644
--- a/src/ui/mw/Makefile.am
+++ b/src/ui/mw/Makefile.am
@@ -1,6 +1,6 @@
AM_CXXFLAGS = \
-std=c++0x -Wdeprecated-declarations -Wall \
- $(GTK_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
+ $(GTK_CFLAGS) $(VTE_CFLAGS) $(CAIRO_CFLAGS) $(UNIQUE_CFLAGS)
$(LIBCONFIGXX_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
-I$(top_srcdir)/src
diff --git a/src/ui/sf/Makefile.am b/src/ui/sf/Makefile.am
index 7f9e446..004eca7 100644
--- a/src/ui/sf/Makefile.am
+++ b/src/ui/sf/Makefile.am
@@ -1,6 +1,6 @@
AM_CXXFLAGS := \
-std=c++0x -Wdeprecated-declarations -Wall \
- $(GTK_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
+ $(GTK_CFLAGS) $(UNIQUE_CFLAGS) $(CAIRO_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
-I$(top_srcdir)/src
diff --git a/src/ui/sm/Makefile.am b/src/ui/sm/Makefile.am
index 5e4da79..b5bcb62 100644
--- a/src/ui/sm/Makefile.am
+++ b/src/ui/sm/Makefile.am
@@ -1,6 +1,6 @@
AM_CXXFLAGS := \
-std=c++0x -Wdeprecated-declarations -Wall \
- $(GTK_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
+ $(GTK_CFLAGS) $(UNIQUE_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
-I$(top_srcdir)/src
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
