GNOME.org
 

[tracker/vala-makefiles: 13/13] build: Use BUILD_VALAFLAGS for "-g" and define in configure

commit b532b1a53b31cc339f0171fcc32eb27f2aa2e930
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Nov 10 11:05:18 2010 +0000

    build: Use BUILD_VALAFLAGS for "-g" and define in configure
    
    This is to make it easy to disable everywhere.

 configure.ac                           |    4 +++-
 src/libtracker-bus/Makefile.am         |    2 +-
 src/libtracker-client/Makefile.am      |    2 +-
 src/libtracker-data/Makefile.am        |    2 +-
 src/libtracker-direct/Makefile.am      |    2 +-
 src/libtracker-sparql/Makefile.am      |    2 +-
 src/miners/flickr/Makefile.am          |    3 ++-
 src/tracker-explorer/Makefile.am       |    4 ++--
 src/tracker-preferences/Makefile.am    |    2 +-
 tests/functional-tests/ipc/Makefile.am |    2 +-
 tests/libtracker-miner/Makefile.am     |    2 +-
 11 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index db95993..736fad7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,10 +483,12 @@ PKG_CHECK_MODULES(TRACKER_NAUTILUS_EXTENSION, [$TRACKER_NAUTILUS_EXTENSION_REQUI
                   [have_tracker_nautilus_extension=yes],
                   [have_tracker_nautilus_extension=no])
 
-# General CFLAGS/LIBS
+# General VALAFLAGS/CFLAGS/LIBS
+BUILD_VALAFLAGS="-g"
 BUILD_CFLAGS="${WARN_CFLAGS} ${GCOV_CFLAGS} -DG_LOG_DOMAIN=\\\"Tracker\\\" -DTRACKER_COMPILATION"
 BUILD_LIBS="${GCOV_LIBS}"
 
+AC_SUBST(BUILD_VALAFLAGS)
 AC_SUBST(BUILD_CFLAGS)
 AC_SUBST(BUILD_LIBS)
 
diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am
index bd20eb1..08b75c8 100644
--- a/src/libtracker-bus/Makefile.am
+++ b/src/libtracker-bus/Makefile.am
@@ -5,11 +5,11 @@ modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
 modules_LTLIBRARIES = libtracker-bus.la
 
 AM_VALAFLAGS =                                         \
-	-g                                             \
 	--includedir=libtracker-bus                    \
 	--header tracker-bus.h                         \
 	--vapi tracker-bus.vapi                        \
 	--pkg gio-2.0 --pkg dbus-glib-1                \
+	$(BUILD_VALAFLAGS)                             \
 	$(top_srcdir)/src/vapi/posix.vapi              \
 	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi     \
 	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
diff --git a/src/libtracker-client/Makefile.am b/src/libtracker-client/Makefile.am
index bb553a7..dd6f413 100644
--- a/src/libtracker-client/Makefile.am
+++ b/src/libtracker-client/Makefile.am
@@ -1,11 +1,11 @@
 include $(top_srcdir)/Makefile.decl
 
 AM_VALAFLAGS =                                         \
-	-g                                             \
 	--includedir=libtracker-client                 \
 	--header tracker-sparql-builder.h              \
 	--vapi tracker-sparql-query.vapi               \
 	--pkg gio-2.0                                  \
+	$(BUILD_VALAFLAGS)                             \
 	$(top_srcdir)/src/vapi/posix.vapi              \
 	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi     \
 	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index 4624b18..3283232 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -1,11 +1,11 @@
 include $(top_srcdir)/Makefile.decl
 
 AM_VALAFLAGS =                                         \
-	-g                                             \
 	--includedir=libtracker-data                   \
 	--header tracker-sparql-query.h                \
 	--vapi tracker-sparql-query.vapi               \
 	--pkg gio-2.0                                  \
+	$(BUILD_VALAFLAGS)                             \
 	$(top_srcdir)/src/vapi/posix.vapi              \
 	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi     \
 	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
diff --git a/src/libtracker-direct/Makefile.am b/src/libtracker-direct/Makefile.am
index 7c247e6..eb92ee4 100644
--- a/src/libtracker-direct/Makefile.am
+++ b/src/libtracker-direct/Makefile.am
@@ -5,11 +5,11 @@ modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
 modules_LTLIBRARIES = libtracker-direct.la
 
 AM_VALAFLAGS =                                         \
-	-g                                             \
 	--includedir=libtracker-direct                 \
 	--header tracker-direct.h                      \
 	--vapi tracker-direct.vapi                     \
 	--pkg gio-2.0 --pkg dbus-glib-1                \
+	$(BUILD_VALAFLAGS)                             \
 	$(top_srcdir)/src/vapi/posix.vapi              \
 	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi     \
 	$(top_srcdir)/src/libtracker-data/libtracker-data.vapi \
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index 39c4cd2..78d40d2 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -5,11 +5,11 @@ modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
 lib_LTLIBRARIES = libtracker-sparql- TRACKER_API_VERSION@.la
 
 AM_VALAFLAGS =                                         \
-	-g                                             \
 	--includedir=libtracker-sparql                 \
 	--header tracker-sparql.h                      \
 	--vapi tracker-sparql-$(TRACKER_API_VERSION).vapi \
 	--pkg gio-2.0 --pkg gmodule-2.0 --pkg dbus-glib-1 \
+	$(BUILD_VALAFLAGS)                             \
 	config.vapi                                    \
 	$(top_srcdir)/src/vapi/posix.vapi              \
 	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi
diff --git a/src/miners/flickr/Makefile.am b/src/miners/flickr/Makefile.am
index 547becf..c5a23a0 100644
--- a/src/miners/flickr/Makefile.am
+++ b/src/miners/flickr/Makefile.am
@@ -3,11 +3,12 @@ include $(top_srcdir)/Makefile.decl
 libexec_PROGRAMS = tracker-miner-flickr
 
 AM_VALAFLAGS =                                         \
-	-g --thread                                    \
+	--thread                                       \
 	--includedir=libtracker-client                 \
 	--header tracker-sparql-builder.h              \
 	--vapi tracker-sparql-query.vapi               \
 	--pkg gio-2.0 --pkg rest-0.6 --pkg posix       \
+	$(BUILD_VALAFLAGS)                             \
 	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi     \
 	$(top_srcdir)/src/libtracker-sparql/tracker-sparql- TRACKER_API_VERSION@.vapi \
 	$(top_srcdir)/src/libtracker-miner/tracker-miner.vapi
diff --git a/src/tracker-explorer/Makefile.am b/src/tracker-explorer/Makefile.am
index 4668af2..aa70488 100644
--- a/src/tracker-explorer/Makefile.am
+++ b/src/tracker-explorer/Makefile.am
@@ -3,8 +3,8 @@ include $(top_srcdir)/Makefile.decl
 bin_PROGRAMS = tracker-explorer
 
 AM_VALAFLAGS =                                         \
-	-C -g                                          \
-	--pkg dbus-glib-1 --pkg gee-1.0 --pkg gtk+-2.0
+	--pkg dbus-glib-1 --pkg gee-1.0 --pkg gtk+-2.0 \
+	$(BUILD_VALAFLAGS)
 
 AM_CPPFLAGS =                                          \
 	$(BUILD_CFLAGS)                                \
diff --git a/src/tracker-preferences/Makefile.am b/src/tracker-preferences/Makefile.am
index 7c9e0c4..9a547b8 100644
--- a/src/tracker-preferences/Makefile.am
+++ b/src/tracker-preferences/Makefile.am
@@ -10,8 +10,8 @@ desktop_DATA =  tracker-preferences.desktop
 pkgdata_DATA = tracker-preferences.ui
 
 AM_VALAFLAGS =                                         \
-	-g                                             \
 	--pkg gtk+-2.0 --pkg gmodule-2.0               \
+	$(BUILD_VALAFLAGS)                             \
 	config.vapi                                    \
 	tracker-config.vapi                            \
 	tracker-status-icon-config.vapi
diff --git a/tests/functional-tests/ipc/Makefile.am b/tests/functional-tests/ipc/Makefile.am
index 41e25c2..19eb97b 100644
--- a/tests/functional-tests/ipc/Makefile.am
+++ b/tests/functional-tests/ipc/Makefile.am
@@ -11,8 +11,8 @@ noinst_PROGRAMS =                                      \
 	test-update-array-performance
 
 AM_VALAFLAGS =                                         \
-	-g                                             \
 	--pkg gio-2.0 --pkg dbus-glib-1                \
+	$(BUILD_VALAFLAGS)                             \
 	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
 	$(top_srcdir)/src/libtracker-bus/tracker-bus.vapi
 
diff --git a/tests/libtracker-miner/Makefile.am b/tests/libtracker-miner/Makefile.am
index 9b24595..fee0787 100644
--- a/tests/libtracker-miner/Makefile.am
+++ b/tests/libtracker-miner/Makefile.am
@@ -44,7 +44,7 @@ LDADD =                                                \
 libtracker_miner_tests_la_VALAFLAGS =                  \
 	--header tracker-miner-mock.h                  \
 	--pkg glib-2.0                                 \
-	-g
+	$(BUILD_VALAFLAGS)
 
 libtracker_miner_tests_la_SOURCES =                    \
 	tracker-miner-mock.vala
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]