distcheck love

capplets/ui-properties/ChangeLog

@@ -0,0 +1,4 @@
+2001-07-19  Chema Celorio  <chema@celorio.com>
+
+	* Makefile.am (cappletname): distcheck fixes
+

capplets/ui-properties/Makefile.am

@@ -4,9 +4,11 @@ bin_PROGRAMS = behavior-properties
 
 behavior_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS)
 behavior_properties_SOURCES = \
-	prefs-widget.c		prefs-widget.h\
-	prefs-widget-app.c	prefs-widget-app.h\
-	preferences.c		preferences.h\
+	prefs-widget.c			prefs-widget.h\
+	prefs-widget-mdi.c		prefs-widget-mdi.h\
+	prefs-widget-dialogs.c	prefs-widget-dialogs.h\
+	prefs-widget-app.c		prefs-widget-app.h\
+	preferences.c			preferences.h\
 	main.c
 
 pixmap_DATA = 

capplets/wm-properties/ChangeLog

@@ -1,3 +1,7 @@
+2001-07-19  Chema Celorio  <chema@celorio.com>
+
+	* wm-desktops/Makefile.am (wms): distcheck fixes
+
 2001-07-19  Carlos Perelló Marín <carlos@gnome-db.org>
 
 	* wm-desktops/*.desktop: Adapted to use xml-i18n-tools

capplets/wm-properties/wm-desktops/Makefile.am

@@ -1,14 +1,21 @@
+wms = \
+	Enlightenment \
+	IceWM \
+	Scwm \
+	WindowMaker \
+	twm
+
+desktop_files = $(wms:=.desktop)
+desktop_in_files = $(desktop_files:.desktop=.desktop.in)
+desktop_in_in_files = $(desktop_files:.desktop=.desktop.in.in)
+
 wmdatadir = $(datadir)/gnome/wm-properties
+wmdata_DATA = $(desktop_files)
 
-wmdata_in_files= \
-	Enlightenment.desktop.in \
-	IceWM.desktop.in \
-	Scwm.desktop.in \
-        WindowMaker.desktop.in \
-	twm.desktop.in
+EXTRA_DIST = $(desktop_in_in_files)
 
-wmdata_DATA = $(wmdata_in_files:.desktop.in=.desktop)
-@XML_I18N_MERGE_DESKTOP_RULE@
-
-EXTRA_DIST= $(wmdata_in_files)
+$(desktop_in_files): %.desktop.in: %.desktop.in.in
+	    sed s#Icon=#Icon=$(GNOMECC_ICONS_DIR)/# < $< > $@
 
+$(desktop_files): %.desktop: %.desktop.in
+	$(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< $@