diff --git a/ChangeLog b/ChangeLog index 4f2ee40cc..168455f40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-07-19 Chema Celorio + + * configure.in: make distcheck love + 2001-07-19 Bradford Hovinen * configure.in: Bump to version 1.5.0 diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index b578c6fdf..644a99725 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,3 +1,7 @@ +2001-07-19 Chema Celorio + + * Makefile.am (cappletname): make distcheck love + 2001-07-19 Richard Hestilow * main.c: Add compatibility "-b" argument. diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am index 8b85e38e1..0a3083ff2 100644 --- a/capplets/background/Makefile.am +++ b/capplets/background/Makefile.am @@ -3,9 +3,11 @@ cappletgroup = bin_PROGRAMS = background-properties background_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) -background_properties_SOURCES = \ - main.c \ - applier.c applier.h +background_properties_SOURCES = \ + main.c\ + prefs-widget.c prefs-widget.h \ + preferences.c preferences.h \ + applier.c applier.h pixmap_DATA = diff --git a/capplets/desktop-links/ChangeLog b/capplets/desktop-links/ChangeLog index 4bac68211..6b4cc0d9f 100644 --- a/capplets/desktop-links/ChangeLog +++ b/capplets/desktop-links/ChangeLog @@ -1,3 +1,7 @@ +2001-07-19 Chema Celorio + + * Makefile.am (Desktop_DATA): distcheck love + 2001-07-17 Carlos Perelló Marín * gnome-hint-properties.desktop: Now use xml-i18n-tools. diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog index b7b58ac5a..212ce2fd8 100644 --- a/capplets/mouse/ChangeLog +++ b/capplets/mouse/ChangeLog @@ -1,3 +1,7 @@ +2001-07-19 Chema Celorio + + * Makefile.am (cappletname): distcheck love + 2001-07-19 Bradford Hovinen * Makefile.am (EXTRA_DIST): Added mouse-left.png and mouse-right.png diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index d81ba9d56..4fe1d0be7 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -7,7 +7,7 @@ mouse_properties_SOURCES = \ prefs-widget.c prefs-widget.h \ preferences.c preferences.h -pixmap_DATA = mouse-left.png mouse-right.png +pixmaps_DATA = mouse-left.png mouse-right.png ## ## You should not need to modify anything below this line @@ -20,7 +20,7 @@ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) mouse-left.png mouse-right.png iconsdir = $(GNOMECC_ICONS_DIR) Gladedir = $(GNOMECC_GLADE_DIR) -pixmapdir = $(GNOMECC_PIXMAPS_DIR) +pixmapsdir = $(GNOMECC_PIXMAPS_DIR) Glade_DATA = $(cappletname)-properties.glade icons_DATA = $(cappletname)-capplet.png desktop = $(cappletname).desktop diff --git a/capplets/screensaver/ChangeLog b/capplets/screensaver/ChangeLog index 74e7356c4..40aaa62cf 100644 --- a/capplets/screensaver/ChangeLog +++ b/capplets/screensaver/ChangeLog @@ -1,3 +1,7 @@ +2001-07-19 Chema Celorio + + * Makefile.am (SUBDIRS): distcheck love + 2001-07-19 Bradford Hovinen * Makefile.am (EXTRA_DIST): Added no-hack.png diff --git a/capplets/screensaver/Makefile.am b/capplets/screensaver/Makefile.am index 800b46d17..6af2584bd 100644 --- a/capplets/screensaver/Makefile.am +++ b/capplets/screensaver/Makefile.am @@ -19,7 +19,7 @@ screensaver_properties_SOURCES = \ resources.c resources.h\ XScreenSaver_ad.h -pixmap_DATA = no-hack.png +pixmaps_DATA = no-hack.png ## ## You should not need to modify anything below this line @@ -32,7 +32,7 @@ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) no-hack.png iconsdir = $(GNOMECC_ICONS_DIR) Gladedir = $(GNOMECC_GLADE_DIR) -pixmapdir = $(GNOMECC_PIXMAPS_DIR) +pixmapsdir = $(GNOMECC_PIXMAPS_DIR) Glade_DATA = $(cappletname)-properties.glade icons_DATA = $(cappletname)-capplet.png desktop = $(cappletname).desktop diff --git a/configure.in b/configure.in index 6ffaa540e..d59a264c5 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ dnl ============================================== GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} -I\$(top_srcdir)/intl -I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-properties\\\"\" -DGLADE_DATADIR=\"\\\"${datadir}/control-center\\\"\" -DGNOMELOCALEDIR=\"\\\"${datadir}/locale\\\"\" -I\$(top_srcdir)/capplets/common " GNOMECC_CAPPLETS_LIBS="${CAPPLET_LIBS} \$(top_builddir)/capplets/common/libcommon.a" GNOMECC_CAPPLETS_CLEANFILES="\$(desktop) \$(desktop).in" -GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(desktop).in.in \$(desktop).in \$(desktop) \$(cappletname)-capplet.png \$(cappletname)-properties.glade" +GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(desktop).in.in \$(desktop).in \$(desktop) \$(cappletname)-capplet.png \$(cappletname)-properties.glade \$(pixmaps_DATA)" AC_SUBST(GNOMECC_CAPPLETS_EXTRA_DIST) AC_SUBST(GNOMECC_CAPPLETS_CLEANFILES) @@ -141,7 +141,7 @@ AC_DEFINE_UNQUOTED(GNOMECC_GLADE_DIR, "${prefix}/share/${PACKAGE}/interfaces") GNOMECC_GLADE_DIR=""${datadir}/${PACKAGE}/interfaces"" AC_SUBST(GNOMECC_GLADE_DIR) AC_DEFINE_UNQUOTED(GNOMECC_PIXMAPS_DIR, "${prefix}/share/${PACKAGE}/pixmaps") -GNOMECC_PIXMAPS_DIR=""${datadir}/${PACKAGE}/pixmaps"" +GNOMECC_PIXMAPS_DIR=""${prefix}/share/${PACKAGE}/pixmaps"" AC_SUBST(GNOMECC_PIXMAPS_DIR) AC_DEFINE_UNQUOTED(GNOMECC_SCREENSAVERS_DIR, "${prefix}/share/${PACKAGE}/screensavers") GNOMECC_SCREENSAVERS_DIR=""${datadir}/${PACKAGE}/screensavers"" diff --git a/control-center/Makefile.am b/control-center/Makefile.am index e23f278dc..98bfb73ae 100644 --- a/control-center/Makefile.am +++ b/control-center/Makefile.am @@ -48,7 +48,7 @@ gnomecc_LDADD = \ @GNOMECC_LIBS@ \ $(INTLLIBS) -EXTRA_DIST = gnomecc.desktop.in Gnome.directory.in.in $(appicon_DATA) $(splash_DATA) $(glade_DATA) $(groups_in_files) +EXTRA_DIST = gnomecc.desktop.in $(appicon_DATA) $(splash_DATA) $(glade_DATA) $(groups_in_files) Gnome.directory.in.in paneldir = $(datadir)/gnome/apps/Settings ccenterdir = $(datadir)/control-center/capplets @@ -57,12 +57,15 @@ groups = Gnome groups_files = $(groups:=.directory) groups_in_files = $(groups_files:.directory=.directory.in) + $(groups_in_files): %.directory.in: %.directory.in.in sed s#Icon=#Icon=$(GNOMECC_ICONS_DIR)/control-center.png# < $< > $@ $(groups_files): %.directory: %.directory.in $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< $@ -install-data-local: - $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup) - $(INSTALL_DATA) $(srcdir)/$(groups).directory $(datadir)/control-center/capplets/.directory +#install-data-local: +# $(mkinstalldirs) $(datadir)/control-center/capplets +# $(INSTALL_DATA) $(srcdir)/Gnome.directory $(datadir)/control-center/capplets/.directory + +#all-local: Gnome.directory \ No newline at end of file diff --git a/control-center/control-center.png b/control-center/control-center.png index eb6d12fe7..f3d172f8a 100644 Binary files a/control-center/control-center.png and b/control-center/control-center.png differ