[tracker/vala-makefiles: 6/13] tracker-preferences: Use Automake 1.11 Vala features



commit 74b37ead1ce1a4d8e2b4f8b84ff4bc86b5dacbbd
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Nov 3 16:33:44 2010 +0200

    tracker-preferences: Use Automake 1.11 Vala features

 src/tracker-preferences/Makefile.am |   43 ++++++++++------------------------
 1 files changed, 13 insertions(+), 30 deletions(-)
---
diff --git a/src/tracker-preferences/Makefile.am b/src/tracker-preferences/Makefile.am
index 647c50c..7c9e0c4 100644
--- a/src/tracker-preferences/Makefile.am
+++ b/src/tracker-preferences/Makefile.am
@@ -9,6 +9,13 @@ desktop_DATA =  tracker-preferences.desktop
 
 pkgdata_DATA = tracker-preferences.ui
 
+AM_VALAFLAGS =                                         \
+	-g                                             \
+	--pkg gtk+-2.0 --pkg gmodule-2.0               \
+	config.vapi                                    \
+	tracker-config.vapi                            \
+	tracker-status-icon-config.vapi
+
 AM_CPPFLAGS =                                          \
 	$(BUILD_CFLAGS)                                \
 	-I$(top_srcdir)/src                            \
@@ -20,40 +27,16 @@ AM_CPPFLAGS =                                          \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"       \
 	$(TRACKER_PREFERENCES_CFLAGS)
 
-BUILT_SOURCES =                                        \
-	tracker-preferences.vala.stamp
-
-config_class_sources =                                 \
-	$(top_srcdir)/src/miners/fs/tracker-config.h   \
-	$(top_srcdir)/src/miners/fs/tracker-config.c   \
-	$(top_srcdir)/src/tracker-status-icon/tracker-icon-config.h \
-	$(top_srcdir)/src/tracker-status-icon/tracker-icon-config.c
-
-tracker_preferences_VALASOURCES = tracker-preferences.vala
-
-tracker_preferences_SOURCES =                          \
-	$(config_class_sources)                        \
-	$(tracker_preferences_VALASOURCES:.vala=.c)
-
-tracker_preferences_LDADD =                            \
+LDADD =                                                \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_PREFERENCES_LIBS)
 
-MAINTAINERCLEANFILES =                                 \
-	tracker-preferences.vala.stamp                 \
-	$(tracker_preferences_VALASOURCES:.vala=.c)
-
-EXTRA_DIST =                                           \
-	$(pkgdata_DATA)                                \
-	config.vapi                                    \
-	tracker-config.vapi                            \
-	tracker-status-icon-config.vapi                \
-	tracker-preferences.vala.stamp                 \
-	$(tracker_preferences_VALASOURCES)
+tracker_preferences_SOURCES =                          \
+	tracker-preferences.vala                       \
+	$(top_srcdir)/src/miners/fs/tracker-config.c   \
+	$(top_srcdir)/src/tracker-status-icon/tracker-icon-config.c
 
-tracker-preferences.vala.stamp: $(tracker_preferences_VALASOURCES) tracker-config.vapi tracker-status-icon-config.vapi config.vapi
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) --pkg gtk+-2.0 --pkg gmodule-2.0 -C $(VALAFLAGS) $^
-	$(AM_V_GEN)touch $@
+EXTRA_DIST = $(pkgdata_DATA)
 
 CLEANFILES = $(desktop_DATA)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]