[maemo-commits] [maemo-commits] r18736 - in projects/haf/trunk/hildon-thumbnail: . albumart-providers/googleimages daemon thumbnailers/gst-video-thumbnailer thumbs

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2009-06-16 17:14:52 +0300 (Tue, 16 Jun 2009)
New Revision: 18736

Modified:
   projects/haf/trunk/hildon-thumbnail/albumart-providers/googleimages/Makefile.am
   projects/haf/trunk/hildon-thumbnail/configure.ac
   projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am
   projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/Makefile.am
   projects/haf/trunk/hildon-thumbnail/thumbs/Makefile.am
Log:
make distcheck fixes.

Removed DBUS_SERVICE_DIR, that's a losing concept.  Make sure we never
install outside of our prefix, that's fobidden.

Modified: projects/haf/trunk/hildon-thumbnail/albumart-providers/googleimages/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-thumbnail/albumart-providers/googleimages/Makefile.am	2009-06-16 14:14:45 UTC (rev 18735)
+++ projects/haf/trunk/hildon-thumbnail/albumart-providers/googleimages/Makefile.am	2009-06-16 14:14:52 UTC (rev 18736)
@@ -37,10 +37,10 @@
 	$(DBUS_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) $(GIO_LIBS)
 
 # Services
-com.nokia.albumart.GoogleImages_servicedir = $(DBUS_SERVICES_DIR)
+com.nokia.albumart.GoogleImages_servicedir = $(datadir)/dbus-1/services
 com.nokia.albumart.GoogleImages_service_DATA = com.nokia.albumart.GoogleImages.service
 
-albartdowndir = /usr/share/albumart-providers
+albartdowndir = $(datadir)/dbus-1/services
 albartdown_DATA = com.nokia.albumart.AlbumartProvider.GoogleImages.service
 
 %.service: %.service.in

Modified: projects/haf/trunk/hildon-thumbnail/configure.ac
===================================================================
--- projects/haf/trunk/hildon-thumbnail/configure.ac	2009-06-16 14:14:45 UTC (rev 18735)
+++ projects/haf/trunk/hildon-thumbnail/configure.ac	2009-06-16 14:14:52 UTC (rev 18736)
@@ -58,27 +58,6 @@
 
 AM_CONDITIONAL(HAVE_MGTK, test "$have_gtk" = "yes")
 
-
-
-####################################################################
-# DBus Service
-####################################################################
-
-dnl DBus services dir
-AC_ARG_WITH([session_bus_services_dir],
-            AS_HELP_STRING([--with-session-bus-services-dir],
-                           [Path to DBus services directory]))
-
-if test "x$with_session_bus_services_dir" = "x" ; then
-   services_dir="`pkg-config --variable session_bus_services_dir dbus-1`"
-else
-   services_dir="$with_session_bus_services_dir"
-fi
-
-DBUS_SERVICES_DIR="$services_dir"
-AC_SUBST(DBUS_SERVICES_DIR)
-
-
 PKG_CHECK_MODULES(GIO, gio-2.0)
 AC_SUBST(GIO_CFLAGS)
 AC_SUBST(GIO_LIBS)

Modified: projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am	2009-06-16 14:14:45 UTC (rev 18735)
+++ projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am	2009-06-16 14:14:52 UTC (rev 18736)
@@ -6,8 +6,8 @@
 	$(GMODULE_CFLAGS) \
 	$(GIO_CFLAGS) $(HAL_CFLAGS) \
 	$(LIBOSSO_CFLAGS) \
-	-DTHUMBNAILERS_DIR=\""/usr/share/thumbnailers"\" \
-	-DALBUMARTERS_DIR=\""/usr/share/albumart-providers"\" \
+	-DTHUMBNAILERS_DIR=\""$(datadir)/thumbnailers"\" \
+	-DALBUMARTERS_DIR=\""$(datadir)/albumart-providers"\" \
 	-DPLUGINS_DIR=\""$(libdir)/hildon-thumbnailer/plugins"\" \
 	-DOUTPUTPLUGINS_DIR=\""$(libdir)/hildon-thumbnailer/output-plugins"\" 
 
@@ -16,8 +16,8 @@
 # inotify.
 #
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)/usr/share/thumbnailers
-	$(mkinstalldirs) $(DESTDIR)/usr/share/albumart-providers
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/thumbnailers
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/albumart-providers
 
 noinst_LTLIBRARIES = libshared.la
 
@@ -80,10 +80,10 @@
 	$(GIO_LIBS) $(HAL_LIBS)
 
 # Services
-org.freedesktop.thumbnailer_servicedir = $(DBUS_SERVICES_DIR)
+org.freedesktop.thumbnailer_servicedir = $(datadir)/dbus-1/services/
 org.freedesktop.thumbnailer_service_DATA = org.freedesktop.thumbnailer.service
 
-com.nokia.albumart_servicedir = $(DBUS_SERVICES_DIR)
+com.nokia.albumart_servicedir = $(datadir)/dbus-1/services/
 com.nokia.albumart_service_DATA = com.nokia.albumart.service
 
 %.service: %.service.in

Modified: projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/Makefile.am	2009-06-16 14:14:45 UTC (rev 18735)
+++ projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/Makefile.am	2009-06-16 14:14:52 UTC (rev 18736)
@@ -23,7 +23,9 @@
 	gst-thumb-main.c \
 	gst-thumb-thumber.c \
 	gst-thumb-pipe.c \
-	com.nokia.thumbnailer.Gstreamer.service.in
+	com.nokia.thumbnailer.Gstreamer.service.in \
+	reg/com.nokia.thumbnailer.Gstreamer.service \
+	gst-video-thumbnailer-marshal.list
 
 if HAVE_GSTREAMER
 libexec_PROGRAMS = gst-video-thumbnailerd
@@ -37,10 +39,10 @@
 	$(GLIB_GENMARSHAL) $< --prefix=gst_video_thumbnailer_marshal --body > $@
 
 # Services
-com.nokia.thumbnailer.Gstreamer_servicedir = $(DBUS_SERVICES_DIR)
+com.nokia.thumbnailer.Gstreamer_servicedir = $(datadir)/dbus-1/services
 com.nokia.thumbnailer.Gstreamer_service_DATA = com.nokia.thumbnailer.Gstreamer.service
 
-com.nokia.thumbnailer.Gstreamer_thumbnailersdir = /usr/share/thumbnailers
+com.nokia.thumbnailer.Gstreamer_thumbnailersdir = $(datadir)/thumbnailers
 com.nokia.thumbnailer.Gstreamer_thumbnailers_DATA = reg/com.nokia.thumbnailer.Gstreamer.service
 
 %.service: %.service.in

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/Makefile.am	2009-06-16 14:14:45 UTC (rev 18735)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/Makefile.am	2009-06-16 14:14:52 UTC (rev 18736)
@@ -13,7 +13,8 @@
 
 bin_SCRIPTS = hildon-thumbnailer-wrap.sh
 
-EXTRA_DIST = hildon-thumbnailer-wrap.sh
+EXTRA_DIST = hildon-thumbnailer-wrap.sh \
+	     thumbnailer-marshal.list
 
 if ENABLE_OSSO
 bin_PROGRAMS = hildon-thumb-gdk-pixbuf hildon-thumber-register