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

Add background, screensaver files (install-data-local): Allow

Browse source 
2001-12-20  Bradford Hovinen  <hovinen@ximian.com>

	* schemas/Makefile.am (schema_DATA): Add background, screensaver
	files
	(install-data-local): Allow specification of multiple schema files

	* capplets/default-applications/Makefile.am: Clean up
This commit is contained in:
Bradford Hovinen 2001-12-20 19:45:12 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent ac652d54ee
commit 7ec25076f0
6 changed files with 20 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -2,6 +2,7 @@
* schemas/Makefile.am (schema_DATA): Add background, screensaver * schemas/Makefile.am (schema_DATA): Add background, screensaver
files files
(install-data-local): Allow specification of multiple schema files
* configure.in (GNOMECC_DESKTOP_DIR): Define * configure.in (GNOMECC_DESKTOP_DIR): Define
(GNOMECC_DATA_DIR): Define (GNOMECC_DATA_DIR): Define

2
capplets/background/Makefile.am
View file

@ -16,5 +16,5 @@ desktop_DATA = background.desktop
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -I$(top_srcdir)/libbackground INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -I$(top_srcdir)/libbackground
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
EXTRA_DIST = $(Glade_DATA) $(icons_DATA) EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(desktop_DATA)

2
capplets/default-applications/ChangeLog
View file

@ -1,5 +1,7 @@
2001-12-20 Bradford Hovinen <hovinen@ximian.com> 2001-12-20 Bradford Hovinen <hovinen@ximian.com>
* Makefile.am: Clean up
* default-application-properties.c (main): Call gtk_main, not * default-application-properties.c (main): Call gtk_main, not
capplet_gtk_main capplet_gtk_main

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

@ -1,41 +1,21 @@
cappletname = default-applications bin_PROGRAMS = gnome-default-applications-properties
cappletgroup =
bin_PROGRAMS = default-applications-properties
default_applications_properties_LDADD = @OLD_CAPPLET_LIBS@ gnome_default_applications_properties_LDADD = @OLD_CAPPLET_LIBS@
default_applications_properties_SOURCES = \ gnome_default_applications_properties_SOURCES = \
default-application-properties.c \ default-application-properties.c \
interface.c interface.h \ interface.c interface.h \
callbacks.c callbacks.h \ callbacks.c callbacks.h \
support.c support.h \ support.c support.h \
defaults.h defaults.h
pixmap_DATA =
##
## You should not need to modify anything below this line
##
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ iconsdir = $(GNOMECC_ICONS_DIR)
$(desktop).in: %.desktop.in: %.desktop.in.in icons_DATA = default-applications-capplet.png
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: desktopdir = $(GNOMECC_DESKTOP_DIR)
$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup) desktop_DATA = default-applications.desktop
$(INSTALL_DATA) $(desktop) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)$(desktop)
install-data-am: install-data-local
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) @OLD_CAPPLET_CFLAGS@ INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) @OLD_CAPPLET_CFLAGS@
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) EXTRA_DIST = $(icons_DATA) $(desktop_DATA)
iconsdir = $(GNOMECC_ICONS_DIR)
Gladedir = $(GNOMECC_GLADE_DIR)
pixmapdir = $(GNOMECC_PIXMAPS_DIR)
Glade_DATA = $(cappletname)-properties.glade
icons_DATA = $(cappletname)-capplet.png
desktop = $(cappletname).desktop
all-local: $(desktop)

2
capplets/keyboard/Makefile.am
View file

@ -16,4 +16,4 @@ desktop_DATA = keyboard.desktop
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
EXTRA_DIST = $(Glade_DATA) $(icons_DATA) EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(desktop_DATA)

2
capplets/mouse/Makefile.am
View file

@ -24,4 +24,4 @@ desktop_DATA = mouse.desktop
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(pixmap_DATA) EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(desktop_DATA) $(pixmap_DATA)