[rygel] build: Cleanup and simplify Makefile.am

From: Zeeshan Ali Khattak <zeeshanak src gnome org>
To: commits-list gnome org
Cc:
Subject: [rygel] build: Cleanup and simplify Makefile.am
Date: Mon, 21 Feb 2011 20:47:34 +0000 (UTC)
commit 45f8bbe28a6574a0d95549cb2815c8f6fea516c6
Author: Jens Georg <mail jensge org>
Date:   Sun Feb 20 15:12:49 2011 +0100

    build: Cleanup and simplify Makefile.am

 common.am                            |   54 +++++++
 src/plugins/external/Makefile.am     |   59 ++-----
 src/plugins/gst-launch/Makefile.am   |   42 ++----
 src/plugins/media-export/Makefile.am |  112 ++++++--------
 src/plugins/mediathek/Makefile.am    |   62 ++------
 src/plugins/mpris/Makefile.am        |   45 ++----
 src/plugins/playbin/Makefile.am      |   41 +----
 src/plugins/test/Makefile.am         |   45 ++----
 src/plugins/tracker/Makefile.am      |   90 ++++-------
 src/rygel/Makefile.am                |  291 ++++++++++++++++------------------
 src/ui/Makefile.am                   |   61 ++------
 11 files changed, 360 insertions(+), 542 deletions(-)
---
diff --git a/common.am b/common.am
new file mode 100644
index 0000000..8b5c855
--- /dev/null
+++ b/common.am
@@ -0,0 +1,54 @@
+if UNINSTALLED
+shareddir = $(abs_top_builddir)/data
+sysconfigdir = $(shareddir)
+desktopdir = $(shareddir)
+plugindir = $(abs_top_builddir)/src/plugins
+icondir = $(shareddir)/icons/32x32
+smallicondir = $(shareddir)/icons/48x48
+bigicondir = $(shareddir)/icons/120x120
+else
+shareddir = $(datadir)/rygel
+sysconfigdir = $(sysconfdir)
+desktopdir = $(datadir)/applications
+plugindir = $(libdir)/rygel-1.0
+smallicondir = $(datadir)/icons/hicolor/48x48/apps
+bigicondir = $(datadir)/icons/hicolor/120x120/apps
+icondir = $(datadir)/icons/hicolor/32x32/apps
+endif
+
+rygeldir = $(top_srcdir)/src/rygel
+
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CFLAGS = \
+	$(LIBGUPNP_CFLAGS) \
+	$(LIBGUPNP_AV_CFLAGS) \
+	$(LIBGSTREAMER_CFLAGS) \
+	$(GEE_CFLAGS) \
+	$(UUID_CFLAGS) \
+	-I$(rygeldir) \
+	-DDATA_DIR='"$(shareddir)"' -DSYS_CONFIG_DIR='"$(sysconfigdir)"'\
+	-DPLUGIN_DIR='"$(plugindir)"' -DDESKTOP_DIR='"$(desktopdir)"'\
+	-include config.h
+
+RYGEL_COMMON_LDADD = \
+	$(LIBGUPNP_LIBS) \
+	$(LIBGUPNP_AV_LIBS) \
+	$(LIBGSTREAMER_LIBS) \
+	$(GEE_LIBS) \
+	$(UUID_LIBS)
+
+# Note: the -g needs to be at the end of VALAFLAGS to not break make dist
+RYGEL_COMMON_PLUGIN_VALAFLAGS = \
+	--pkg rygel-1.0 \
+	$(RYGEL_COMMON_VALAFLAGS)
+
+RYGEL_COMMON_VALAFLAGS = \
+	--pkg rygel-build-config --pkg gupnp-1.0 \
+	--vapidir=$(rygeldir) \
+	--pkg gupnp-av-1.0 --pkg gee-1.0 -g
+
+RYGEL_PLUGIN_LINKER_FLAGS = -shared -fPIC -module -avoid-version
+
+vala-clean:
+	rm -f `find . -name "*.stamp"`
diff --git a/src/plugins/external/Makefile.am b/src/plugins/external/Makefile.am
index 1ef2112..9fe7f65 100644
--- a/src/plugins/external/Makefile.am
+++ b/src/plugins/external/Makefile.am
@@ -1,45 +1,20 @@
-if UNINSTALLED
-shareddir = $(abs_top_builddir)/data
-else
-shareddir = $(datadir)/rygel
-endif
-
-plugindir = $(libdir)/rygel-1.0
+include ../../../common.am
 
 plugin_LTLIBRARIES = librygel-external.la
 
-AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
-	    $(LIBGUPNP_AV_CFLAGS) \
-	    $(GEE_CFLAGS) \
-	    $(LIBGSTREAMER_CFLAGS) \
-	    $(UUID_FLAGS) \
-	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(shareddir)"' \
-	    -include config.h -DG_LOG_DOMAIN='"External"'
-
-librygel_external_la_SOURCES = rygel-external-container.vala \
-			       rygel-external-dummy-container.vala \
-			       rygel-external-item-factory.vala \
-			       rygel-external-album-art-factory.vala \
-			       rygel-external-thumbnail-factory.vala \
-			       rygel-external-plugin.vala \
-			       rygel-external-interfaces.vala \
-			       rygel-external-plugin-factory.vala \
-			       rygel-external-icon-factory.vala
-
-rygel-external.stamp: $(librygel_external_la_VALASOURCES)
-librygel_external_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \
-				 --pkg rygel-1.0 --pkg gupnp-1.0 \
-				 --pkg gupnp-av-1.0 --pkg gee-1.0 \
-				 --pkg gstreamer-0.10 --pkg gconf-2.0 -g
-
-librygel_external_la_LIBADD = $(LIBGUPNP_LIBS) \
-                              $(LIBGUPNP_AV_LIBS) \
-			      $(LIBGSTREAMER_LIBS) \
-			      $(GEE_LIBS) \
-			      $(UUID_LIBS)
-librygel_external_la_LDFLAGS = -shared -fPIC -module -avoid-version
-
-MAINTAINERCLEANFILES = Makefile.in
-
-vala-clean:
-	rm -f `find . -name "*.stamp"`
+AM_CFLAGS += -DG_LOG_DOMAIN='"External"'
+
+librygel_external_la_SOURCES = \
+	rygel-external-container.vala \
+	rygel-external-dummy-container.vala \
+	rygel-external-item-factory.vala \
+	rygel-external-album-art-factory.vala \
+	rygel-external-thumbnail-factory.vala \
+	rygel-external-plugin.vala \
+	rygel-external-interfaces.vala \
+	rygel-external-plugin-factory.vala \
+	rygel-external-icon-factory.vala
+
+librygel_external_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+librygel_external_la_LIBADD = $(RYGEL_COMMON_LDADD)
+librygel_external_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/gst-launch/Makefile.am b/src/plugins/gst-launch/Makefile.am
index a4fbf65..0ff8ff5 100644
--- a/src/plugins/gst-launch/Makefile.am
+++ b/src/plugins/gst-launch/Makefile.am
@@ -1,36 +1,16 @@
-plugindir = $(libdir)/rygel-1.0
+include ../../../common.am
 
 plugin_LTLIBRARIES = librygel-gst-launch.la
 
-AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
-		$(LIBGUPNP_AV_CFLAGS) \
-		$(GEE_CFLAGS) \
-		$(LIBGSTREAMER_CFLAGS) \
-		$(UUID_FLAGS) \
-		-I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"' \
-		-DSYS_CONFIG_DIR='"$(sysconfdir)"' \
-	        -include config.h -DG_LOG_DOMAIN='"GstLaunch"'
+AM_CFLAGS += -DG_LOG_DOMAIN='"GstLaunch"'
 
-librygel_gst_launch_la_SOURCES = rygel-gst-launch-plugin.vala \
-				rygel-gst-launch-root-container.vala \
-				rygel-gst-launch-item.vala \
-				rygel-gst-launch-audio-item.vala \
-				rygel-gst-launch-video-item.vala
+librygel_gst_launch_la_SOURCES = \
+	rygel-gst-launch-plugin.vala \
+	rygel-gst-launch-root-container.vala \
+	rygel-gst-launch-item.vala \
+	rygel-gst-launch-audio-item.vala \
+	rygel-gst-launch-video-item.vala
 
-librygel_gst_launch_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \
-			     --pkg rygel-1.0 --pkg gconf-2.0 \
-			     --pkg gupnp-1.0 --pkg gupnp-av-1.0 \
-			     --pkg gee-1.0 --pkg gstreamer-0.10 -g
-
-librygel_gst_launch_la_LIBADD = $(LIBGUPNP_LIBS) \
-     			       $(LIBGUPNP_AV_LIBS) \
-     			       $(LIBGSTREAMER_LIBS) \
-     			       $(GEE_LIBS) \
-			       $(UUID_LIBS)
-
-librygel_gst_launch_la_LDFLAGS = -shared -fPIC -module -avoid-version
-
-MAINTAINERCLEANFILES = Makefile.in
-
-vala-clean:
-	rm -f `find . -name "*.stamp"`
+librygel_gst_launch_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+librygel_gst_launch_la_LIBADD = $(RYGEL_COMMON_LDADD)
+librygel_gst_launch_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am
index 18ba191..c5ec8c8 100644
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -1,70 +1,50 @@
-if UNINSTALLED
-shareddir = $(abs_top_builddir)/data
-else
-shareddir = $(datadir)/rygel
-endif
-
-plugindir = $(libdir)/rygel-1.0
+include ../../../common.am
 
 plugin_LTLIBRARIES = librygel-media-export.la
 
-AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
-	    $(LIBGUPNP_AV_CFLAGS) \
-	    $(LIBGUPNP_DLNA_CFLAGS) \
-	    $(LIBSQLITE3_CFLAGS) \
-	    $(GEE_CFLAGS) \
-	    $(UUID_CFLAGS) \
-	    $(GSTREAMER_TAG_CFLAGS) \
-	    $(GSTREAMER_APP_CFLAGS) \
-	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"' \
-	    -include config.h -DG_LOG_DOMAIN='"MediaExport"'
-
-librygel_media_export_la_SOURCES = rygel-media-export-plugin.vala \
-				   rygel-media-export-database.vala \
-				   rygel-media-export-db-container.vala \
-				   rygel-media-export-sql-factory.vala \
-				   rygel-media-export-media-cache.vala \
-				   rygel-media-export-sql-operator.vala \
-				   rygel-media-export-sql-function.vala \
-				   rygel-media-export-media-cache-upgrader.vala \
-				   rygel-media-export-metadata-extractor.vala \
-				   rygel-media-export-null-container.vala \
-				   rygel-media-export-dummy-container.vala \
-				   rygel-media-export-root-container.vala \
-				   rygel-media-export-query-container.vala \
-				   rygel-media-export-dbus-service.vala \
-				   rygel-media-export-recursive-file-monitor.vala \
-				   rygel-media-export-harvester.vala \
-				   rygel-media-export-harvesting-task.vala \
-				   rygel-media-export-item.vala \
-				   rygel-media-export-jpeg-writer.vala \
-				   rygel-media-export-object-factory.vala \
-				   rygel-media-export-writable-db-container.vala
-
-librygel_media_export_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \
-                                     --pkg rygel-1.0 \
-                                     --pkg gupnp-1.0 \
-                                     --pkg gupnp-av-1.0 \
-                                     --pkg gupnp-dlna-1.0 \
-                                     --pkg libsoup-2.4 \
-                                     --pkg gee-1.0 \
-                                     --pkg libxml-2.0 \
-                                     --pkg gstreamer-tag-0.10 \
-                                     --pkg gstreamer-app-0.10 \
-                                     --pkg sqlite3 -g
-
-librygel_media_export_la_LIBADD = $(LIBGUPNP_LIBS) \
-				  $(LIBGUPNP_AV_LIBS) \
-				  $(LIBGUPNP_DLNA_LIBS) \
-				  $(LIBGSTREAMER_LIBS) \
-				  $(GSTREAMER_TAG_LIBS) \
-				  $(GSTREAMER_APP_LIBS) \
-				  $(LIBSQLITE3_LIBS) \
-				  $(GEE_LIBS) \
-				  $(UUID_LIBS)
-librygel_media_export_la_LDFLAGS = -shared -fPIC -module -avoid-version
-
-MAINTAINERCLEANFILES = Makefile.in
+AM_CFLAGS += \
+	$(LIBGUPNP_DLNA_CFLAGS) \
+	$(LIBSQLITE3_CFLAGS) \
+	$(GSTREAMER_TAG_CFLAGS) \
+	$(GSTREAMER_APP_CFLAGS) \
+	-DG_LOG_DOMAIN='"MediaExport"'
+
+librygel_media_export_la_SOURCES = \
+	rygel-media-export-plugin.vala \
+	rygel-media-export-database.vala \
+	rygel-media-export-db-container.vala \
+	rygel-media-export-sql-factory.vala \
+	rygel-media-export-media-cache.vala \
+	rygel-media-export-sql-operator.vala \
+	rygel-media-export-sql-function.vala \
+	rygel-media-export-media-cache-upgrader.vala \
+	rygel-media-export-metadata-extractor.vala \
+	rygel-media-export-null-container.vala \
+	rygel-media-export-dummy-container.vala \
+	rygel-media-export-root-container.vala \
+	rygel-media-export-query-container.vala \
+	rygel-media-export-dbus-service.vala \
+	rygel-media-export-recursive-file-monitor.vala \
+	rygel-media-export-harvester.vala \
+	rygel-media-export-harvesting-task.vala \
+	rygel-media-export-item.vala \
+	rygel-media-export-jpeg-writer.vala \
+	rygel-media-export-object-factory.vala \
+	rygel-media-export-writable-db-container.vala
+
+librygel_media_export_la_VALAFLAGS = \
+	--pkg gupnp-dlna-1.0 \
+	--pkg gstreamer-tag-0.10 \
+	--pkg gstreamer-app-0.10 \
+	--pkg sqlite3 \
+	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+
+librygel_media_export_la_LIBADD = \
+	$(RYGEL_COMMON_LDADD) \
+	$(LIBGUPNP_DLNA_LIBS) \
+	$(GSTREAMER_TAG_LIBS) \
+	$(GSTREAMER_APP_LIBS) \
+	$(LIBSQLITE3_LIBS)
+
+librygel_media_export_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
 
-vala-clean:
-	rm -f `find . -name "*.stamp"`
diff --git a/src/plugins/mediathek/Makefile.am b/src/plugins/mediathek/Makefile.am
index f65ebdb..5a42134 100644
--- a/src/plugins/mediathek/Makefile.am
+++ b/src/plugins/mediathek/Makefile.am
@@ -1,49 +1,19 @@
-if UNINSTALLED
-shareddir = $(abs_top_builddir)/data
-else
-shareddir = $(datadir)/rygel
-endif
-
-plugindir = $(libdir)/rygel-1.0
+include ../../../common.am
 
 plugin_LTLIBRARIES = librygel-mediathek.la
 
-AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
-	    $(LIBGUPNP_AV_CFLAGS) \
-	    $(LIBGSTREAMER_CFLAGS) \
-	    $(GEE_CFLAGS) \
-            $(UUID_CFLAGS) \
-	    -I$(top_srcdir)/src/rygel \
-	    -DDATA_DIR='"$(shareddir)"' \
-	    -include config.h -DG_LOG_DOMAIN='"Mediathek"'
-
-librygel_mediathek_la_SOURCES = rygel-mediathek-asx-playlist-parser.vala \
-				rygel-mediathek-mov-playlist-parser.vala \
-				rygel-mediathek-plugin.vala \
-				rygel-mediathek-playlist-parser.vala \
-				rygel-mediathek-video-item-factory.vala \
-				rygel-mediathek-root-container.vala \
-				rygel-mediathek-rss-container.vala \
-				rygel-mediathek-soup-utils.vala
-
-librygel_mediathek_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \
-				  --pkg rygel-1.0 \
-				  --pkg gupnp-1.0 \
-				  --pkg gupnp-av-1.0 \
-				  --pkg libsoup-2.4 \
-				  --pkg gee-1.0 \
-				  --pkg libxml-2.0 \
-				  --pkg gconf-2.0 -g
-
-librygel_mediathek_la_LIBADD = $(LIBGUPNP_LIBS) \
-			       $(LIBGUPNP_AV_LIBS) \
-			       $(LIBGSTREAMER_LIBS) \
-			       $(GEE_LIBS) \
-                               $(UUID_LIBS)
-
-librygel_mediathek_la_LDFLAGS = -shared -fPIC -module -avoid-version
-
-MAINTAINERCLEANFILES = Makefile.in
-
-vala-clean:
-	rm -f `find . -name "*.stamp"`
+AM_CFLAGS += -DG_LOG_DOMAIN='"Mediathek"'
+
+librygel_mediathek_la_SOURCES = \
+	rygel-mediathek-asx-playlist-parser.vala \
+	rygel-mediathek-mov-playlist-parser.vala \
+	rygel-mediathek-plugin.vala \
+	rygel-mediathek-playlist-parser.vala \
+	rygel-mediathek-video-item-factory.vala \
+	rygel-mediathek-root-container.vala \
+	rygel-mediathek-rss-container.vala \
+	rygel-mediathek-soup-utils.vala
+
+librygel_mediathek_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+librygel_mediathek_la_LIBADD = $(RYGEL_COMMON_LDADD)
+librygel_mediathek_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/mpris/Makefile.am b/src/plugins/mpris/Makefile.am
index 22d45d1..7e94349 100644
--- a/src/plugins/mpris/Makefile.am
+++ b/src/plugins/mpris/Makefile.am
@@ -1,40 +1,15 @@
-if UNINSTALLED
-shareddir = $(abs_top_builddir)/data
-else
-shareddir = $(datadir)/rygel
-endif
-
-plugindir = $(libdir)/rygel-1.0
+include ../../../common.am
 
 plugin_LTLIBRARIES = librygel-mpris.la
 
-AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
-	    $(LIBGUPNP_AV_CFLAGS) \
-	    $(GEE_CFLAGS) \
-	    $(LIBGSTREAMER_CFLAGS) \
-	    $(UUID_CFLAGS) \
-	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(shareddir)"' \
-	    -include config.h -DG_LOG_DOMAIN='"MPRIS"'
-
-librygel_mpris_la_SOURCES = rygel-mpris-player.vala \
-			    rygel-mpris-plugin.vala \
-			    rygel-mpris-plugin-factory.vala \
-			    rygel-mpris-interfaces.vala
-
-librygel_mpris_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \
-			      --vapidir=$(srcdir) \
-			      --pkg rygel-1.0 --pkg rygel-build-config \
-			      --pkg gupnp-1.0 --pkg gupnp-av-1.0 \
-			      --pkg gee-1.0 --pkg gstreamer-0.10 -g
-
-librygel_mpris_la_LIBADD = $(LIBGUPNP_LIBS) \
-			   $(LIBGUPNP_AV_LIBS) \
-			   $(GEE_LIBS) \
-			   $(LIBGSTREAMER_LIBS) \
-			   $(UUID_LIBS)
-librygel_mpris_la_LDFLAGS = -shared -fPIC -module -avoid-version
+AM_CFLAGS += -DG_LOG_DOMAIN='"MPRIS"'
 
-MAINTAINERCLEANFILES = Makefile.in
+librygel_mpris_la_SOURCES = \
+	rygel-mpris-player.vala \
+	rygel-mpris-plugin.vala \
+	rygel-mpris-plugin-factory.vala \
+	rygel-mpris-interfaces.vala
 
-vala-clean:
-	rm -f `find . -name "*.stamp"`
+librygel_mpris_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+librygel_mpris_la_LIBADD = $(RYGEL_COMMON_LDADD)
+librygel_mpris_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/playbin/Makefile.am b/src/plugins/playbin/Makefile.am
index ad101fe..fa9d972 100644
--- a/src/plugins/playbin/Makefile.am
+++ b/src/plugins/playbin/Makefile.am
@@ -1,38 +1,13 @@
-if UNINSTALLED
-shareddir = $(abs_top_builddir)/data
-else
-shareddir = $(datadir)/rygel
-endif
-
-plugindir = $(libdir)/rygel-1.0
+include ../../../common.am
 
 plugin_LTLIBRARIES = librygel-playbin.la
 
-AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
-            $(LIBGUPNP_AV_CFLAGS) \
-            $(GEE_CFLAGS) \
-            $(LIBGSTREAMER_CFLAGS) \
-            $(UUID_CFLAGS) \
-            -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(shareddir)"' \
-	    -include config.h -DG_LOG_DOMAIN='"Playbin"'
-
-librygel_playbin_la_SOURCES = rygel-playbin-player.vala \
-			      rygel-playbin-plugin.vala
-
-librygel_playbin_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \
-				--vapidir=$(srcdir) \
-				--pkg rygel-1.0 --pkg rygel-build-config \
-				--pkg gupnp-1.0 --pkg gupnp-av-1.0 \
-				--pkg gee-1.0 --pkg gstreamer-0.10 -g
-
-librygel_playbin_la_LIBADD = $(LIBGUPNP_LIBS) \
-			     $(LIBGUPNP_AV_LIBS) \
-			     $(LIBGSTREAMER_LIBS) \
-			     $(GEE_LIBS) \
-			     $(UUID_LIBS)
-librygel_playbin_la_LDFLAGS = -shared -fPIC -module -avoid-version
+AM_CFLAGS += -DG_LOG_DOMAIN='"Playbin"'
 
-MAINTAINERCLEANFILES = Makefile.in
+librygel_playbin_la_SOURCES = \
+	rygel-playbin-player.vala \
+	rygel-playbin-plugin.vala
 
-vala-clean:
-	rm -f `find . -name "*.stamp"`
+librygel_playbin_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+librygel_playbin_la_LIBADD = $(RYGEL_COMMON_LDADD)
+librygel_playbin_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/test/Makefile.am b/src/plugins/test/Makefile.am
index 3506133..b0afa60 100644
--- a/src/plugins/test/Makefile.am
+++ b/src/plugins/test/Makefile.am
@@ -1,40 +1,15 @@
-if UNINSTALLED
-shareddir = $(abs_top_builddir)/data
-else
-shareddir = $(datadir)/rygel
-endif
-
-plugindir = $(libdir)/rygel-1.0
+include ../../../common.am
 
 plugin_LTLIBRARIES = librygel-test.la
 
-AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
-	    $(LIBGUPNP_AV_CFLAGS) \
-	    $(GEE_CFLAGS) \
-	    $(LIBGSTREAMER_CFLAGS) \
-	    $(UUID_CFLAGS) \
-	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(shareddir)"' \
-	    -include config.h -DG_LOG_DOMAIN='"Test"'
-
-librygel_test_la_SOURCES = rygel-test-root-container.vala \
-			   rygel-test-audio-item.vala \
-			   rygel-test-video-item.vala \
-			   rygel-test-plugin.vala
-
-librygel_test_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \
-			     --pkg rygel-1.0 --pkg gconf-2.0 \
-			     --pkg gupnp-1.0 --pkg gupnp-av-1.0 \
-			     --pkg gee-1.0 --pkg gstreamer-0.10 -g
-
-librygel_test_la_LIBADD = $(LIBGUPNP_LIBS) \
-			  $(LIBGUPNP_AV_LIBS) \
-			  $(LIBGSTREAMER_LIBS) \
-	                  $(UUID_LIBS) \
-			  $(GEE_LIBS)
-
-librygel_test_la_LDFLAGS = -shared -fPIC -module -avoid-version
+AM_CFLAGS += -DG_LOG_DOMAIN='"Test"'
 
-MAINTAINERCLEANFILES = Makefile.in
+librygel_test_la_SOURCES = \
+	rygel-test-root-container.vala \
+	rygel-test-audio-item.vala \
+	rygel-test-video-item.vala \
+	rygel-test-plugin.vala
 
-vala-clean:
-	rm -f `find . -name "*.stamp"`
+librygel_test_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+librygel_test_la_LIBADD = $(RYGEL_COMMON_LDADD)
+librygel_test_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index a12b0e9..507582f 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -1,58 +1,40 @@
-plugindir = $(libdir)/rygel-1.0
+include ../../../common.am
 
-plugin_LTLIBRARIES = librygel-media-tracker.la
+plugin_LTLIBRARIES = librygel-tracker.la
 
-AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
-	    $(LIBGUPNP_AV_CFLAGS) \
-	    $(LIBGSTREAMER_CFLAGS) \
-	    $(GEE_CFLAGS) \
-	    $(UUID_CFLAGS) \
-	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"' \
-	    -include config.h -DG_LOG_DOMAIN='"Tracker"'
+AM_CFLAGS += -DG_LOG_DOMAIN='"Tracker"'
 
-librygel_media_tracker_la_SOURCES = rygel-tracker-root-container.vala \
-				    rygel-tracker-category-container.vala \
-				    rygel-tracker-music.vala \
-				    rygel-tracker-videos.vala \
-				    rygel-tracker-pictures.vala \
-				    rygel-tracker-metadata-values.vala \
-				    rygel-tracker-tags.vala \
-				    rygel-tracker-years.vala \
-				    rygel-tracker-titles.vala \
-				    rygel-tracker-albums.vala \
-				    rygel-tracker-artists.vala \
-				    rygel-tracker-genre.vala \
-				    rygel-tracker-new.vala \
-				    rygel-tracker-search-container.vala \
-				    rygel-tracker-category-all-container.vala \
-				    rygel-tracker-key-chain-map.vala \
-				    rygel-tracker-query.vala \
-				    rygel-tracker-selection-query.vala \
-				    rygel-tracker-deletion-query.vala \
-				    rygel-tracker-insertion-query.vala \
-				    rygel-tracker-query-triplet.vala \
-				    rygel-tracker-query-triplets.vala \
-				    rygel-tracker-item-factory.vala \
-				    rygel-tracker-video-item-factory.vala \
-				    rygel-tracker-music-item-factory.vala \
-				    rygel-tracker-picture-item-factory.vala \
-				    rygel-tracker-plugin.vala \
-				    rygel-tracker-plugin-factory.vala \
-				    rygel-tracker-interfaces.vala
+librygel_tracker_la_SOURCES = \
+	rygel-tracker-root-container.vala \
+	rygel-tracker-category-container.vala \
+	rygel-tracker-music.vala \
+	rygel-tracker-videos.vala \
+	rygel-tracker-pictures.vala \
+	rygel-tracker-metadata-values.vala \
+	rygel-tracker-tags.vala \
+	rygel-tracker-years.vala \
+	rygel-tracker-titles.vala \
+	rygel-tracker-albums.vala \
+	rygel-tracker-artists.vala \
+	rygel-tracker-genre.vala \
+	rygel-tracker-new.vala \
+	rygel-tracker-search-container.vala \
+	rygel-tracker-category-all-container.vala \
+	rygel-tracker-key-chain-map.vala \
+	rygel-tracker-query.vala \
+	rygel-tracker-selection-query.vala \
+	rygel-tracker-deletion-query.vala \
+	rygel-tracker-insertion-query.vala \
+	rygel-tracker-query-triplet.vala \
+	rygel-tracker-query-triplets.vala \
+	rygel-tracker-item-factory.vala \
+	rygel-tracker-video-item-factory.vala \
+	rygel-tracker-music-item-factory.vala \
+	rygel-tracker-picture-item-factory.vala \
+	rygel-tracker-plugin.vala \
+	rygel-tracker-plugin-factory.vala \
+	rygel-tracker-interfaces.vala
 
-librygel_media_tracker_la_VALAFLAGS = \
-	--vapidir=$(top_srcdir)/src/rygel \
-	--pkg rygel-1.0 --pkg rygel-build-config --pkg gupnp-1.0 \
-	--pkg gupnp-av-1.0 --pkg posix --pkg gee-1.0 --pkg gstreamer-0.10 -g
-
-librygel_media_tracker_la_LIBADD = $(LIBGUPNP_LIBS) \
-				   $(LIBGUPNP_AV_LIBS) \
-				   $(LIBGSTREAMER_LIBS) \
-				   $(GEE_LIBS) \
-				   $(UUID_LIBS)
-librygel_media_tracker_la_LDFLAGS = -shared -fPIC -module -avoid-version
-
-MAINTAINERCLEANFILES = Makefile.in
-
-vala-clean:
-	rm -f `find . -name "*.stamp"`
+librygel_tracker_la_VALAFLAGS = --pkg posix $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+librygel_tracker_la_LIBADD = $(RYGEL_COMMON_LDADD)
+librygel_tracker_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index d5d59e6..a55788c 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -1,33 +1,11 @@
-if UNINSTALLED
-shareddir = $(abs_top_builddir)/data
-sysconfigdir = $(shareddir)
-desktopdir = $(shareddir)
-plugindir = $(abs_top_builddir)/src/plugins
-smallicondir = $(shareddir)/icons/48x48
-bigicondir = $(shareddir)/icons/120x120
-else
-shareddir = $(datadir)/rygel
-sysconfigdir = $(sysconfdir)
-desktopdir = $(datadir)/applications
-plugindir = $(libdir)/rygel-1.0
-smallicondir = $(datadir)/icons/hicolor/48x48/apps
-bigicondir = $(datadir)/icons/hicolor/120x120/apps
-endif
-
-AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
-	    $(LIBGUPNP_AV_CFLAGS) \
-	    $(LIBGUPNP_DLNA_CFLAGS) \
-	    $(LIBGSTREAMER_CFLAGS) \
-	    $(GIO_CFLAGS) \
-	    $(GEE_CFLAGS) \
-	    $(UUID_CFLAGS) \
-	    $(LIBSOUP_CFLAGS) \
-	    -I$(top_srcdir) \
-	    -DDATA_DIR='"$(shareddir)"' -DSYS_CONFIG_DIR='"$(sysconfigdir)"'\
-	    -DPLUGIN_DIR='"$(plugindir)"' -DDESKTOP_DIR='"$(desktopdir)"'\
-	    -DSMALL_ICON_DIR='"$(smallicondir)"' \
-	    -DBIG_ICON_DIR='"$(bigicondir)"' -include config.h \
-	    -DLOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN='"Rygel"'
+include ../../common.am
+
+AM_CFLAGS += \
+	$(LIBGUPNP_DLNA_CFLAGS) \
+	$(LIBSOUP_CFLAGS) \
+	-DSMALL_ICON_DIR='"$(smallicondir)"' \
+	-DBIG_ICON_DIR='"$(bigicondir)"' -include config.h \
+	-DLOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN='"Rygel"'
 
 librygelincdir = $(includedir)/rygel-1.0
 
@@ -35,116 +13,118 @@ librygelinc_HEADERS = rygel.h
 
 bin_PROGRAMS = rygel
 
-BUILT_SOURCES = rygel-1.0.vapi \
-		rygel.h
-
-rygel_SOURCES = $(VAPI_SOURCE_FILES) \
-		rygel-http-item-uri.vala \
-		rygel-dbus-service.vala \
-		rygel-root-device.vala \
-		rygel-root-device-factory.vala \
-		rygel-xml-utils.vala \
-		rygel-signal-handler.vala \
-		rygel-main.vala
-
-VAPI_SOURCE_FILES = rygel-configuration.vala \
-		    rygel-user-config.vala \
-		    rygel-meta-config.vala \
-		    rygel-cmdline-config.vala \
-		    rygel-environment-config.vala \
-		    rygel-content-directory.vala \
-		    rygel-connection-manager.vala \
-		    rygel-source-connection-manager.vala \
-		    rygel-sink-connection-manager.vala \
-		    rygel-av-transport.vala \
-		    rygel-rendering-control.vala \
-		    rygel-transcode-manager.vala \
-		    rygel-http-server.vala \
-		    rygel-state-machine.vala \
-		    rygel-http-request.vala \
-		    rygel-http-get-handler.vala \
-		    rygel-http-get.vala \
-		    rygel-http-post.vala \
-		    rygel-http-identity-handler.vala \
-		    rygel-http-transcode-handler.vala \
-		    rygel-http-seek.vala \
-		    rygel-http-byte-seek.vala \
-		    rygel-http-time-seek.vala \
-		    rygel-http-response.vala \
-		    rygel-http-gst-response.vala \
-		    rygel-http-seekable-response.vala \
-		    rygel-resource-info.vala \
-		    rygel-icon-info.vala \
-		    rygel-plugin.vala \
-		    rygel-media-server-plugin.vala \
-		    rygel-media-renderer-plugin.vala \
-		    rygel-plugin-loader.vala \
-		    rygel-media-object.vala \
-		    rygel-media-objects.vala \
-		    rygel-media-container.vala \
-		    rygel-simple-container.vala \
-		    rygel-writable-container.vala \
-		    rygel-searchable-container.vala \
-		    rygel-media-item.vala \
-		    rygel-audio-item.vala \
-		    rygel-music-item.vala \
-		    rygel-visual-item.vala \
-		    rygel-video-item.vala \
-		    rygel-image-item.vala \
-		    rygel-photo-item.vala \
-		    rygel-thumbnail.vala \
-		    rygel-thumbnailer.vala \
-		    rygel-media-art-store.vala \
-		    rygel-subtitle.vala \
-		    rygel-subtitle-manager.vala \
-		    rygel-media-query-action.vala \
-		    rygel-browse.vala \
-		    rygel-search.vala \
-		    rygel-xbox-hacks.vala \
-		    rygel-import-resource.vala \
-		    rygel-item-creator.vala \
-		    rygel-item-destroyer.vala \
-		    rygel-item-removal-queue.vala \
-		    rygel-search-expression.vala \
-		    rygel-relational-expression.vala \
-		    rygel-logical-expression.vala \
-		    rygel-search-criteria-parser.vala \
-		    rygel-transcoder.vala \
-		    rygel-mp2ts-transcoder.vala \
-		    rygel-mp3-transcoder.vala \
-		    rygel-l16-transcoder.vala \
-		    rygel-mp2ts-transcoder-bin.vala \
-		    rygel-mp3-transcoder-bin.vala \
-		    rygel-l16-transcoder-bin.vala \
-		    rygel-wma-transcoder.vala \
-		    rygel-wma-transcoder-bin.vala \
-		    rygel-wmv-transcoder.vala \
-		    rygel-wmv-transcoder-bin.vala \
-		    rygel-gst-utils.vala \
-		    rygel-media-receiver-registrar.vala \
-		    rygel-log-handler.vala \
-		    rygel-media-player.vala \
-		    rygel-changelog.vala \
-		    rygel-volume.vala \
-		    rygel-free-desktop-interfaces.vala \
-		    rygel-dbus-interface.vala
+BUILT_SOURCES = \
+	rygel-1.0.vapi \
+	rygel.h
+
+rygel_SOURCES = \
+	$(VAPI_SOURCE_FILES) \
+	rygel-http-item-uri.vala \
+	rygel-dbus-service.vala \
+	rygel-root-device.vala \
+	rygel-root-device-factory.vala \
+	rygel-xml-utils.vala \
+	rygel-signal-handler.vala \
+	rygel-main.vala
+
+VAPI_SOURCE_FILES = \
+	rygel-configuration.vala \
+	rygel-user-config.vala \
+	rygel-meta-config.vala \
+	rygel-cmdline-config.vala \
+	rygel-environment-config.vala \
+	rygel-content-directory.vala \
+	rygel-connection-manager.vala \
+	rygel-source-connection-manager.vala \
+	rygel-sink-connection-manager.vala \
+	rygel-av-transport.vala \
+	rygel-rendering-control.vala \
+	rygel-transcode-manager.vala \
+	rygel-http-server.vala \
+	rygel-state-machine.vala \
+	rygel-http-request.vala \
+	rygel-http-get-handler.vala \
+	rygel-http-get.vala \
+	rygel-http-post.vala \
+	rygel-http-identity-handler.vala \
+	rygel-http-transcode-handler.vala \
+	rygel-http-seek.vala \
+	rygel-http-byte-seek.vala \
+	rygel-http-time-seek.vala \
+	rygel-http-response.vala \
+	rygel-http-gst-response.vala \
+	rygel-http-seekable-response.vala \
+	rygel-resource-info.vala \
+	rygel-icon-info.vala \
+	rygel-plugin.vala \
+	rygel-media-server-plugin.vala \
+	rygel-media-renderer-plugin.vala \
+	rygel-plugin-loader.vala \
+	rygel-media-object.vala \
+	rygel-media-objects.vala \
+	rygel-media-container.vala \
+	rygel-simple-container.vala \
+	rygel-writable-container.vala \
+	rygel-searchable-container.vala \
+	rygel-media-item.vala \
+	rygel-audio-item.vala \
+	rygel-music-item.vala \
+	rygel-visual-item.vala \
+	rygel-video-item.vala \
+	rygel-image-item.vala \
+	rygel-photo-item.vala \
+	rygel-thumbnail.vala \
+	rygel-thumbnailer.vala \
+	rygel-media-art-store.vala \
+	rygel-subtitle.vala \
+	rygel-subtitle-manager.vala \
+	rygel-media-query-action.vala \
+	rygel-browse.vala \
+	rygel-search.vala \
+	rygel-xbox-hacks.vala \
+	rygel-import-resource.vala \
+	rygel-item-creator.vala \
+	rygel-item-destroyer.vala \
+	rygel-item-removal-queue.vala \
+	rygel-search-expression.vala \
+	rygel-relational-expression.vala \
+	rygel-logical-expression.vala \
+	rygel-search-criteria-parser.vala \
+	rygel-transcoder.vala \
+	rygel-mp2ts-transcoder.vala \
+	rygel-mp3-transcoder.vala \
+	rygel-l16-transcoder.vala \
+	rygel-mp2ts-transcoder-bin.vala \
+	rygel-mp3-transcoder-bin.vala \
+	rygel-l16-transcoder-bin.vala \
+	rygel-wma-transcoder.vala \
+	rygel-wma-transcoder-bin.vala \
+	rygel-wmv-transcoder.vala \
+	rygel-wmv-transcoder-bin.vala \
+	rygel-gst-utils.vala \
+	rygel-media-receiver-registrar.vala \
+	rygel-log-handler.vala \
+	rygel-media-player.vala \
+	rygel-changelog.vala \
+	rygel-volume.vala \
+	rygel-free-desktop-interfaces.vala \
+	rygel-dbus-interface.vala
 
 rygel_VALAFLAGS = \
-	-H rygel.h -C --library=rygel-1.0 --vapidir=$(srcdir) --thread \
-	--pkg rygel-build-config --pkg rygel-misc --pkg gupnp-1.0 \
-	--pkg gupnp-av-1.0 --pkg gupnp-dlna-1.0 --pkg gstreamer-0.10 \
-	--pkg gio-2.0 --pkg gee-1.0 --pkg posix -g
-# Note:  `-- the -g needs to be at the end of VALAFLAGS to not break make dist
-
-rygel_LDADD = librygel-configuration.a \
-	      $(LIBGUPNP_LIBS) \
-	      $(LIBGUPNP_AV_LIBS) \
-	      $(LIBGUPNP_DLNA_LIBS) \
-	      $(LIBGSTREAMER_LIBS) \
-	      $(GIO_LIBS) \
-	      $(GEE_LIBS) \
-	      $(UUID_LIBS) \
-	      $(LIBSOUP_LIBS)
+	-H rygel.h -C --library=rygel-1.0 \
+	--pkg rygel-misc \
+	--pkg gstreamer-0.10 \
+	--pkg gupnp-dlna-1.0 \
+	--pkg posix \
+	$(RYGEL_COMMON_VALAFLAGS)
+
+rygel_LDADD = \
+	librygel-configuration.a \
+	$(RYGEL_COMMON_LDADD) \
+	$(LIBGUPNP_DLNA_LIBS) \
+	$(LIBGSTREAMER_LIBS) \
+	$(GIO_LIBS) \
+	$(LIBSOUP_LIBS)
 
 rygel_LDFLAGS = -export-dynamic
 
@@ -157,20 +137,21 @@ rygel-1.0.vapi rygel.h: $(VAPI_SOURCE_FILES)
 
 noinst_LIBRARIES = librygel-configuration.a
 
-librygel_configuration_a_SOURCES = rygel-configuration.c \
-				   rygel-user-config.c \
-				   rygel-meta-config.c \
-				   rygel-cmdline-config.c \
-				   rygel-environment-config.c \
-				   rygel-dbus-interface.c \
-				   rygel-free-desktop-interfaces.c
-
-MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
-EXTRA_DIST = rygel-build-config.vapi \
-             rygel-misc.vapi \
-             $(VAPI_FILES) \
-             $(DEPS_FILES) \
-             $(BUILT_SOURCES)
-
-vala-clean:
-	rm -f `find . -name "*.stamp"`
+librygel_configuration_a_SOURCES = \
+	rygel-configuration.c \
+	rygel-user-config.c \
+	rygel-meta-config.c \
+	rygel-cmdline-config.c \
+	rygel-environment-config.c \
+	rygel-dbus-interface.c \
+	rygel-free-desktop-interfaces.c
+
+MAINTAINERCLEANFILES += $(BUILT_SOURCES)
+
+EXTRA_DIST = \
+	rygel-build-config.vapi \
+	rygel-misc.vapi \
+	$(VAPI_FILES) \
+	$(DEPS_FILES) \
+	$(BUILT_SOURCES)
+
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index cf094f1..a3ef2d7 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -1,55 +1,26 @@
-if UNINSTALLED
-shareddir = $(abs_top_builddir)/data
-icondir = $(shareddir)/icons/32x32
-else
-shareddir = $(datadir)/rygel
-icondir = $(datadir)/icons/hicolor/32x32/apps
-endif
+include ../../common.am
 
-rygeldir = $(top_srcdir)/src/rygel
-
-AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
-	    $(LIBGUPNP_AV_CFLAGS) \
-	    $(LIBGSTREAMER_CFLAGS) \
-	    $(GIO_CFLAGS) \
-            $(GTK_CFLAGS) \
-	    $(GEE_CFLAGS) \
-	    $(UUID_CFLAGS) \
-	    $(LIBSOUP_CFLAGS) \
-	    -I$(top_srcdir) -I$(rygeldir) -DDATA_DIR='"$(shareddir)"' \
-	    -DSMALL_ICON_DIR='"$(icondir)"' -DSYS_CONFIG_DIR='"$(sysconfdir)"' \
-	    -DDESKTOP_DIR='"$(desktopdir)"' -include config.h \
-	    -DLOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN='"Rygel"'
+AM_CFLAGS += \
+	$(GTK_CFLAGS) \
+	-DSMALL_ICON_DIR='"$(icondir)"' \
+	-DLOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN='"Rygel"'
 
 bin_PROGRAMS = rygel-preferences
 
-rygel_preferences_SOURCES = \
-			    rygel-preferences-dialog.vala \
-			    rygel-preferences-section.vala \
-			    rygel-media-pref-section.vala \
-			    rygel-writable-user-config.vala \
-			    rygel-network-pref-section.vala
+rygel_preferences_SOURCES =  \
+	rygel-preferences-dialog.vala \
+	rygel-preferences-section.vala \
+	rygel-media-pref-section.vala \
+	rygel-writable-user-config.vala \
+	rygel-network-pref-section.vala
 
-rygel.stamp: $(rygel_preferences_VALASOURCES)
 rygel_preferences_VALAFLAGS = \
-	--vapidir=$(rygeldir) --thread \
-	--pkg rygel-1.0 --pkg rygel-build-config --pkg gupnp-1.0 \
-	--pkg gupnp-av-1.0 --pkg gconf-2.0 --pkg gstreamer-0.10 --pkg gio-2.0 \
-	--pkg gee-1.0 --pkg gtk+-3.0 -g
+	--thread --pkg gio-2.0 \
+	--pkg gtk+-3.0 $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
 
 rygel_preferences_LDADD = \
-		$(abs_top_builddir)/src/rygel/librygel-configuration.a \
-		$(LIBGUPNP_LIBS) \
-		$(LIBGUPNP_AV_LIBS) \
-		$(LIBGSTREAMER_LIBS) \
-		$(GIO_LIBS) \
-		$(GEE_LIBS) \
-		$(UUID_LIBS) \
-		$(LIBSOUP_LIBS) \
-		$(GTK_LIBS)
+	$(abs_top_builddir)/src/rygel/librygel-configuration.a \
+	$(RYGEL_COMMON_LDADD) \
+	$(GTK_LIBS)
 rygel_preferences_LDFLAGS = -export-dynamic
 
-MAINTAINERCLEANFILES = Makefile.in
-
-vala-clean:
-	rm -f `find . -name "*.stamp"`
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]