[Goodies-commits] r1837 - in verve-plugin/trunk: . panel-plugin

[Jannis Pohlmann]

Author: jannis
Date: 2006-08-02 21:11:40 +0000 (Wed, 02 Aug 2006)
New Revision: 1837

Modified:
   verve-plugin/trunk/ChangeLog
   verve-plugin/trunk/Makefile.am
   verve-plugin/trunk/panel-plugin/Makefile.am
Log:
	* Makefile.am, panel-plugin/Makefile.am: Add dist-bzip2 automake
	  option and fix distcheck errors with D-BUS service information
	  generated by dbus-binding-tool. These changes will go into
	  0.3.3, of course.

Modified: verve-plugin/trunk/ChangeLog
===================================================================
--- verve-plugin/trunk/ChangeLog	2006-08-02 20:51:11 UTC (rev 1836)
+++ verve-plugin/trunk/ChangeLog	2006-08-02 21:11:40 UTC (rev 1837)
@@ -1,5 +1,12 @@
 2006-08-02	Jannis Pohlmann <jannis at xfce.org>
 
+	* Makefile.am, panel-plugin/Makefile.am: Add dist-bzip2 automake
+	  option and fix distcheck errors with D-BUS service information
+	  generated by dbus-binding-tool. These changes will go into
+	  0.3.3, of course.
+
+2006-08-02	Jannis Pohlmann <jannis at xfce.org>
+
 	* Preparing for 0.3.3 release
 	* configure.in.in, po/*.po: Bump version to 0.3.3.
 

Modified: verve-plugin/trunk/Makefile.am
===================================================================
--- verve-plugin/trunk/Makefile.am	2006-08-02 20:51:11 UTC (rev 1836)
+++ verve-plugin/trunk/Makefile.am	2006-08-02 21:11:40 UTC (rev 1837)
@@ -7,6 +7,9 @@
 	scripts								\
 	po
 
+AUTOMAKE_OPTIONS =							\
+	dist-bzip2
+
 distclean-local:
 	rm -rf *.spec *.cache *~
 

Modified: verve-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- verve-plugin/trunk/panel-plugin/Makefile.am	2006-08-02 20:51:11 UTC (rev 1836)
+++ verve-plugin/trunk/panel-plugin/Makefile.am	2006-08-02 21:11:40 UTC (rev 1837)
@@ -46,8 +46,8 @@
 xfce4_verve_plugin_LDFLAGS += 						\
 	$(DBUS_LIBS)
 
-verve-dbus-service-infos.h: $(srcdir)/verve-dbus-service-infos.xml Makefile
-	dbus-binding-tool --prefix=verve_dbus_service --mode=glib-server verve-dbus-service-infos.xml > verve-dbus-service-infos.h
+verve-dbus-service-infos.h: Makefile $(srcdir)/verve-dbus-service-infos.xml 
+	dbus-binding-tool --prefix=verve_dbus_service --mode=glib-server $(srcdir)/verve-dbus-service-infos.xml > verve-dbus-service-infos.h
 
 BUILT_SOURCES = 							\
 	verve-dbus-service-infos.h
@@ -71,7 +71,12 @@
 	verve-dbus-service-infos.xml
  
 DISTCLEANFILES =							\
-	$(desktop_DATA) $(desktop_in_files)				
+	$(desktop_DATA) $(desktop_in_files)
+
+if HAVE_DBUS
+DISTCLEANFILES +=							\
+	verve-dbus-service-infos.h
+endif
 	
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in