xchat-gnome r2635 - in trunk: . src/common/dbus

[chpe svn gnome org]

Author: chpe
Date: Sun Aug 31 18:03:07 2008
New Revision: 2635
URL: http://svn.gnome.org/viewvc/xchat-gnome?rev=2635&view=rev

Log:
	* src/common/dbus/Makefile.am: Don't add configure-generated sources
	to BUILT_SOURCES; and make clean cleaner.

Modified:
   trunk/ChangeLog
   trunk/src/common/dbus/Makefile.am

Modified: trunk/src/common/dbus/Makefile.am
==============================================================================
--- trunk/src/common/dbus/Makefile.am	(original)
+++ trunk/src/common/dbus/Makefile.am	Sun Aug 31 18:03:07 2008
@@ -46,13 +46,13 @@
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
+install-data-local: $(schema_DATA)
 if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	if test -z "$(DESTDIR)" ; then \
-		for p in $(schema_DATA) ; do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
-		done \
-	fi
+        if test -z "$(DESTDIR)" ; then \
+	        for p in $^ ; do \
+	        GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p >&1 > /dev/null; \
+	        done \
+        fi
 endif
 
 EXTRA_DIST =				\
@@ -63,10 +63,11 @@
 	org.gnome.Xchat.service.in	\
 	README
 
-BUILT_SOURCES =				\
-	remote-object-glue.h		\
-	marshallers.h			\
-	org.gnome.Xchat.service		\
-	url_handler.schemas
+BUILT_SOURCES =			\
+	remote-object-glue.h	\
+	marshallers.h
 
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = \
+ 	$(BUILT_SOURCES)	\
+	$(schema_DATA)		\
+	$(service_DATA)