aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2013-04-04 06:11:15 +0200
committerLars Uebernickel <lars.uebernickel@canonical.com>2013-04-04 06:11:15 +0200
commit77e3a0bb0453f7be6d98a068345ef4484ebf7792 (patch)
tree55d87b715b086350a72c3389bcc291ee12d21a39
parent69fc4a3d92bbbf5940769d877650e45a9c2b913b (diff)
downloadayatana-indicator-sound-77e3a0bb0453f7be6d98a068345ef4484ebf7792.tar.gz
ayatana-indicator-sound-77e3a0bb0453f7be6d98a068345ef4484ebf7792.tar.bz2
ayatana-indicator-sound-77e3a0bb0453f7be6d98a068345ef4484ebf7792.zip
Modernize vala compiling in Makefile.am
This fixes parallel builds.
-rw-r--r--src/Makefile.am43
1 files changed, 3 insertions, 40 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index afbc364..083c5c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,7 @@
libexec_PROGRAMS = indicator-sound-service
-#####################
-# Sound service vala
-#####################
-music_bridge_VALASOURCES = \
+indicator_sound_service_SOURCES = \
+ common-defs.h \
service.vala \
main.vala \
volume-control.vala \
@@ -13,9 +11,8 @@ music_bridge_VALASOURCES = \
mpris2-watcher.vala \
freedesktop-interfaces.vala
-music_bridge_VALAFLAGS = \
+indicator_sound_service_VALAFLAGS = \
--ccode \
- -H music-player-bridge.h -d . \
--vapidir=$(top_srcdir)/vapi/ \
--vapidir=./ \
--thread \
@@ -31,22 +28,6 @@ music_bridge_VALAFLAGS = \
--pkg libpulse-mainloop-glib \
--target-glib=2.36
- $(MAINTAINER_VALAFLAGS)
-
-music_bridge_APIFILES = \
- music-player-bridge.h
-
-music_bridge_vala.stamp $(music_bridge_APIFILES): $(music_bridge_VALASOURCES)
- $(AM_V_GEN) $(VALAC) $(music_bridge_VALAFLAGS) $^
- touch music_bridge_vala.stamp
-
-###############################
-# Sound Service C
-###############################
-indicator_sound_service_SOURCES = \
- common-defs.h \
- $(music_bridge_VALASOURCES:.vala=.c)
-
indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) \
$(SOUNDSERVICE_CFLAGS) \
$(GCONF_CFLAGS) \
@@ -54,21 +35,3 @@ indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) \
-DLIBEXECDIR=\"$(libexecdir)\" -Wall
indicator_sound_service_LDADD = $(PULSEAUDIO_LIBS) $(SOUNDSERVICE_LIBS) $(GCONF_LIBS)
indicator_sound_service_LDFLAGS = $(COVERAGE_LDFLAGS)
-
-EXTRA_DIST = \
- $(DBUS_SPECS) \
- $(music_bridge_APIFILES) \
- $(music_bridge_VALASOURCES)
-
-#######################
-# Stuff to clean Stuff
-#######################
-BUILT_SOURCES = \
- music_bridge_vala.stamp \
- $(music_bridge_APIFILES) \
- $(music_bridge_VALASOURCES:.vala=.c)
-
-CLEANFILES = \
- $(BUILT_SOURCES)
-
-DISTCLEANFILES =