[solang] Factored out the AM_CPPFLAGS and AM_CXXFLAGS into build-flags.mk
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [solang] Factored out the AM_CPPFLAGS and AM_CXXFLAGS into build-flags.mk
- Date: Sat, 20 Mar 2010 23:43:59 +0000 (UTC)
commit 25448c6d6757b41e99b186cccf34adbdd5525d7a
Author: Debarshi Ray <rishi gnu org>
Date: Sat Mar 20 20:40:04 2010 +0200
Factored out the AM_CPPFLAGS and AM_CXXFLAGS into build-flags.mk
src/Makefile.am | 3 +++
src/application/Makefile.am | 25 +------------------------
src/attribute/Makefile.am | 23 +----------------------
src/build-flags.mk | 26 ++++++++++++++++++++++++++
src/common/Makefile.am | 24 +-----------------------
src/editor/Makefile.am | 21 +--------------------
src/exporter/Makefile.am | 23 +----------------------
src/importer/Makefile.am | 26 +-------------------------
src/renderer/Makefile.am | 25 +------------------------
9 files changed, 36 insertions(+), 160 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 38ad291..af2651e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,3 +5,6 @@ SUBDIRS = \
exporter \
renderer \
application
+
+EXTRA_DIST = \
+ build-flags.mk
diff --git a/src/application/Makefile.am b/src/application/Makefile.am
index 74e7d21..68cb0e5 100644
--- a/src/application/Makefile.am
+++ b/src/application/Makefile.am
@@ -31,27 +31,4 @@ solang_LDADD = \
$(GEGLMM_LIBS) \
$(TRACKER_LIBS)
-AM_CPPFLAGS = \
- -DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\" \
- -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -DPACKAGE_DOC_DIR=\""$(docdir)"\" \
- -I$(top_builddir) \
- -I$(top_srcdir)/src/application \
- -I$(top_srcdir)/src/attribute \
- -I$(top_srcdir)/src/common \
- -I$(top_srcdir)/src/database \
- -I$(top_srcdir)/src/editor \
- -I$(top_srcdir)/src/exporter \
- -I$(top_srcdir)/src/renderer \
- $(SOLANG_CFLAGS) \
- $(BRASERO_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(GTKIMAGEVIEW_CFLAGS) \
- $(GTKMM_CFLAGS) \
- $(GDL_CFLAGS) \
- $(GEGLMM_CFLAGS) \
- $(TRACKER_CFLAGS)
-
-AM_CXXFLAGS = \
- -Wall
+include $(top_srcdir)/src/build-flags.mk
diff --git a/src/attribute/Makefile.am b/src/attribute/Makefile.am
index 1662b05..822bdd2 100644
--- a/src/attribute/Makefile.am
+++ b/src/attribute/Makefile.am
@@ -42,25 +42,4 @@ libattribute_la_SOURCES = \
tag-view-model-column-record.h \
tag-view-model-column-record.cpp
-AM_CPPFLAGS = \
- -DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\" \
- -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -I$(top_builddir) \
- -I$(top_srcdir)/src/application \
- -I$(top_srcdir)/src/attribute \
- -I$(top_srcdir)/src/common \
- -I$(top_srcdir)/src/database \
- -I$(top_srcdir)/src/editor \
- -I$(top_srcdir)/src/importer \
- -I$(top_srcdir)/src/renderer \
- -I$(top_srcdir)/src/storage \
- $(SOLANG_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(GTKMM_CFLAGS) \
- $(GDL_CFLAGS) \
- $(GEGLMM_CFLAGS) \
- $(TRACKER_CFLAGS)
-
-AM_CXXFLAGS = \
- -Wall
+include $(top_srcdir)/src/build-flags.mk
\ No newline at end of file
diff --git a/src/build-flags.mk b/src/build-flags.mk
new file mode 100644
index 0000000..6d8945e
--- /dev/null
+++ b/src/build-flags.mk
@@ -0,0 +1,26 @@
+SOLANG_CFLAGS = \
+ -I$(top_builddir) \
+ -I$(top_srcdir)/src/application \
+ -I$(top_srcdir)/src/attribute \
+ -I$(top_srcdir)/src/common \
+ -I$(top_srcdir)/src/editor \
+ -I$(top_srcdir)/src/exporter \
+ -I$(top_srcdir)/src/renderer
+
+AM_CPPFLAGS = \
+ -DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\" \
+ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
+ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ -DPACKAGE_DOC_DIR=\""$(docdir)"\" \
+ $(SOLANG_CFLAGS) \
+ $(BABL_CFLAGS) \
+ $(BRASERO_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(GDL_CFLAGS) \
+ $(GEGLMM_CFLAGS) \
+ $(GTKIMAGEVIEW_CFLAGS) \
+ $(GTKMM_CFLAGS) \
+ $(TRACKER_CFLAGS)
+
+AM_CXXFLAGS = \
+ -Wall
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 970f1c2..495372d 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -100,29 +100,7 @@ libcommon_la_SOURCES = \
utils.cpp \
utils.h
-AM_CPPFLAGS = \
- -DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\" \
- -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -I$(top_builddir) \
- -I$(top_srcdir)/src/application \
- -I$(top_srcdir)/src/attribute \
- -I$(top_srcdir)/src/common \
- -I$(top_srcdir)/src/database \
- -I$(top_srcdir)/src/editor \
- -I$(top_srcdir)/src/importer \
- -I$(top_srcdir)/src/renderer \
- -I$(top_srcdir)/src/storage \
- $(SOLANG_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(GTKMM_CFLAGS) \
- $(GDL_CFLAGS) \
- $(GEGLMM_CFLAGS) \
- $(BABL_CFLAGS) \
- $(TRACKER_CFLAGS)
-
-AM_CXXFLAGS = \
- -Wall
+include $(top_srcdir)/src/build-flags.mk
EXTRA_DIST = \
solang-marshal.list \
diff --git a/src/editor/Makefile.am b/src/editor/Makefile.am
index c6b2252..431ddf7 100644
--- a/src/editor/Makefile.am
+++ b/src/editor/Makefile.am
@@ -22,23 +22,4 @@ libeditor_la_SOURCES = \
rotate-operation.cpp \
rotate-operation.h
-AM_CPPFLAGS = \
- -DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\" \
- -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -I$(top_builddir) \
- -I$(top_srcdir)/src/application \
- -I$(top_srcdir)/src/attribute \
- -I$(top_srcdir)/src/common \
- -I$(top_srcdir)/src/editor \
- -I$(top_srcdir)/src/exporter \
- -I$(top_srcdir)/src/renderer \
- $(SOLANG_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(GTKMM_CFLAGS) \
- $(GDL_CFLAGS) \
- $(GEGLMM_CFLAGS) \
- $(TRACKER_CFLAGS)
-
-AM_CXXFLAGS = \
- -Wall
+include $(top_srcdir)/src/build-flags.mk
diff --git a/src/exporter/Makefile.am b/src/exporter/Makefile.am
index aae13d1..f32e809 100644
--- a/src/exporter/Makefile.am
+++ b/src/exporter/Makefile.am
@@ -21,25 +21,4 @@ EXTRA_libexporter_la_SOURCES = \
brasero-destination.cpp \
brasero-destination.h
-AM_CPPFLAGS = \
- -DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\" \
- -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -I$(top_builddir) \
- -I$(top_srcdir)/src/application \
- -I$(top_srcdir)/src/attribute \
- -I$(top_srcdir)/src/common \
- -I$(top_srcdir)/src/database \
- -I$(top_srcdir)/src/importer \
- -I$(top_srcdir)/src/renderer \
- -I$(top_srcdir)/src/storage \
- $(SOLANG_CFLAGS) \
- $(BRASERO_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(GTKMM_CFLAGS) \
- $(GDL_CFLAGS) \
- $(GEGLMM_CFLAGS) \
- $(TRACKER_CFLAGS)
-
-AM_CXXFLAGS = \
- -Wall
+include $(top_srcdir)/src/build-flags.mk
diff --git a/src/importer/Makefile.am b/src/importer/Makefile.am
index e19452b..b4108bf 100644
--- a/src/importer/Makefile.am
+++ b/src/importer/Makefile.am
@@ -28,28 +28,4 @@ libimporter_la_SOURCES = \
photo-source.h \
photo-source-enums.h
-AM_CPPFLAGS = \
- -DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\" \
- -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -I$(top_builddir) \
- -I$(top_srcdir)/src/application \
- -I$(top_srcdir)/src/attribute \
- -I$(top_srcdir)/src/common \
- -I$(top_srcdir)/src/database \
- -I$(top_srcdir)/src/editor \
- -I$(top_srcdir)/src/importer \
- -I$(top_srcdir)/src/renderer \
- -I$(top_srcdir)/src/storage \
- $(SOLANG_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(FLICKCURL_CFLAGS) \
- $(GPHOTO2_CFLAGS) \
- $(GTKMM_CFLAGS) \
- $(GDL_CFLAGS) \
- $(SOUP_CFLAGS) \
- $(TRACKER_CFLAGS) \
- $(WEBKIT_CFLAGS)
-
-AM_CXXFLAGS = \
- -Wall
+include $(top_srcdir)/src/build-flags.mk
diff --git a/src/renderer/Makefile.am b/src/renderer/Makefile.am
index bb925b2..174793a 100644
--- a/src/renderer/Makefile.am
+++ b/src/renderer/Makefile.am
@@ -18,27 +18,4 @@ librenderer_la_SOURCES = \
thumbnail-view.h \
thumbnail-view.cpp
-AM_CPPFLAGS = \
- -DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\" \
- -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -I$(top_builddir) \
- -I$(top_srcdir)/src/application \
- -I$(top_srcdir)/src/attribute \
- -I$(top_srcdir)/src/common \
- -I$(top_srcdir)/src/database \
- -I$(top_srcdir)/src/editor \
- -I$(top_srcdir)/src/importer \
- -I$(top_srcdir)/src/renderer \
- -I$(top_srcdir)/src/storage \
- $(SOLANG_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(GTKIMAGEVIEW_CFLAGS) \
- $(GTKMM_CFLAGS) \
- $(GDL_CFLAGS) \
- $(BABL_CFLAGS) \
- $(GEGLMM_CFLAGS) \
- $(TRACKER_CFLAGS)
-
-AM_CXXFLAGS = \
- -Wall
+include $(top_srcdir)/src/build-flags.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]