From 35d967aed2132b888dae2a391eb916b87435a8ac Mon Sep 17 00:00:00 2001 From: Jose Maria Celorio Date: Wed, 18 Jul 2001 03:21:07 +0000 Subject: [PATCH] clean this mess. --- ChangeLog | 4 + acconfig.h | 1 + capplets/background/.cvsignore | 5 +- capplets/background/ChangeLog | 4 + capplets/background/Makefile.am | 56 ++++++------- ...es.desktop.in => background.desktop.in.in} | 2 +- capplets/background/main.c | 2 +- capplets/background/prefs-widget.c | 9 ++- capplets/default-applications/ChangeLog | 4 + capplets/default-applications/Makefile.am | 47 +++++------ .../default-applications-capplet.png | Bin 0 -> 3047 bytes .../default-applications-properties.glade | 1 + ....in => default-applications.desktop.in.in} | 0 capplets/desktop-links/.cvsignore | 2 + capplets/desktop-links/Sawfish/.cvsignore | 14 +--- capplets/keyboard/Makefile.am | 5 +- capplets/keyboard/prefs-widget.c | 2 +- capplets/mouse/.cvsignore | 5 +- capplets/mouse/Makefile.am | 10 +-- capplets/mouse/prefs-widget.c | 2 +- capplets/screensaver/.cvsignore | 5 +- capplets/screensaver/ChangeLog | 4 + capplets/screensaver/Makefile.am | 74 ++++++++---------- capplets/screensaver/main.c | 2 +- capplets/screensaver/preview.c | 2 +- ...s.desktop.in => screensaver.desktop.in.in} | 0 capplets/sound/.cvsignore | 4 +- capplets/sound/ChangeLog | 4 + capplets/sound/Makefile.am | 55 ++++++------- ...perties.desktop.in => sound.desktop.in.in} | 0 configure.in | 19 +++-- po/POTFILES.in | 10 +-- 32 files changed, 186 insertions(+), 168 deletions(-) create mode 100644 capplets/background/ChangeLog rename capplets/background/{background-properties.desktop.in => background.desktop.in.in} (80%) create mode 100644 capplets/default-applications/default-applications-capplet.png create mode 100644 capplets/default-applications/default-applications-properties.glade rename capplets/default-applications/{default-application-properties.desktop.in => default-applications.desktop.in.in} (100%) rename capplets/screensaver/{screensaver-properties.desktop.in => screensaver.desktop.in.in} (100%) rename capplets/sound/{sound-properties.desktop.in => sound.desktop.in.in} (100%) diff --git a/ChangeLog b/ChangeLog index 517346cc9..d1fa01caa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2001-07-17 Chema Celorio + * configure.in: define the directories + + * capplets/background/Makefile.am (SUBDIRS): clean + * configure.in (gnome_cv_use_gnome): clean the macro 2001-07-17 Bradford Hovinen diff --git a/acconfig.h b/acconfig.h index b112f619d..26c07d915 100644 --- a/acconfig.h +++ b/acconfig.h @@ -10,6 +10,7 @@ #undef HAVE_XIMIAN_ARCHIVER #undef GNOMECC_ICONS_DIR #undef GNOMECC_GLADE_DIR +#undef GNOMECC_PIXMAPS_DIR #undef PACKAGE #undef VERSION diff --git a/capplets/background/.cvsignore b/capplets/background/.cvsignore index 959ce476b..81a7935af 100644 --- a/capplets/background/.cvsignore +++ b/capplets/background/.cvsignore @@ -5,5 +5,6 @@ Makefile.in *.o *.lo *.la -background-properties-capplet -background-properties.desktop +background-properties +background.desktop +background.desktop.in \ No newline at end of file diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog new file mode 100644 index 000000000..ce3929643 --- /dev/null +++ b/capplets/background/ChangeLog @@ -0,0 +1,4 @@ +2001-07-17 Chema Celorio + + * start + diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am index 3901c9d8c..31b8d33df 100644 --- a/capplets/background/Makefile.am +++ b/capplets/background/Makefile.am @@ -1,33 +1,29 @@ -Applicationsdir = $(datadir)/control-center/capplets -Applications_in_files = background-properties.desktop.in -Applications_DATA = $(Applications_in_files:.desktop.in=.desktop) +SUBDIRS = + +cappletname = background +bin_PROGRAMS = background-properties + +background_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) +background_properties_SOURCES = \ + main.c\ + prefs-widget.c prefs-widget.h \ + preferences.c preferences.h \ + applier.c + +## +## You should not need to modify anything below this line +## @XML_I18N_MERGE_DESKTOP_RULE@ +@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ -pApplicationsdir = $(datadir)/gnome/apps/Settings/Desktop -pApplications_DATA = $(Applications_DATA) +INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) +EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) +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) -Gladedir = $(datadir)/control-center-data -Glade_DATA = \ - background-properties.glade - -EXTRA_DIST = $(Applications_in_files) $(Glade_DATA) - -INCLUDES = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ - -DG_LOG_DOMAIN=\"background-properties\" \ - -DGLADE_DATADIR=\""$(Gladedir)"\" \ - @BG_CAPPLET_CFLAGS@ \ - -I$(top_srcdir)/ \ - -I$(top_srcdir)/intl - -bin_PROGRAMS = background-properties-capplet - -background_properties_capplet_SOURCES = \ - prefs-widget.c prefs-widget.h \ - preferences.c preferences.h \ - applier.c applier.h \ - main.c - -background_properties_capplet_LDADD = \ - @BG_CAPPLET_LIBS@ diff --git a/capplets/background/background-properties.desktop.in b/capplets/background/background.desktop.in.in similarity index 80% rename from capplets/background/background-properties.desktop.in rename to capplets/background/background.desktop.in.in index c68ed73d3..ba38af860 100644 --- a/capplets/background/background-properties.desktop.in +++ b/capplets/background/background.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] _Name=Background _Comment=Configuration of the desktop's background -Exec=background-properties-capplet +Exec=background-properties Icon=gnome-ccbackground.png Terminal=0 Type=Application diff --git a/capplets/background/main.c b/capplets/background/main.c index 1193e2978..2d94704e8 100644 --- a/capplets/background/main.c +++ b/capplets/background/main.c @@ -269,7 +269,7 @@ main (int argc, char **argv) } gnome_window_icon_set_default_from_file - (GNOME_ICONDIR"/gnome-ccbackground.png"); + (GNOMECC_ICONS_DIR"/gnome-ccbackground.png"); #ifdef HAVE_XIMIAN_ARCHIVER archive = ARCHIVE (archive_load (FALSE)); diff --git a/capplets/background/prefs-widget.c b/capplets/background/prefs-widget.c index 1a8a9437b..c00e986ba 100644 --- a/capplets/background/prefs-widget.c +++ b/capplets/background/prefs-widget.c @@ -123,8 +123,13 @@ prefs_widget_init (PrefsWidget *prefs_widget) int i; prefs_widget->dialog_data = - glade_xml_new (GLADE_DATADIR "/background-properties.glade", - "prefs_widget"); + glade_xml_new (GNOMECC_GLADE_DIR "/background-properties.glade", + "prefs_widget"); + if (prefs_widget->dialog_data == NULL) { + g_warning ("Could not load \"%s\"\n", + GNOMECC_GLADE_DIR "/background-properties.glade"); + return; + } widget = glade_xml_get_widget (prefs_widget->dialog_data, "prefs_widget"); diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog index 657c33972..1431dbc40 100644 --- a/capplets/default-applications/ChangeLog +++ b/capplets/default-applications/ChangeLog @@ -1,3 +1,7 @@ +2001-07-17 Chema Celorio + + * Makefile.am (SUBDIRS): clean + 2001-07-17 Bradford Hovinen * Makefile.am (default_application_properties_capplet_SOURCES): diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am index 254c090f4..f6184c01f 100644 --- a/capplets/default-applications/Makefile.am +++ b/capplets/default-applications/Makefile.am @@ -1,29 +1,32 @@ -INCLUDES = -I. -I$(srcdir) \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) \ - -DGNOMESYSCONFDIR=\""$(sysconfdir)"\" \ - @CAPPLET_CFLAGS@ +SUBDIRS = -bin_PROGRAMS = default-application-properties-capplet +cappletname = default-applications +bin_PROGRAMS = default-applications-properties -default_application_properties_capplet_SOURCES = \ - default-application-properties.c \ - interface.c interface.h \ - callbacks.c callbacks.h \ - support.c support.h \ +default_applications_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) +default_applications_properties_SOURCES = \ + default-application-properties.c \ + interface.c interface.h \ + callbacks.c callbacks.h \ + support.c support.h \ defaults.h -default_application_properties_capplet_LDADD = @CAPPLET_LIBS@ +pixmap_DATA = -EXTRA_DIST = \ - default-application-properties.desktop.in \ - default-application-properties.desktop - -sysdir = $(datadir)/control-center/capplets/ -sys_in_files = default-application-properties.desktop.in -sys_DATA = $(sys_in_files:.desktop.in=.desktop) +## +## You should not need to modify anything below this line +## @XML_I18N_MERGE_DESKTOP_RULE@ +@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ + +INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\" +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) +EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) +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) -install-data-local: - $(INSTALL_DATA) $(srcdir)/default-application-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/default-application-properties.desktop diff --git a/capplets/default-applications/default-applications-capplet.png b/capplets/default-applications/default-applications-capplet.png new file mode 100644 index 0000000000000000000000000000000000000000..c085f67ac97f8ee92906ea6d1fa72323242986fc GIT binary patch literal 3047 zcmV>BtIgtSug1sXn4@nLtREurd%m0F=n6)k-s0xeLw>UN#~&Zquwg@wyH5FC0uZi%p;umcrGM+zt?5`Smew?_R|t^=5gM|NJu}BO?Gyl+Wk2v9U2P zny9H%>P{);762i{x1-VMVyo3U<;??5fY0U?QR^qb8}2>snwD#|RRIvIbkZoW6Zny$ zD7QI|^OXh1jvXTsi2(52bI<)>@AwPg$1bhffOSRA2m-h+3y4(+p8yW+*|X>0_wV0N zI2@+0ua9szjFb{ZQAnrL07xmBnVA8gP$*zo7N%+P#v5-?E|*^d{vMch>E%%?n0cMR zkgKJ})#fx{|KQ-@$noRHx#gBy&@>IlaWGAjk&zLy*(^OhJvfeos;V?wO_GTuJ9qA+ zP$*EV)p+NfcQ|q41fPET>AwK~27DUu56_(PiodKCfa+4G_QDG=I7@zO%q+$ zDVNJkO-%u?annXrMI{spVVWkx!^509b&7huj;`xCj>Cox8+iKZrzsQ)e*>HViUCVF zUpt0hqo%p5x3`y}p&<%|0^GAy&TO39l%MKW@A2HmcPs>2#WAt4X8Lz_Kjb?KZVqjaIA0+}s@5Y?hmDx(Q$a z=yCxl>jgjo)Ox+n^z<~ku9HY4d=Nqiq?AZ0>FMpEe_KD9OolJM_yWsZi9R0H+U+(I z6B9h}zysWT^Ub)zM+2p{ST72N`uh6VxpOBoGc&|uG2DcO5CTP6c|05r6NyBKMPr0Q zAtaJktA$}0sH%!>+c=IxJRT<+jRM>hD67SK_<&fEQ`}yw)yQVEOioTBr6e2RtJ>tOrIZjt zh>ej*1WnUuG#VI&L95jwo6RycHHBqb7;OXFwka+bSzKI1N=Ymhqqn!0vuDp@Sr(;I ziANrJgo%j>Y}>{SpW0f5zg8F(s;c6Z4MGSSjRw_fm8GR6_U+q8B9Y+i*|W^d%rN>t zqcodMG)+U(H1_S=$H9XK(RH0?o_PjM)9C5x@hq?{P~3G6fRs`QA-qf|G)?p4`{vD? z`S8OJdHCUnky3Ku!UYx=7umFV6Zu@8LZLt|m*eQ49wnJfa_Q0~%H=YtR0<&kp->3N zaVVF|0O>2}(-{f{ga;rRjZ!QYiO1vAYBh?*BD$`l>pF^}kjZ2?a^wi9REqoVyN^sJ zgX1{N&CU5aAeYN|v>}(v`9)tK`ULmIvXeeQEEYpmRqFLR^?IE~qk#|tRaN~$PE}Nv z3(HhO6&4p4iO1uNkB{Rx4pK^=g86)&TrNi{l?r})P4u~DS0a%}P$(4m=%bJ5>+2(( zP9vox6bkvn3#YoSlgs6}c<~~JVfYrXZ5ts3mo8o6$dMzcsv7*ZSg$bZ1IT1DwA*dY zoH;|eT>eTakO*mGRVvi$nTd$v}q`Rkg^W-hSNmumrX zH6M`mdVSI`j4g9>b3`H$wr$(y18^M2AAo;vnx+ph5{b~&)kQcQ#9kj!PPm;1 zYc0F6Ygxbvhr^#NEG(?lI>jQl-g>J~o1lh0K&EN>TK1^dYPIO;=|R_ZEX!hHVFBQ` zfgPE>78+d*fc@s1Z~nv7)D)_!QmItfv1138W%ZNn%&M`bZjG`!1tJSYi#{=QTeGizbs-)9ty1KfkR;%22jY8VF9 zYL)Zn&*QdL8bEVB0eDR&vsSD9OxN|=d+)tRy@X3=W$>nl>a`ODZ3$32eUgGl-p5r*^y3VjUt1X_jUAiB3@zip3(DrXhr& z-EMRG^l9?>{C~Us(Iuedw$H8gv;ct9*Vku;!{K_f+5G2s-+h;{v9YhvMAI}fnT%gI zwcBlM+eX)Qs?{pFT+VyupWNnd#ih@hg}?Z0Jre?O;YigFTL~@Ad!y002ovPDHLkV1ggs{-FQ> literal 0 HcmV?d00001 diff --git a/capplets/default-applications/default-applications-properties.glade b/capplets/default-applications/default-applications-properties.glade new file mode 100644 index 000000000..56a6051ca --- /dev/null +++ b/capplets/default-applications/default-applications-properties.glade @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/capplets/default-applications/default-application-properties.desktop.in b/capplets/default-applications/default-applications.desktop.in.in similarity index 100% rename from capplets/default-applications/default-application-properties.desktop.in rename to capplets/default-applications/default-applications.desktop.in.in diff --git a/capplets/desktop-links/.cvsignore b/capplets/desktop-links/.cvsignore index b6f75f648..a7bdbb814 100644 --- a/capplets/desktop-links/.cvsignore +++ b/capplets/desktop-links/.cvsignore @@ -1 +1,3 @@ gnome-hint-properties.desktop +Makefile +Makefile.in diff --git a/capplets/desktop-links/Sawfish/.cvsignore b/capplets/desktop-links/Sawfish/.cvsignore index 3e935a167..679e2c00c 100644 --- a/capplets/desktop-links/Sawfish/.cvsignore +++ b/capplets/desktop-links/Sawfish/.cvsignore @@ -1,12 +1,4 @@ Sawfish.directory -appearance-properties.desktop -bindings-properties.desktop -focus-properties.desktop -match-properties.desktop -maximize-properties.desktop -meta-properties.desktop -misc-properties.desktop -move-properties.desktop -placement-properties.desktop -sound-properties.desktop -workspace-properties.desktop +*.desktop +Makefile +Makefile.in diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am index cdef31eeb..c1ababe04 100644 --- a/capplets/keyboard/Makefile.am +++ b/capplets/keyboard/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = + cappletname = keyboard bin_PROGRAMS = keyboard-properties @@ -18,7 +20,8 @@ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) 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 +desktop = $(cappletname).desktop all-local: $(desktop) \ No newline at end of file diff --git a/capplets/keyboard/prefs-widget.c b/capplets/keyboard/prefs-widget.c index bfa097bcd..732dbe2e1 100644 --- a/capplets/keyboard/prefs-widget.c +++ b/capplets/keyboard/prefs-widget.c @@ -95,7 +95,7 @@ prefs_widget_init (PrefsWidget *prefs_widget) GtkAdjustment *adjustment; prefs_widget->dialog_data = - glade_xml_new (GLADE_DATADIR "/keyboard-properties.glade", + glade_xml_new (GNOMECC_GLADE_DIR "/keyboard-properties.glade", "prefs_widget"); glade_xml_signal_connect_data diff --git a/capplets/mouse/.cvsignore b/capplets/mouse/.cvsignore index 73b6874e4..6b4496b0b 100644 --- a/capplets/mouse/.cvsignore +++ b/capplets/mouse/.cvsignore @@ -5,5 +5,6 @@ Makefile.in *.o *.lo *.la -mouse-properties-capplet -mouse-properties.desktop +mouse-properties +mouse.desktop +mouse.desktop.in diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index 0492225fb..9781448bf 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -1,16 +1,13 @@ cappletname = mouse bin_PROGRAMS = mouse-properties -mouse_properties_LDADD = @CAPPLET_LIBS@ +mouse_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) mouse_properties_SOURCES = \ main.c\ prefs-widget.c prefs-widget.h \ preferences.c preferences.h -pixmapdir = $(datadir)/pixmaps -pixmap_DATA = \ - mouse-left.png \ - mouse-right.png +pixmap_DATA = mouse-left.png mouse-right.png ## ## You should not need to modify anything below this line @@ -23,8 +20,9 @@ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) 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 +desktop = $(cappletname).desktop all-local: $(desktop) diff --git a/capplets/mouse/prefs-widget.c b/capplets/mouse/prefs-widget.c index d21ddb7d1..4e21e68be 100644 --- a/capplets/mouse/prefs-widget.c +++ b/capplets/mouse/prefs-widget.c @@ -97,7 +97,7 @@ prefs_widget_init (PrefsWidget *prefs_widget) GtkAdjustment *adjustment; prefs_widget->dialog_data = - glade_xml_new (GLADE_DATADIR "/mouse-properties.glade", + glade_xml_new (GNOMECC_GLADE_DIR "/mouse-properties.glade", "prefs_widget"); widget = glade_xml_get_widget (prefs_widget->dialog_data, diff --git a/capplets/screensaver/.cvsignore b/capplets/screensaver/.cvsignore index 106c51538..847b8a5cd 100644 --- a/capplets/screensaver/.cvsignore +++ b/capplets/screensaver/.cvsignore @@ -5,5 +5,6 @@ Makefile.in *.lo *.la *.o -screensaver-properties-capplet -screensaver-properties.desktop +screensaver-properties +screensaver.desktop.in +screensaver.desktop diff --git a/capplets/screensaver/ChangeLog b/capplets/screensaver/ChangeLog index 6f46948ac..92b98cfef 100644 --- a/capplets/screensaver/ChangeLog +++ b/capplets/screensaver/ChangeLog @@ -1,3 +1,7 @@ +2001-07-17 Chema Celorio + + * Makefile.am (SUBDIRS): clean + 2001-07-17 Bradford Hovinen * Makefile.am (EXTRA_DIST): Changed Applications_DATA to diff --git a/capplets/screensaver/Makefile.am b/capplets/screensaver/Makefile.am index 0328b82ea..e00d2a8a2 100644 --- a/capplets/screensaver/Makefile.am +++ b/capplets/screensaver/Makefile.am @@ -1,47 +1,39 @@ -pixmapdir = $(datadir)/pixmaps -pixmap_DATA = \ - no-hack.png - -Applicationsdir = $(datadir)/control-center/capplets -Applications_in_files = screensaver-properties.desktop.in -Applications_DATA = $(Applications_in_files:.desktop.in=.desktop) -@XML_I18N_MERGE_DESKTOP_RULE@ - -pApplicationsdir = $(datadir)/gnome/apps/Settings/Desktop -pApplications_DATA = $(Applications_DATA) - -Gladedir = $(datadir)/control-center-data -Glade_DATA = \ - screensaver-properties.glade - SUBDIRS = screensavers -EXTRA_DIST = ChangeLog $(Applications_in_files) $(pixmap_DATA) $(Glade_DATA) +cappletname = screensaver +bin_PROGRAMS = screensaver-properties -INCLUDES = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ - -DSSPROP_DATADIR=\""${prefix}/share"\" \ - -DG_LOG_DOMAIN=\"screensaver-properties\" \ - -DGLADE_DATADIR=\""$(Gladedir)"\" \ - @SCREENSAVER_CAPPLET_CFLAGS@ \ - -I$(top_srcdir)/ \ - -I$(top_srcdir)/intl +screensaver_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) -lXt +screensaver_properties_SOURCES = \ + main.c \ + prefs-widget.c prefs-widget.h\ + preferences.c preferences.h\ + screensaver-prefs-dialog.c screensaver-prefs-dialog.h\ + selection-dialog.c selection-dialog.h \ + pref-file.c pref-file.h\ + preview.c preview.h\ + expr.c expr.h\ + daemon.c daemon.h\ + rc-parse.c rc-parse.h\ + resources.c resources.h\ + XScreenSaver_ad.h -bin_PROGRAMS = screensaver-properties-capplet +pixmap_DATA = no-hack.png -screensaver_properties_capplet_SOURCES = \ - prefs-widget.c prefs-widget.h\ - preferences.c preferences.h\ - screensaver-prefs-dialog.c screensaver-prefs-dialog.h\ - selection-dialog.c selection-dialog.h \ - pref-file.c pref-file.h \ - preview.c preview.h \ - expr.c expr.h \ - daemon.c daemon.h \ - rc-parse.c rc-parse.h \ - resources.c resources.h \ - XScreenSaver_ad.h \ - main.c +## +## You should not need to modify anything below this line +## +@XML_I18N_MERGE_DESKTOP_RULE@ +@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ + +INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DSSPROP_DATADIR=\""${prefix}/share"\" +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) +EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) +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) -screensaver_properties_capplet_LDADD = @SCREENSAVER_CAPPLET_LIBS@ -lXt diff --git a/capplets/screensaver/main.c b/capplets/screensaver/main.c index 3de937203..5a2d7eb50 100644 --- a/capplets/screensaver/main.c +++ b/capplets/screensaver/main.c @@ -374,7 +374,7 @@ main (int argc, char **argv) } gnome_window_icon_set_default_from_file - (GNOME_ICONDIR"/gnome-ccscreensaver.png"); + (GNOMECC_ICONS_DIR"/gnome-ccscreensaver.png"); init_resource_database (argc, argv); #ifdef HAVE_XIMIAN_ARCHIVER diff --git a/capplets/screensaver/preview.c b/capplets/screensaver/preview.c index 6f878c882..54973280e 100644 --- a/capplets/screensaver/preview.c +++ b/capplets/screensaver/preview.c @@ -232,7 +232,7 @@ show_screensaver_timeout (void) } else if (ret > 0) { pixbuf = gdk_pixbuf_new_from_file - (GNOME_ICONDIR "/no-hack.png"); + (GNOMECC_PIXMAPS_DIR "/no-hack.png"); gdk_pixbuf_render_to_drawable (pixbuf, (GdkDrawable *) preview_window->window, preview_window->style->fg_gc[0], 0, 0, 0, 0, diff --git a/capplets/screensaver/screensaver-properties.desktop.in b/capplets/screensaver/screensaver.desktop.in.in similarity index 100% rename from capplets/screensaver/screensaver-properties.desktop.in rename to capplets/screensaver/screensaver.desktop.in.in diff --git a/capplets/sound/.cvsignore b/capplets/sound/.cvsignore index 9ed7ffd15..3cf9f4c6d 100644 --- a/capplets/sound/.cvsignore +++ b/capplets/sound/.cvsignore @@ -5,5 +5,7 @@ Makefile.in *.lo *.la *.o -sound-properties-capplet sound-properties.desktop +sound-properties +sound.desktop.in +sound.desktop \ No newline at end of file diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog index a4f3225c5..8387d85a6 100644 --- a/capplets/sound/ChangeLog +++ b/capplets/sound/ChangeLog @@ -1,3 +1,7 @@ +2001-07-17 Chema Celorio + + * Makefile.am (SUBDIRS): clean + 2001-07-17 Bradford Hovinen * sound-properties-capplet.c (create_dialog): Implement diff --git a/capplets/sound/Makefile.am b/capplets/sound/Makefile.am index e892774aa..4e6466a0e 100644 --- a/capplets/sound/Makefile.am +++ b/capplets/sound/Makefile.am @@ -1,39 +1,34 @@ -Applicationsdir = $(datadir)/control-center/capplets -Applications_in_files = sound-properties.desktop.in -Applications_DATA = $(Applications_in_files:.desktop.in=.desktop) -@XML_I18N_MERGE_DESKTOP_RULE@ - -pApplicationsdir = $(datadir)/gnome/apps/Settings/Desktop -pApplications_DATA = $(Applications_DATA) - -Gladedir = $(datadir)/control-center/interfaces -Glade_DATA = \ - sound-properties.glade +SUBDIRS = defaultsdir= $(datadir)/control-center/defaults -defaults_DATA = \ - sound-properties.xml +defaults_DATA = sound-properties.xml oafdir = $(datadir)/oaf -oaf_DATA = \ - Bonobo_Control_Capplet_sound_properties.oaf +oaf_DATA = Bonobo_Control_Capplet_sound_properties.oaf -EXTRA_DIST = ChangeLog $(Applications_in_files) $(Glade_DATA) $(oaf_DATA) $(defaults_DATA) +EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(oaf_DATA) $(defaults_DATA) -INCLUDES = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DG_LOG_DOMAIN=\"sound-properties\" \ - -DGLADE_DATADIR=\""$(datadir)/control-center/interfaces"\" \ - -I$(top_srcdir)/ \ - -I$(top_srcdir)/intl \ - -I$(top_srcdir)/capplets/common \ - @CAPPLET_CFLAGS@ +cappletname = sound +bin_PROGRAMS = sound-properties -bin_PROGRAMS = sound-properties-capplet - -sound_properties_capplet_SOURCES = \ +sound_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) +sound_properties_SOURCES = \ sound-properties-capplet.c -sound_properties_capplet_LDADD = \ - @CAPPLET_LIBS@ \ - $(top_builddir)/capplets/common/libcommon.a +pixmap_DATA = + +## +## You should not need to modify anything below this line +## +@XML_I18N_MERGE_DESKTOP_RULE@ +@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ + +INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) +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) diff --git a/capplets/sound/sound-properties.desktop.in b/capplets/sound/sound.desktop.in.in similarity index 100% rename from capplets/sound/sound-properties.desktop.in rename to capplets/sound/sound.desktop.in.in diff --git a/configure.in b/configure.in index 291f4de4c..8f87a7600 100644 --- a/configure.in +++ b/configure.in @@ -103,11 +103,11 @@ else AC_MSG_ERROR(You need at least bonobo-conf 0.7 or greater for this version of control-center.) fi -capplet_modules="libcapplet libglade-gnome gdk_pixbuf bonobo_conf $ARCHIVER_MODULE" +capplet_modules="libcapplet libglade-gnome gdk_pixbuf bonobo_conf gdk_pixbuf_xlib gal $ARCHIVER_MODULE" PKG_CHECK_MODULES(CAPPLET, $capplet_modules) -PKG_CHECK_MODULES(BG_CAPPLET, $capplet_modules gdk_pixbuf_xlib) -PKG_CHECK_MODULES(SCREENSAVER_CAPPLET, $capplet_modules gal) +dnl PKG_CHECK_MODULES(BG_CAPPLET, $capplet_modules gdk_pixbuf_xlib) +dnl PKG_CHECK_MODULES(SCREENSAVER_CAPPLET, $capplet_modules gal) dnl PKG_CHECK_MODULES(ROLLBACK_CAPPLET, $capplet_modules) PKG_CHECK_MODULES(GNOMECC, gnomeui libglade xml gdk_pixbuf gnomecanvaspixbuf bonobo bonobox gtkhtml) PKG_CHECK_MODULES(RMHELPER, gnomeui gnomecanvaspixbuf) @@ -115,16 +115,21 @@ PKG_CHECK_MODULES(ARCHIVER, bonobo bonobo_conf xml) PKG_CHECK_MODULES(MONIKER, bonobo bonobo_conf xml) PKG_CHECK_MODULES(CONFIG_ARCHIVER, gnome xml) -GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} -I\$(top_srcdir)/intl -I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"keyboard-properties\\\"\" -DGLADE_DATADIR=\"\\\"${datadir}/control-center\\\"\" -DGNOMELOCALEDIR=\"\\\"${datadir}/locale\\\"\" " +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" +AC_SUBST(GNOMECC_CAPPLETS_CFLAGS) +AC_SUBST(GNOMECC_CAPPLETS_LIBS) -AC_DEFINE_UNQUOTED(GNOMECC_ICONS_DIR, "${datadir}/${PACKAGE}/icons") +AC_DEFINE_UNQUOTED(GNOMECC_ICONS_DIR, "${prefix}/share/${PACKAGE}/icons") GNOMECC_ICONS_DIR=""${datadir}/${PACKAGE}/icons"" AC_SUBST(GNOMECC_ICONS_DIR) -AC_DEFINE_UNQUOTED(GNOMECC_GLADE_DIR, "${datadir}/${PACKAGE}/interfaces") +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"" +AC_SUBST(GNOMECC_PIXMAPS_DIR) -AC_SUBST(GNOMECC_CAPPLETS_CFLAGS) AC_SUBST(CFLAGS) AC_SUBST(LDFLAGS) diff --git a/po/POTFILES.in b/po/POTFILES.in index 5dd325693..b5471f98c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,19 +2,19 @@ Gnome.directory.in archiver/location.c archiver/main.c capplets/background/applier.c -capplets/background/background-properties.desktop.in +capplets/background/background.desktop.in capplets/background/background-properties.glade capplets/background/prefs-widget.c -capplets/keyboard/keyboard-properties.desktop.in +capplets/keyboard/keyboard.desktop.in capplets/keyboard/keyboard-properties.glade capplets/keyboard/prefs-widget.c -capplets/mouse/mouse-properties.desktop.in +capplets/mouse/mouse.desktop.in capplets/mouse/mouse-properties.glade capplets/mouse/prefs-widget.c capplets/screensaver/preferences.c capplets/screensaver/prefs-widget.c capplets/screensaver/screensaver-prefs-dialog.c -capplets/screensaver/screensaver-properties.desktop.in +capplets/screensaver/screensaver.desktop.in capplets/screensaver/screensaver-properties.glade capplets/screensaver/screensavers/3d_clock.xml capplets/screensaver/screensavers/ant.xml @@ -67,7 +67,7 @@ capplets/screensaver/screensavers/vines.xml capplets/screensaver/screensavers/xroger.xml capplets/screensaver/selection-dialog.c capplets/sound/sound-properties-capplet.c -capplets/sound/sound-properties.desktop.in +capplets/sound/sound.desktop.in capplets/sound/sound-properties.glade control-center/capplet-dir.c control-center/capplet-dir-view.c