From baba8dddd0181fe7a6b945560d20d9c0a6561659 Mon Sep 17 00:00:00 2001 From: Jose Maria Celorio Date: Thu, 26 Jul 2001 01:49:13 +0000 Subject: [PATCH] Remove the desktop_IN_RULE. Althou it sounds nice cause we have a central location to set it up, it causes problems in some configruations. --- capplets/background/ChangeLog | 1 + capplets/background/Makefile.am | 12 +++++++- capplets/default-applications/ChangeLog | 4 +++ capplets/default-applications/Makefile.am | 12 +++++++- capplets/keyboard/ChangeLog | 2 ++ capplets/keyboard/Makefile.am | 13 +++++++- capplets/mouse/ChangeLog | 4 +++ capplets/mouse/Makefile.am | 11 ++++++- capplets/screensaver/ChangeLog | 4 +++ capplets/screensaver/Makefile.am | 12 +++++++- capplets/sound/ChangeLog | 1 + capplets/sound/Makefile.am | 12 +++++++- configure.in | 36 +++++++++++------------ 13 files changed, 100 insertions(+), 24 deletions(-) diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index 636f1de08..6af0e26f1 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -2,6 +2,7 @@ * Makefile.am ($(oaffile)): remove the oaffile_IN_RULE macro and copy it here + * Makefile.am: remove the DESKTOP_IN_RULE and copy the sed here 2001-07-24 Bradford Hovinen diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am index 30890cf40..3665971ce 100644 --- a/capplets/background/Makefile.am +++ b/capplets/background/Makefile.am @@ -38,7 +38,17 @@ $(oaffile): %.oaf: %.oaf.in ## You should not need to modify anything below this line ## @XML_I18N_MERGE_DESKTOP_RULE@ -@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ + +####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ +$(desktop).in: %.desktop.in: %.desktop.in.in + sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in + +install-data-local: + $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup) + $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop) + +install-data-am: install-data-local +####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog index 2eaca7ead..f8262f802 100644 --- a/capplets/default-applications/ChangeLog +++ b/capplets/default-applications/ChangeLog @@ -1,3 +1,7 @@ +2001-07-25 Chema Celorio + + * Makefile.am: remove the DESKTOP_IN_RULE and copy the sed here + 2001-07-23 Richard Hestilow * callbacks.c (on_radiodefeditor_toggled): Only set_selected_editor diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am index 43d370839..1bc11287d 100644 --- a/capplets/default-applications/Makefile.am +++ b/capplets/default-applications/Makefile.am @@ -16,7 +16,17 @@ pixmap_DATA = ## You should not need to modify anything below this line ## @XML_I18N_MERGE_DESKTOP_RULE@ -@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ + +####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ +$(desktop).in: %.desktop.in: %.desktop.in.in + sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in + +install-data-local: + $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup) + $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop) + +install-data-am: install-data-local +####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index 186205b1a..7a4496bc9 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -2,6 +2,8 @@ * Makefile.am: remove the OAF_FILE_IN_RULE and copy it here + * Makefile.am: remove the DESKTOP_IN_RULE and copy the sed here + 2001-07-24 Richard Hestilow * main.c (main): Pass in legacy files to capplet_init. diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am index d691c1753..89b2d97c6 100644 --- a/capplets/keyboard/Makefile.am +++ b/capplets/keyboard/Makefile.am @@ -35,7 +35,18 @@ $(oaffile): %.oaf: %.oaf.in ## You should not need to modify anything below this line ## @XML_I18N_MERGE_DESKTOP_RULE@ -@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ + + +####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ +$(desktop).in: %.desktop.in: %.desktop.in.in + sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in + +install-data-local: + $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup) + $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop) + +install-data-am: install-data-local +####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog index 08a9cfca8..04421f523 100644 --- a/capplets/mouse/ChangeLog +++ b/capplets/mouse/ChangeLog @@ -1,3 +1,7 @@ +2001-07-25 Chema Celorio + + * Makefile.am: remove the DESKTOP_IN_RULE and copy the sed here + 2001-07-25 Richard Hestilow ${cappletname}.desktop.in + +install-data-local: + $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup) + $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop) + +install-data-am: install-data-local +####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) diff --git a/capplets/screensaver/ChangeLog b/capplets/screensaver/ChangeLog index b9161d256..fd81c1f24 100644 --- a/capplets/screensaver/ChangeLog +++ b/capplets/screensaver/ChangeLog @@ -1,3 +1,7 @@ +2001-07-25 Chema Celorio + + * Makefile.am: remove the DESKTOP_IN_RULE and copy the sed here + 2001-07-03 Richard Hestilow * preview.[ch]: New function show_blank_preview. diff --git a/capplets/screensaver/Makefile.am b/capplets/screensaver/Makefile.am index 57891ad6f..28cc54f85 100644 --- a/capplets/screensaver/Makefile.am +++ b/capplets/screensaver/Makefile.am @@ -25,7 +25,17 @@ pixmaps_DATA = no-hack.png blank-screen.png ## You should not need to modify anything below this line ## @XML_I18N_MERGE_DESKTOP_RULE@ -@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ + +####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ +$(desktop).in: %.desktop.in: %.desktop.in.in + sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in + +install-data-local: + $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup) + $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop) + +install-data-am: install-data-local +####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog index d200cb6c3..73346a49c 100644 --- a/capplets/sound/ChangeLog +++ b/capplets/sound/ChangeLog @@ -1,6 +1,7 @@ 2001-07-25 Chema Celorio * Makefile.am: remove the OAF_FILE_IN_RULE and copy it here + * Makefile.am: remove the DESKTOP_IN_RULE and copy the sed here 2001-07-25 Bradford Hovinen diff --git a/capplets/sound/Makefile.am b/capplets/sound/Makefile.am index df0a7e3d5..d300b993b 100644 --- a/capplets/sound/Makefile.am +++ b/capplets/sound/Makefile.am @@ -40,7 +40,17 @@ $(oaffile): %.oaf: %.oaf.in ## You should not need to modify anything below this line ## @XML_I18N_MERGE_DESKTOP_RULE@ -@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ + +####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ +$(desktop).in: %.desktop.in: %.desktop.in.in + sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in + +install-data-local: + $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup) + $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop) + +install-data-am: install-data-local +####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) diff --git a/configure.in b/configure.in index 34a2fd902..969f6a55f 100644 --- a/configure.in +++ b/configure.in @@ -188,24 +188,24 @@ dnl ============================================== dnl ============================================== dnl Macro for the common code dnl ============================================== -AC_DEFUN(AC_PROG_GNOMECC_CAPPLETS, -[ -GNOMECC_CAPPLETS_DESKTOP_IN_RULE='$(desktop).in: \%.desktop.in: \%.desktop.in.in\ - sed -e \"s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#\" -e \"s#Icon=.\*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#\" < $< \> ${cappletname}.desktop.in\ -\ -install-data-local:\ - $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup)\ - $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop)\ -install-data-am: install-data-local' -AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl -s%@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@%[$]GNOMECC_CAPPLETS_DESKTOP_IN_RULE%g -AC_DIVERT_POP()dnl - -# Redirect the config.log output again, so that the ltconfig log is not -# clobbered by the next message. -exec 5>>./config.log -]) -AC_PROG_GNOMECC_CAPPLETS +dnl AC_DEFUN(AC_PROG_GNOMECC_CAPLETS, +dnl [ +dnl GNOMECC_CAPPLETS_DESKTOP_IN_RULE='$(desktop).in: \%.desktop.in: \%.desktop.in.in\ +dnl sed -e \"s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#\" -e \"s#Icon=.\*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#\" < $< \> ${cappletname}.desktop.in\ +dnl d\ +dnl install-data-local:\ +dnl $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup)\ +dnl $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop)\ +dnl install-data-am: install-data-local' +dnl AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl +dnl s%@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@%[$]GNOMECC_CAPPLETS_DESKTOP_IN_RULE%g +dnl AC_DIVERT_POP()dnl +dnl +dnl # Redirect the config.log output again, so that the ltconfig log is not +dnl # clobbered by the next message. +dnl exec 5>>./config.log +dnl ]) +dnl AC_PROG_GNOMECC_CAPPLETS dnl ============================================== dnl End : Macro for the common code dnl ==============================================