[maemo-commits] [maemo-commits] r16460 - in projects/haf/trunk/hildon-thumbnail: . albumart-providers/googleimages daemon

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-10-23 16:27:44 +0300 (Thu, 23 Oct 2008)
New Revision: 16460

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   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
Log:
	* configure.ac: Modernized initialization.  Use 'tar-ustar' since
	we have very long filenames.

	* daemon/Makefile.am, albumart-providers/googleimages/Makefile.am:
	Use BUILT_SOURCES only for things that will not be build anyway
	because of dependencies.  Do not distribute BUILT_SOURCES, but
	clean them.


Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-10-23 13:01:25 UTC (rev 16459)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-10-23 13:27:44 UTC (rev 16460)
@@ -1,3 +1,13 @@
+2008-10-23  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* configure.ac: Modernized initialization.  Use 'tar-ustar' since
+	we have very long filenames.
+
+	* daemon/Makefile.am, albumart-providers/googleimages/Makefile.am:
+	Use BUILT_SOURCES only for things that will not be build anyway
+	because of dependencies.  Do not distribute BUILT_SOURCES, but
+	clean them.
+
 2008-10-22  Philip Van Hoof  <philip at codeminded.be>
 
 	* albumart-providers/googleimages/google-images-art-downloader.vala:
@@ -8,7 +18,7 @@
 	Released 3.0.7
 
 2008-10-22  Philip Van Hoof  <philip at codeminded.be>
-	
+
 	* thumbs/hildon-thumbnail-obj.c
 	* thumbs/hildon-thumbnail-factory.h
 	* thumbs/hildon-albumart-obj.c

Modified: projects/haf/trunk/hildon-thumbnail/albumart-providers/googleimages/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-thumbnail/albumart-providers/googleimages/Makefile.am	2008-10-23 13:01:25 UTC (rev 16459)
+++ projects/haf/trunk/hildon-thumbnail/albumart-providers/googleimages/Makefile.am	2008-10-23 13:27:44 UTC (rev 16460)
@@ -6,16 +6,16 @@
 
 NULL = 
 
-albartdowndir = /usr/share/albumart-providers
-albartdown_DATA = com.nokia.albumart.AlbumartProvider.GoogleImages.service
+EXTRA_DIST = my.vala.stamp                     \
+             google-images-art-downloader.vala \
+             google-images-art-downloader.c    \
+	     google-images-art-downloader.h    \
+             com.nokia.albumart.GoogleImages.service.in \
+             com.nokia.albumart.AlbumartProvider.GoogleImages.service
 
-BUILT_SOURCES = my.vala.stamp google-images-art-downloader.c \
-	google-images-art-downloader.h \
-	$(com.nokia.albumart.GoogleImages_service_DATA) \
-	$(albartdown_DATA)
+CLEANFILES = $(com.nokia.albumart.GoogleImages_service_DATA) \
+	     $(albartdown_DATA)
 
-EXTRA_DIST = $(BUILT_SOURCES) google-images-art-downloader.vala 
-
 libexec_PROGRAMS = hildon-google-images-art-downloaderd
 
 hildon_google_images_art_downloaderd_VALASOURCES = \
@@ -41,11 +41,8 @@
 com.nokia.albumart.GoogleImages_servicedir = $(DBUS_SERVICES_DIR)
 com.nokia.albumart.GoogleImages_service_DATA = com.nokia.albumart.GoogleImages.service
 
-%.service: %.service.in
-	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+albartdowndir = /usr/share/albumart-providers
+albartdown_DATA = com.nokia.albumart.AlbumartProvider.GoogleImages.service
 
-# CLEANFILES = $(BUILT_SOURCES) \
-#	$(com.nokia.albumart.GoogleImages_service_DATA) \
-#	$(albartdown_DATA)
-
-
+%.service: %.service.in
+	sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@

Modified: projects/haf/trunk/hildon-thumbnail/configure.ac
===================================================================
--- projects/haf/trunk/hildon-thumbnail/configure.ac	2008-10-23 13:01:25 UTC (rev 16459)
+++ projects/haf/trunk/hildon-thumbnail/configure.ac	2008-10-23 13:27:44 UTC (rev 16460)
@@ -1,6 +1,8 @@
-AC_INIT(Makefile.am)
+AC_INIT([hildon-thumbnail], [3.0.8])
+AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(hildon-thumbnail, 3.0.8)
+AM_INIT_AUTOMAKE(tar-ustar)
+
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC

Modified: projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am	2008-10-23 13:01:25 UTC (rev 16459)
+++ projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am	2008-10-23 13:27:44 UTC (rev 16460)
@@ -73,9 +73,9 @@
 com.nokia.albumart_service_DATA = com.nokia.albumart.service
 
 %.service: %.service.in
-	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+	sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
 
-%-glue.h: $(top_srcdir)/daemon/%.xml
+%-glue.h: %.xml
 	$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
 
 BUILT_SOURCES = manager-glue.h thumbnailer-glue.h plugin-runner-glue.h \
@@ -85,14 +85,12 @@
 configdir = $(datadir)/hildon-thumbnail
 config_DATA = manager.xml thumbnailer.xml albumart.xml
 
-EXTRA_DIST = $(BUILT_SOURCES) $(config_DATA) \
-	$(org.freedesktop.thumbnailer_service_DATA) \
+EXTRA_DIST = $(config_DATA) \
+        org.freedesktop.thumbnailer.service.in \
+        com.nokia.albumart.service.in \
 	thumbnailer-marshal.list \
-	$(com.nokia.albumart_service_DATA) \
 	albumart-marshal.list
 
-CLEANFILES = $(BUILT_SOURCES) \
-	$(org.freedesktop.thumbnailer_service_DATA)
-
-
-
+CLEANFILES = $(BUILT_SOURCES)				\
+	$(org.freedesktop.thumbnailer_service_DATA)	\
+	$(com.nokia.albumart_service_DATA)