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

Remove screensaver from always_built_SUBDIRS and add $(SCREENSAVER) to

Browse source 
2001-10-26  Bradford Hovinen  <hovinen@ximian.com>

	* capplets/Makefile.am: Remove screensaver from
	always_built_SUBDIRS and add $(SCREENSAVER) to SUBDIRS

	* capplets/{background|keyboard|mouse|sound}/Makefile.am:
	Fix so that automake does not choke on these files
This commit is contained in:
Bradford Hovinen 2001-10-26 19:17:07 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent 816e2de0f2
commit 3611eb3a6a
6 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,5 +1,11 @@
2001-10-26 Bradford Hovinen <hovinen@ximian.com> 2001-10-26 Bradford Hovinen <hovinen@ximian.com>
* capplets/Makefile.am: Remove screensaver from
always_built_SUBDIRS and add $(SCREENSAVER) to SUBDIRS
* capplets/{background|keyboard|mouse|sound}/Makefile.am:
Fix so that automake does not choke on these files
* README: Updated to reflect current status porting to GNOME 2 * README: Updated to reflect current status porting to GNOME 2
* configure.in: Cleanup for GNOME 2 port * configure.in: Cleanup for GNOME 2 port

8
capplets/Makefile.am
View file

@ -1,7 +1,5 @@
always_built_SUBDIRS = \ always_built_SUBDIRS = \
common background keyboard mouse screensaver sound \ common background keyboard mouse sound \
default-applications desktop-links default-applications desktop-links
#rollback SUBDIRS = $(always_built_SUBDIRS) $(SCREENSAVER)
SUBDIRS = $(always_built_SUBDIRS)

5
capplets/background/Makefile.am
View file

@ -20,7 +20,6 @@ defaults_DATA = background-properties.xml
oafdir = $(datadir)/oaf oafdir = $(datadir)/oaf
oaf_DATA = Bonobo_Control_Capplet_background_properties.oaf oaf_DATA = Bonobo_Control_Capplet_background_properties.oaf
oaffile = $(oaf_DATA)
## ##
## You should not need to modify anything below this line ## You should not need to modify anything below this line
@ -31,8 +30,8 @@ $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@ sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
chmod a+x $@ chmod a+x $@
$(oaffile): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in $(oaf_DATA): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > ${oaffile} sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > $@
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
$(desktop).in: %.desktop.in: %.desktop.in.in $(desktop).in: %.desktop.in: %.desktop.in.in

5
capplets/keyboard/Makefile.am
View file

@ -17,7 +17,6 @@ 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_DATA)
## ##
## You should not need to modify anything below this line ## You should not need to modify anything below this line
@ -28,8 +27,8 @@ $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@ sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
chmod a+x $@ chmod a+x $@
$(oaffile): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in $(oaf_DATA): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > ${oaffile} sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > $@
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
$(desktop).in: %.desktop.in: %.desktop.in.in $(desktop).in: %.desktop.in: %.desktop.in.in

5
capplets/mouse/Makefile.am
View file

@ -17,7 +17,6 @@ defaults_DATA = mouse-properties.xml
oafdir = $(datadir)/oaf oafdir = $(datadir)/oaf
oaf_DATA = Bonobo_Control_Capplet_mouse_properties.oaf oaf_DATA = Bonobo_Control_Capplet_mouse_properties.oaf
oaffile = $(oaf_DATA)
## ##
## You should not need to modify anything below this line ## You should not need to modify anything below this line
@ -28,8 +27,8 @@ $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@ sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
chmod a+x $@ chmod a+x $@
$(oaffile): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in $(oaf_DATA): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > ${oaffile} sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > $@
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
$(desktop).in: %.desktop.in: %.desktop.in.in $(desktop).in: %.desktop.in: %.desktop.in.in

5
capplets/sound/Makefile.am
View file

@ -21,7 +21,6 @@ defaults_DATA = sound-properties.xml
oafdir = $(datadir)/oaf oafdir = $(datadir)/oaf
oaf_DATA = Bonobo_Control_Capplet_sound_properties.oaf oaf_DATA = Bonobo_Control_Capplet_sound_properties.oaf
oaffile = $(oaf_DATA)
## ##
## You should not need to modify anything below this line ## You should not need to modify anything below this line
@ -32,8 +31,8 @@ $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@ sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
chmod a+x $@ chmod a+x $@
$(oaffile): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in $(oaf_DATA): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > ${oaffile} sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > $@
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
$(desktop).in: %.desktop.in: %.desktop.in.in $(desktop).in: %.desktop.in: %.desktop.in.in