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

remove the OAF_FILE_IN_RULE and add it to each Makefile.am

Browse source
This commit is contained in:
Jose Maria Celorio 2001-07-26 00:47:51 +00:00
parent ed8294c240
commit a4d165d70d
8 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2001-07-25 Chema Celorio <chema@celorio.com>
(capplet_modules): add bonobo_conf back.
2001-07-25 Chema Celorio <chema@celorio.com> 2001-07-25 Chema Celorio <chema@celorio.com>
* configure.in (GNOMECC_CAPPLETS_OAF_FILE_IN_RULE): scape correctly the * configure.in (GNOMECC_CAPPLETS_OAF_FILE_IN_RULE): scape correctly the

5
capplets/background/ChangeLog
View file

@ -1,3 +1,8 @@
2001-07-25 Chema Celorio <chema@celorio.com>
* Makefile.am ($(oaffile)): remove the oaffile_IN_RULE macro and copy
it here
2001-07-24 Bradford Hovinen <hovinen@ximian.com> 2001-07-24 Bradford Hovinen <hovinen@ximian.com>
* main.c (setup_dialog): Use bonobo_peditor_option_menu_construct * main.c (setup_dialog): Use bonobo_peditor_option_menu_construct

4
capplets/background/Makefile.am
View file

@ -31,12 +31,14 @@ oafdir = $(datadir)/oaf
oaf_DATA = Bonobo_Control_Capplet_background_properties.oaf oaf_DATA = Bonobo_Control_Capplet_background_properties.oaf
oaffile = $(oaf_DATA) oaffile = $(oaf_DATA)
$(oaffile): %.oaf: %.oaf.in
sed -e "s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#" < $< > ${oaffile}
## ##
## You should not need to modify anything below this line ## You should not need to modify anything below this line
## ##
@XML_I18N_MERGE_DESKTOP_RULE@ @XML_I18N_MERGE_DESKTOP_RULE@
@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ @GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
@GNOMECC_CAPPLETS_OAF_FILE_IN_RULE@
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)

4
capplets/keyboard/ChangeLog
View file

@ -1,3 +1,7 @@
2001-07-25 Chema Celorio <chema@celorio.com>
* Makefile.am: remove the OAF_FILE_IN_RULE and copy it here
2001-07-24 Richard Hestilow <hestilow@ximian.com> 2001-07-24 Richard Hestilow <hestilow@ximian.com>
* main.c (main): Pass in legacy files to capplet_init. * main.c (main): Pass in legacy files to capplet_init.

5
capplets/keyboard/Makefile.am
View file

@ -28,15 +28,14 @@ defaults_DATA = keyboard-properties.xml
oafdir = $(datadir)/oaf oafdir = $(datadir)/oaf
oaf_DATA = Bonobo_Control_Capplet_keyboard_properties.oaf oaf_DATA = Bonobo_Control_Capplet_keyboard_properties.oaf
###$(oaffile): %.oaf: %.oaf.in $(oaffile): %.oaf: %.oaf.in
### sed -e "s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#" < $< > ${oaffile} sed -e "s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#" < $< > ${oaffile}
## ##
## You should not need to modify anything below this line ## You should not need to modify anything below this line
## ##
@XML_I18N_MERGE_DESKTOP_RULE@ @XML_I18N_MERGE_DESKTOP_RULE@
@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ @GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
@GNOMECC_CAPPLETS_OAF_FILE_IN_RULE@
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)

4
capplets/sound/ChangeLog
View file

@ -1,3 +1,7 @@
2001-07-25 Chema Celorio <chema@celorio.com>
* Makefile.am: remove the OAF_FILE_IN_RULE and copy it here
2001-07-25 Bradford Hovinen <hovinen@ximian.com> 2001-07-25 Bradford Hovinen <hovinen@ximian.com>
* prefs-widget.c (prefs_widget_init): Fix macro name * prefs-widget.c (prefs_widget_init): Fix macro name

4
capplets/sound/Makefile.am
View file

@ -33,12 +33,14 @@ oafdir = $(datadir)/oaf
oaf_DATA = Bonobo_Control_Capplet_sound_properties.oaf oaf_DATA = Bonobo_Control_Capplet_sound_properties.oaf
oaffile = $(oaf_DATA) oaffile = $(oaf_DATA)
$(oaffile): %.oaf: %.oaf.in
sed -e "s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#" < $< > ${oaffile}
## ##
## You should not need to modify anything below this line ## You should not need to modify anything below this line
## ##
@XML_I18N_MERGE_DESKTOP_RULE@ @XML_I18N_MERGE_DESKTOP_RULE@
@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ @GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
@GNOMECC_CAPPLETS_OAF_FILE_IN_RULE@
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)

3
configure.in
View file

@ -197,11 +197,8 @@ install-data-local:\
$(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup)\ $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup)\
$(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop)\ $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop)\
install-data-am: install-data-local' install-data-am: install-data-local'
GNOMECC_CAPPLETS_OAF_FILE_IN_RULE='$(oaffile): \%.oaf: \%.oaf.in\
sed -e \"s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#\" < $< \> ${oaffile}'
AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
s%@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@%[$]GNOMECC_CAPPLETS_DESKTOP_IN_RULE%g s%@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@%[$]GNOMECC_CAPPLETS_DESKTOP_IN_RULE%g
s%@GNOMECC_CAPPLETS_OAF_FILE_IN_RULE@%[$]GNOMECC_CAPPLETS_OAF_FILE_IN_RULE%g
AC_DIVERT_POP()dnl AC_DIVERT_POP()dnl
# Redirect the config.log output again, so that the ltconfig log is not # Redirect the config.log output again, so that the ltconfig log is not