From 4b40c528748119b7ea23b57e210d14c93eee6d8d Mon Sep 17 00:00:00 2001 From: "Bradford Hovinen (Gdict maintainer)" Date: Thu, 19 Jul 2001 18:36:19 +0000 Subject: [PATCH] Added missing files to EXTRA_DIST, removed nonexistant files from POTFILES.in --- capplets/background/ChangeLog | 1 + capplets/background/Makefile.am | 2 +- capplets/keyboard/ChangeLog | 4 +++- capplets/keyboard/Makefile.am | 5 +---- capplets/mouse/ChangeLog | 4 ++++ capplets/mouse/Makefile.am | 2 +- capplets/screensaver/ChangeLog | 2 ++ capplets/screensaver/Makefile.am | 2 +- capplets/sound/ChangeLog | 2 ++ capplets/sound/Makefile.am | 2 +- control-center/ChangeLog | 2 ++ control-center/Makefile.am | 2 +- po/POTFILES.in | 2 +- 13 files changed, 21 insertions(+), 11 deletions(-) diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index 714894452..d0a5ad8da 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,6 +1,7 @@ 2001-07-19 Bradford Hovinen * Makefile.am: Remove SUBDIRS + (background_properties_SOURCES): Added missing applier.h * prefs-widget.c: Remove references to auto apply feature diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am index 174456839..78364f92f 100644 --- a/capplets/background/Makefile.am +++ b/capplets/background/Makefile.am @@ -7,7 +7,7 @@ background_properties_SOURCES = \ main.c\ prefs-widget.c prefs-widget.h \ preferences.c preferences.h \ - applier.c + applier.c applier.h pixmap_DATA = diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index 2ce954c13..2b0d0f0fd 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,6 +1,8 @@ 2001-07-19 Bradford Hovinen - * Makefile.am (cappletname): Remove SUBDIRS + * Makefile.am: Remove SUBDIRS + Remove extraneous EXTRA_DIST + (EXTRA_DIST): Make sure to include defaults and OAF files * keyboard.desktop.in.in (Exec): Update for bonoboization diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am index f92d6fdf2..86c2f871b 100644 --- a/capplets/keyboard/Makefile.am +++ b/capplets/keyboard/Makefile.am @@ -17,9 +17,6 @@ defaults_DATA = keyboard-properties.xml oafdir = $(datadir)/oaf oaf_DATA = Bonobo_Control_Capplet_keyboard_properties.oaf -EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(oaf_DATA) $(defaults_DATA) - - ## ## You should not need to modify anything below this line ## @@ -28,7 +25,7 @@ EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(oaf_DATA) $(defaults_DATA) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) +EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA) $(oaf_DATA) iconsdir = $(GNOMECC_ICONS_DIR) Gladedir = $(GNOMECC_GLADE_DIR) pixmapdir = $(GNOMECC_PIXMAPS_DIR) diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog index 8860888a7..b7b58ac5a 100644 --- a/capplets/mouse/ChangeLog +++ b/capplets/mouse/ChangeLog @@ -1,3 +1,7 @@ +2001-07-19 Bradford Hovinen + + * Makefile.am (EXTRA_DIST): Added mouse-left.png and mouse-right.png + 2001-07-18 Chema Celorio * prefs-widget.c (set_pixmap_file): the path of the pixmaps was diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index 9781448bf..d81ba9d56 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -17,7 +17,7 @@ pixmap_DATA = mouse-left.png mouse-right.png INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) +EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) mouse-left.png mouse-right.png iconsdir = $(GNOMECC_ICONS_DIR) Gladedir = $(GNOMECC_GLADE_DIR) pixmapdir = $(GNOMECC_PIXMAPS_DIR) diff --git a/capplets/screensaver/ChangeLog b/capplets/screensaver/ChangeLog index 1484b69fe..74e7356c4 100644 --- a/capplets/screensaver/ChangeLog +++ b/capplets/screensaver/ChangeLog @@ -1,5 +1,7 @@ 2001-07-19 Bradford Hovinen + * Makefile.am (EXTRA_DIST): Added no-hack.png + * prefs-widget.c (about_cb): Don't free the description * main.c (setup_capplet_widget): Use capplet->dialog for parent of diff --git a/capplets/screensaver/Makefile.am b/capplets/screensaver/Makefile.am index 622f099ca..800b46d17 100644 --- a/capplets/screensaver/Makefile.am +++ b/capplets/screensaver/Makefile.am @@ -29,7 +29,7 @@ pixmap_DATA = no-hack.png INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) +EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) no-hack.png iconsdir = $(GNOMECC_ICONS_DIR) Gladedir = $(GNOMECC_GLADE_DIR) pixmapdir = $(GNOMECC_PIXMAPS_DIR) diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog index 41d432157..b262f970e 100644 --- a/capplets/sound/ChangeLog +++ b/capplets/sound/ChangeLog @@ -1,6 +1,8 @@ 2001-07-19 Bradford Hovinen * Makefile.am: Remove SUBDIRS + Remove extraneous EXTRA_DIST + Make sure to include defaults and OAF info files 2001-07-18 Bradford Hovinen diff --git a/capplets/sound/Makefile.am b/capplets/sound/Makefile.am index 506ccd830..c8f31e17f 100644 --- a/capplets/sound/Makefile.am +++ b/capplets/sound/Makefile.am @@ -12,7 +12,6 @@ pixmap_DATA = ## ## this is not generic ## -EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(oaf_DATA) $(defaults_DATA) defaultsdir= $(datadir)/control-center/defaults defaults_DATA = sound-properties.xml @@ -28,6 +27,7 @@ oaf_DATA = Bonobo_Control_Capplet_sound_properties.oaf INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) +EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA) $(oaf_DATA) iconsdir = $(GNOMECC_ICONS_DIR) Gladedir = $(GNOMECC_GLADE_DIR) pixmapdir = $(GNOMECC_PIXMAPS_DIR) diff --git a/control-center/ChangeLog b/control-center/ChangeLog index 87e452dab..0f197cde9 100644 --- a/control-center/ChangeLog +++ b/control-center/ChangeLog @@ -1,5 +1,7 @@ 2001-07-19 Bradford Hovinen + * Makefile.am (EXTRA_DIST): Added missing Gnome.directory.in.in + * capplet-dir.c (capplet_control_launch): Don't give an error if the property control is NULL diff --git a/control-center/Makefile.am b/control-center/Makefile.am index 63fd65663..e23f278dc 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 $(appicon_DATA) $(splash_DATA) $(glade_DATA) $(groups_in_files) +EXTRA_DIST = gnomecc.desktop.in Gnome.directory.in.in $(appicon_DATA) $(splash_DATA) $(glade_DATA) $(groups_in_files) paneldir = $(datadir)/gnome/apps/Settings ccenterdir = $(datadir)/control-center/capplets diff --git a/po/POTFILES.in b/po/POTFILES.in index eed9cdc77..e755e113f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,7 +6,7 @@ capplets/background/background-properties.glade capplets/background/prefs-widget.c capplets/keyboard/keyboard.desktop.in capplets/keyboard/keyboard-properties.glade -capplets/keyboard/prefs-widget.c +capplets/keyboard/main.c capplets/mouse/mouse.desktop.in capplets/mouse/mouse-properties.glade capplets/mouse/prefs-widget.c