[tracker/vala-makefiles: 5/13] libtracker-bus: Use Automake 1.11 Vala features
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/vala-makefiles: 5/13] libtracker-bus: Use Automake 1.11 Vala features
- Date: Wed, 10 Nov 2010 11:19:12 +0000 (UTC)
commit 7afec3e9472767bae06056e9b09cf1966496a638
Author: Martyn Russell <martyn lanedo com>
Date: Tue Nov 2 15:26:52 2010 +0200
libtracker-bus: Use Automake 1.11 Vala features
src/libtracker-bus/Makefile.am | 65 ++++++++++++++++------------------------
1 files changed, 26 insertions(+), 39 deletions(-)
---
diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am
index d911d12..f0c4844 100644
--- a/src/libtracker-bus/Makefile.am
+++ b/src/libtracker-bus/Makefile.am
@@ -2,46 +2,33 @@ include $(top_srcdir)/Makefile.decl
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 \
+ $(top_srcdir)/src/vapi/posix.vapi \
+ $(top_srcdir)/src/vapi/glib-2.0-fixes.vapi \
+ $(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
+ $(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
+ tracker-bus-fd-cursor.vapi \
+ tracker-bus-fd-update.vapi
+
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
$(LIBTRACKER_BUS_CFLAGS)
-modules_LTLIBRARIES = libtracker-bus.la
-
-libtracker_bus_la_VALASOURCES = \
- tracker-bus.vala \
- tracker-array-cursor.vala
-
libtracker_bus_la_SOURCES = \
- libtracker-bus.vala.stamp \
- $(libtracker_bus_la_VALASOURCES:.vala=.c) \
- tracker-bus-fd-cursor.h \
+ tracker-bus.vala \
+ tracker-array-cursor.vala \
tracker-bus-fd-cursor.c \
tracker-bus-fd-update.c \
- tracker-bus-fd-update.h \
- tracker-bus-shared.c \
- tracker-bus-shared.h
-
-libtracker_bus_la_LDFLAGS = \
- -module -avoid-version -no-undefined
-
-noinst_HEADERS = \
- tracker-bus.h
-
-# Vala sources
-vapi_sources = \
- $(top_builddir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
- $(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
- tracker-bus-fd-cursor.vapi \
- tracker-bus-fd-update.vapi
-
-libtracker-bus.vala.stamp: $(libtracker_bus_la_VALASOURCES) $(vapi_sources)
- $(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --includedir=libtracker-bus --pkg gio-2.0 --pkg dbus-glib-1 -H tracker-bus.h --vapi tracker-bus.vapi $^
- $(AM_V_GEN)touch $@
-
-BUILT_SOURCES = libtracker-bus.vala.stamp
+ tracker-bus-shared.c
libtracker_bus_la_LIBADD = \
$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
@@ -49,16 +36,16 @@ libtracker_bus_la_LIBADD = \
$(BUILD_LIBS) \
$(LIBTRACKER_BUS_LIBS)
-MAINTAINERCLEANFILES = \
- $(libtracker_bus_la_VALASOURCES:.vala=.c) \
- libtracker-bus.vala.stamp \
- tracker-bus.vapi \
- tracker-bus.h
+libtracker_bus_la_LDFLAGS = \
+ -module -avoid-version -no-undefined
+
+noinst_HEADERS = \
+ tracker-bus.h \
+ tracker-bus-fd-cursor.h \
+ tracker-bus-fd-update.h \
+ tracker-bus-shared.h
EXTRA_DIST = \
- $(libtracker_bus_la_VALASOURCES) \
- libtracker-bus.vala.stamp \
- tracker-bus.vapi \
tracker-bus-fd-cursor.vapi \
tracker-bus-fd-update.vapi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]