From bfc2891118f7243db425dea98b47c69d5ee4f9c6 Mon Sep 17 00:00:00 2001 From: Jose Maria Celorio Date: Fri, 20 Jul 2001 00:03:32 +0000 Subject: [PATCH] distcheck love --- capplets/ui-properties/ChangeLog | 4 +++ capplets/ui-properties/Makefile.am | 8 +++--- capplets/wm-properties/ChangeLog | 4 +++ .../wm-properties/wm-desktops/Makefile.am | 27 ++++++++++++------- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog index e69de29bb..026071416 100644 --- a/capplets/ui-properties/ChangeLog +++ b/capplets/ui-properties/ChangeLog @@ -0,0 +1,4 @@ +2001-07-19 Chema Celorio + + * Makefile.am (cappletname): distcheck fixes + diff --git a/capplets/ui-properties/Makefile.am b/capplets/ui-properties/Makefile.am index 11b067a7d..835525c26 100644 --- a/capplets/ui-properties/Makefile.am +++ b/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 = diff --git a/capplets/wm-properties/ChangeLog b/capplets/wm-properties/ChangeLog index 754ab5793..0f812a042 100644 --- a/capplets/wm-properties/ChangeLog +++ b/capplets/wm-properties/ChangeLog @@ -1,3 +1,7 @@ +2001-07-19 Chema Celorio + + * wm-desktops/Makefile.am (wms): distcheck fixes + 2001-07-19 Carlos Perelló Marín * wm-desktops/*.desktop: Adapted to use xml-i18n-tools diff --git a/capplets/wm-properties/wm-desktops/Makefile.am b/capplets/wm-properties/wm-desktops/Makefile.am index 04bf30639..c1e38fa07 100644 --- a/capplets/wm-properties/wm-desktops/Makefile.am +++ b/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 $< $@