applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove the desktop_IN_RULE. Althou it sounds nice cause we have a central

Browse source 
location to set it up, it causes problems in some configruations.
This commit is contained in:
Jose Maria Celorio 2001-07-26 01:49:13 +00:00
parent 9b77f88b17
commit baba8dddd0
13 changed files with 100 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
capplets/background/ChangeLog
View file

@ -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 <hovinen@ximian.com>

12
capplets/background/Makefile.am
View file

@ -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)

4
capplets/default-applications/ChangeLog
View file

@ -1,3 +1,7 @@
2001-07-25 Chema Celorio <chema@celorio.com>
* Makefile.am: remove the DESKTOP_IN_RULE and copy the sed here
2001-07-23 Richard Hestilow <hestilow@ximian.com>
* callbacks.c (on_radiodefeditor_toggled): Only set_selected_editor

12
capplets/default-applications/Makefile.am
View file

@ -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)

2
capplets/keyboard/ChangeLog
View file

@ -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 <hestilow@ximian.com>
* main.c (main): Pass in legacy files to capplet_init.

13
capplets/keyboard/Makefile.am
View file

@ -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)

4
capplets/mouse/ChangeLog
View file

@ -1,3 +1,7 @@
2001-07-25 Chema Celorio <chema@celorio.com>
* Makefile.am: remove the DESKTOP_IN_RULE and copy the sed here
2001-07-25 Richard Hestilow <hestilow@ximian.com:
* prefs-widget.c (read_preferences): Swap right and left enable.

11
capplets/mouse/Makefile.am
View file

@ -32,7 +32,16 @@ oaf_DATA = Bonobo_Control_Capplet_mouse_properties.oaf
## 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)

4
capplets/screensaver/ChangeLog
View file

@ -1,3 +1,7 @@
2001-07-25 Chema Celorio <chema@celorio.com>
* Makefile.am: remove the DESKTOP_IN_RULE and copy the sed here
2001-07-03 Richard Hestilow <hestilow@ximian.com>
* preview.[ch]: New function show_blank_preview.

12
capplets/screensaver/Makefile.am
View file

@ -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)

1
capplets/sound/ChangeLog
View file

@ -1,6 +1,7 @@
2001-07-25 Chema Celorio <chema@celorio.com>
* 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 <hovinen@ximian.com>

12
capplets/sound/Makefile.am
View file

@ -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)

36
configure.in
View file

@ -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 ==============================================