remove the OAF_FILE_IN_RULE and add it to each Makefile.am
This commit is contained in:
parent
ed8294c240
commit
a4d165d70d
8 changed files with 25 additions and 8 deletions
|
@ -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>
|
||||
|
||||
* configure.in (GNOMECC_CAPPLETS_OAF_FILE_IN_RULE): scape correctly the
|
||||
|
|
|
@ -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>
|
||||
|
||||
* main.c (setup_dialog): Use bonobo_peditor_option_menu_construct
|
||||
|
|
|
@ -31,12 +31,14 @@ oafdir = $(datadir)/oaf
|
|||
oaf_DATA = Bonobo_Control_Capplet_background_properties.oaf
|
||||
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
|
||||
##
|
||||
@XML_I18N_MERGE_DESKTOP_RULE@
|
||||
@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
|
||||
@GNOMECC_CAPPLETS_OAF_FILE_IN_RULE@
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
|
|
|
@ -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>
|
||||
|
||||
* main.c (main): Pass in legacy files to capplet_init.
|
||||
|
|
|
@ -28,15 +28,14 @@ defaults_DATA = keyboard-properties.xml
|
|||
oafdir = $(datadir)/oaf
|
||||
oaf_DATA = Bonobo_Control_Capplet_keyboard_properties.oaf
|
||||
|
||||
###$(oaffile): %.oaf: %.oaf.in
|
||||
### sed -e "s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#" < $< > ${oaffile}
|
||||
$(oaffile): %.oaf: %.oaf.in
|
||||
sed -e "s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#" < $< > ${oaffile}
|
||||
|
||||
##
|
||||
## You should not need to modify anything below this line
|
||||
##
|
||||
@XML_I18N_MERGE_DESKTOP_RULE@
|
||||
@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
|
||||
@GNOMECC_CAPPLETS_OAF_FILE_IN_RULE@
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
|
|
|
@ -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>
|
||||
|
||||
* prefs-widget.c (prefs_widget_init): Fix macro name
|
||||
|
|
|
@ -33,12 +33,14 @@ oafdir = $(datadir)/oaf
|
|||
oaf_DATA = Bonobo_Control_Capplet_sound_properties.oaf
|
||||
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
|
||||
##
|
||||
@XML_I18N_MERGE_DESKTOP_RULE@
|
||||
@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
|
||||
@GNOMECC_CAPPLETS_OAF_FILE_IN_RULE@
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
|
|
|
@ -197,11 +197,8 @@ 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_OAF_FILE_IN_RULE='$(oaffile): \%.oaf: \%.oaf.in\
|
||||
sed -e \"s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#\" < $< \> ${oaffile}'
|
||||
AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
|
||||
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
|
||||
|
||||
# Redirect the config.log output again, so that the ltconfig log is not
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue