diff options
| author | James Henstridge <james@jamesh.id.au> | 2004-11-28 08:14:05 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2004-11-28 08:14:05 +0000 |
| commit | ebd8e46d445019839868f1e907f167dad0e16c86 (patch) | |
| tree | 926a932b2fcdd592b238d783a9351bebb291794d | |
| parent | a37db9f09d7288580031c42b61ec73e3a167eb5c (diff) | |
| download | gnome-control-center-ebd8e46d445019839868f1e907f167dad0e16c86.tar.gz | |
use GNOMELOCALEDIR.
2004-11-28 James Henstridge <james@jamesh.id.au>
* vfs-methods/themus/themus-properties-main.c: use GNOMELOCALEDIR.
* vfs-methods/themus/Makefile.am: similar changes to the fontilus
ones.
* vfs-methods/fontilus/fontilus-context-menu.c: same here.
* vfs-methods/fontilus/font-view.c: use GNOMELOCALEDIR rather than
FONTILUS_LOCALEDIR in the bindtextdomain() call, to match the rest
of gnome-control-center.
* vfs-methods/fontilus/Makefile.am: similar schema and desktop
file fixes. Don't include the old mime files in the dist.
* schemas/Makefile.am: remove .schemas files on clean, when
installing schemas, look for them in builddir rather than srcdir.
* gnome-settings-daemon/actions/Makefile.am: fix up build rules so
that ALSA_CFLAGS isn't defined multiple times (use the newer
automake += syntax).
* control-center/Makefile.am: distribute $(icon_DATA).
* capplets/*/Makefile.am: put the .desktop and .desktop.in files
in CLEANFILES. The .desktop.in.in file gets included because it
is listed in the configure script.
* configure.in: update configure script, and remove macro calls
that are not needed by modern versions of Automake.
* Makefile.am: remove intltool files on distclean.
* autogen.sh: request Automake >= 1.7.
26 files changed, 143 insertions, 164 deletions
@@ -1,5 +1,39 @@ 2004-11-28 James Henstridge <james@jamesh.id.au> + * vfs-methods/themus/themus-properties-main.c: use GNOMELOCALEDIR. + + * vfs-methods/themus/Makefile.am: similar changes to the fontilus + ones. + + * vfs-methods/fontilus/fontilus-context-menu.c: same here. + + * vfs-methods/fontilus/font-view.c: use GNOMELOCALEDIR rather than + FONTILUS_LOCALEDIR in the bindtextdomain() call, to match the rest + of gnome-control-center. + + * vfs-methods/fontilus/Makefile.am: similar schema and desktop + file fixes. Don't include the old mime files in the dist. + + * schemas/Makefile.am: remove .schemas files on clean, when + installing schemas, look for them in builddir rather than srcdir. + + * gnome-settings-daemon/actions/Makefile.am: fix up build rules so + that ALSA_CFLAGS isn't defined multiple times (use the newer + automake += syntax). + + * control-center/Makefile.am: distribute $(icon_DATA). + + * capplets/*/Makefile.am: put the .desktop and .desktop.in files + in CLEANFILES. The .desktop.in.in file gets included because it + is listed in the configure script. + + * configure.in: update configure script, and remove macro calls + that are not needed by modern versions of Automake. + + * Makefile.am: remove intltool files on distclean. + + * autogen.sh: request Automake >= 1.7. + * configure.in (FONT_THUMBNAILER_LIBS): fix up typo that I introduced in the configure script. Should fix the build properly now. diff --git a/Makefile.am b/Makefile.am index e00b87873..dc27afed5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,14 +11,13 @@ SUBDIRS = po libsounds libbackground libwindow-settings libgswitchit libkbdraw g dist-hook: control-center.spec cp control-center.spec $(distdir) -#MAINTAINERCLEANFILES = \ -# intltool-extract \ -# intltool-merge \ -# intltool-update +DISTCLEANFILES = \ + intltool-extract \ + intltool-merge \ + intltool-update EXTRA_DIST = \ control-center.spec.in \ intltool-extract.in \ intltool-merge.in \ - intltool-update.in \ - control-center2.png + intltool-update.in diff --git a/autogen.sh b/autogen.sh index f3e3183b3..4dad4ef1d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -18,28 +18,10 @@ DIE=0 rm -f .using-gnome-libs-package -# This is a bit complicated here since we can't use gnome-config yet. -# It'll be easier after switching to pkg-config since we can then -# use pkg-config to find the gnome-autogen.sh script. - -gnome_autogen= -gnome_datadir= - -ifs_save="$IFS"; IFS=":" -for dir in $PATH ; do - test -z "$dir" && dir=. - if test -f $dir/gnome-autogen.sh ; then - gnome_autogen="$dir/gnome-autogen.sh" - gnome_datadir=`echo $dir | sed -e 's,/bin$,/share,'` - break - fi -done -IFS="$ifs_save" - -if test -z "$gnome_autogen" ; then +if ! which gnome-autogen.sh ; then echo "You need to install the gnome-common module and make" echo "sure the gnome-autogen.sh script is in your \$PATH." exit 1 fi -REQUIRED_AUTOMAKE_VERSION=1.4 GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 . $gnome_autogen +REQUIRED_AUTOMAKE_VERSION=1.7 . gnome-autogen.sh diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am index 095771e8a..28537c63f 100644 --- a/capplets/accessibility/at-properties/Makefile.am +++ b/capplets/accessibility/at-properties/Makefile.am @@ -25,5 +25,5 @@ INCLUDES = $(AT_CAPPLET_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \ -DGLADEDIR=\""$(gladedir)"\" \ -DPIXMAPDIR=\""$(pixmapdir)"\" -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(glade_DATA) $(pixmap_DATA) $(Desktop_in_files) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +EXTRA_DIST = $(glade_DATA) $(pixmap_DATA) diff --git a/capplets/accessibility/keyboard/Makefile.am b/capplets/accessibility/keyboard/Makefile.am index 34172947f..1ee9af4f1 100644 --- a/capplets/accessibility/keyboard/Makefile.am +++ b/capplets/accessibility/keyboard/Makefile.am @@ -31,6 +31,6 @@ Desktop_in_files = accessibility-keyboard.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmap_DATA) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA) diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am index bac34ba08..d965715a9 100644 --- a/capplets/background/Makefile.am +++ b/capplets/background/Makefile.am @@ -37,11 +37,11 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(WALLPAPER_DATADIR) EXTRA_DIST = \ - $(desktop_in_files) \ + background.desktop.in.in \ $(glade_DATA) CLEANFILES = \ - $(desktop_DATA) + $(desktop_in_files) $(desktop_DATA) MAINTAINERCLEANFILES = \ Makefile.in diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am index b5906ecd4..da07602cf 100644 --- a/capplets/default-applications/Makefile.am +++ b/capplets/default-applications/Makefile.am @@ -14,5 +14,5 @@ Desktop_in_files = default-applications.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) gnome-default-applications-properties-structs.c +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +EXTRA_DIST = $(Glade_DATA) gnome-default-applications-properties-structs.c diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am index 6c7b9c016..886ca1b39 100644 --- a/capplets/display/Makefile.am +++ b/capplets/display/Makefile.am @@ -22,5 +22,5 @@ INCLUDES = $(DISPLAY_CAPPLET_CFLAGS) \ -DGLADEDIR=\""$(gladedir)"\" \ -DPIXMAPDIR=\""$(pixmapdir)"\" -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(Desktop_in_files) $(icons_DATA) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +EXTRA_DIST = $(icons_DATA) diff --git a/capplets/font/Makefile.am b/capplets/font/Makefile.am index 404932d1d..3af71c025 100644 --- a/capplets/font/Makefile.am +++ b/capplets/font/Makefile.am @@ -27,5 +27,5 @@ INCLUDES = $(FONT_CAPPLET_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \ -DGLADEDIR=\""$(gladedir)"\" \ -DPIXMAPDIR=\""$(pixmapdir)"\" -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(Desktop_in_files) $(glade_DATA) $(pixmap_DATA) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +EXTRA_DIST = $(glade_DATA) $(pixmap_DATA) diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am index 2ff7ed46c..cbbc59de7 100644 --- a/capplets/keybindings/Makefile.am +++ b/capplets/keybindings/Makefile.am @@ -18,6 +18,6 @@ Desktop_in_files = keybinding.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +EXTRA_DIST = $(Glade_DATA) diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am index a8acc8c84..56ad9f2d2 100644 --- a/capplets/keyboard/Makefile.am +++ b/capplets/keyboard/Makefile.am @@ -30,5 +30,5 @@ Desktop_in_files = keyboard.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBXKLAVIER_CFLAGS) -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA) $(Desktop_in_files) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA) diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index e59566594..cd954709d 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -32,5 +32,5 @@ Desktop_in_files = gnome-settings-mouse.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA) $(cursorfont_DATA) diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am index ea35602fe..fe966faf6 100644 --- a/capplets/network/Makefile.am +++ b/capplets/network/Makefile.am @@ -14,5 +14,5 @@ desktop_in_files = gnome-network-preferences.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(glade_DATA) $(desktop_in_files) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(desktop_in_files) $(desktop_DATA) +EXTRA_DIST = $(glade_DATA) diff --git a/capplets/sound/Makefile.am b/capplets/sound/Makefile.am index 70378a18c..457c5f00b 100644 --- a/capplets/sound/Makefile.am +++ b/capplets/sound/Makefile.am @@ -19,5 +19,5 @@ Desktop_in_files = gnome-settings-sound.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(SOUND_CAPPLET_CFLAGS) -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(Glade_DATA) $(desktop_icons_DATA) $(Desktop_in_files) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +EXTRA_DIST = $(Glade_DATA) $(desktop_icons_DATA) diff --git a/capplets/theme-switcher/Makefile.am b/capplets/theme-switcher/Makefile.am index b0174fd4d..1e0692e3e 100644 --- a/capplets/theme-switcher/Makefile.am +++ b/capplets/theme-switcher/Makefile.am @@ -38,5 +38,5 @@ INCLUDES = \ $(GNOMECC_CAPPLETS_CFLAGS) \ -DGLADEDIR=\""$(gladedir)"\" -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(Desktop_in_files) $(glade_DATA) gnome-theme-save-data.c $(pixmap_DATA) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +EXTRA_DIST = $(glade_DATA) gnome-theme-save-data.c $(pixmap_DATA) diff --git a/capplets/ui-properties/Makefile.am b/capplets/ui-properties/Makefile.am index 890f7fe54..306ba9bae 100644 --- a/capplets/ui-properties/Makefile.am +++ b/capplets/ui-properties/Makefile.am @@ -14,5 +14,5 @@ Gladedir = $(GNOMECC_GLADE_DIR) Glade_DATA = gnome-ui-properties.glade INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +EXTRA_DIST = $(Glade_DATA) diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am index 72c5fd916..1f9fa9271 100644 --- a/capplets/windows/Makefile.am +++ b/capplets/windows/Makefile.am @@ -21,6 +21,6 @@ INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \ -DGLADEDIR=\""$(gladedir)"\" \ -DPIXMAPDIR=\""$(pixmapdir)"\" -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(glade_DATA) $(Desktop_in_files) +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +EXTRA_DIST = $(glade_DATA) diff --git a/configure.in b/configure.in index ebb4f45d6..d0d5e2755 100644 --- a/configure.in +++ b/configure.in @@ -1,10 +1,14 @@ -AC_INIT(control-center) +AC_INIT([control-center], [2.9.0], + [http://bugzilla.gnome.org/enter_bug.cgi?product=control-center]) -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(control-center, 2.9.0) +AC_CONFIG_SRCDIR([control-center]) +AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE +AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"]) + AC_PROG_INTLTOOL GNOME_COMPILE_WARNINGS @@ -13,14 +17,12 @@ AC_PROG_CC AC_STDC_HEADERS AM_PROG_LIBTOOL - -m4_define(fontilus_version, 0.4) m4_define(gnomevfs_minver, 2.0.0) m4_define(fontconfig_minver, 1.0.0) m4_define(xft_minver, 2.0.0) m4_define(gtk_minver, 2.0.0) m4_define(libbonobo_minver, 2.0.0) -m4_define(libgnomeui_minver, 2.1.90) +m4_define(libgnomeui_minver, 2.2.0) m4_define(nautilus_minver, 2.6.0) changequote(,)dnl @@ -41,6 +43,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) AM_GLIB_GNU_GETTEXT +GLIB_DEFINE_LOCALEDIR(GNOMELOCALEDIR) + AC_CHECK_FUNCS(usleep) AC_CHECK_FUNCS(putenv) AC_CHECK_FUNCS(setenv) @@ -89,10 +93,17 @@ dnl ============================================== dnl Check that we meet the dependencies dnl ============================================== -COMMON_MODULES="gtk+-2.0 >= 2.3.0 gconf-2.0 libgnomeui-2.0 >= 2.2.0 libglade-2.0 >= 1.99.12 libbonobo-2.0 libbonoboui-2.0 libglade-2.0 gconf-2.0 gnome-desktop-2.0 >= 2.2.0" +COMMON_MODULES="gtk+-2.0 >= 2.3.0 dnl + gconf-2.0 dnl + libgnomeui-2.0 >= 2.2.0 dnl + libglade-2.0 >= 2.0.0 dnl + libbonobo-2.0 dnl + libbonoboui-2.0 dnl + gnome-desktop-2.0 >= 2.2.0" PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES) PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.9.1) -PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, gtk+-2.0 gconf-2.0 libgnomeui-2.0 esound gnome-desktop-2.0 libglade-2.0) +PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, + [gtk+-2.0 gconf-2.0 libgnomeui-2.0 esound gnome-desktop-2.0 libglade-2.0]) PKG_CHECK_MODULES(OLD_CAPPLET, libgnomeui-2.0 libglade-2.0) PKG_CHECK_MODULES(GNOME, libgnomeui-2.0) PKG_CHECK_MODULES(GTK, gtk+-2.0) @@ -183,7 +194,10 @@ dnl ============================================== dnl themus and fontilust dependencies dnl ============================================== -AC_ARG_ENABLE(vfs-methods, [ --disable-vfs-methods Do not build the fonts:/// and themes:/// uri schemes],, enable_vfs_methods=yes) +AC_ARG_ENABLE(vfs-methods, + AC_HELP_STRING([--disable-vfs-methods], + [Do not build the fonts:/// and themes:/// uri schemes]),, + enable_vfs_methods=yes) if test x$enable_vfs_methods = xyes; then @@ -230,26 +244,7 @@ if test x$enable_vfs_methods = xyes; then THEMUS=themus FONTILUS=fontilus - - AC_SUBST(THEME_METHOD_CFLAGS) - AC_SUBST(THEME_METHOD_LIBS) - AC_SUBST(THEMUS_THUMBNAILER_CFLAGS) - AC_SUBST(THEMUS_THUMBNAILER_LIBS) - AC_SUBST(THEMUS_COMPONENT_CFLAGS) - AC_SUBST(THEMUS_COMPONENT_LIBS) - AC_SUBST(THEMUS_APPLIER_CFLAGS) - AC_SUBST(THEMUS_APPLIER_LIBS) AC_SUBST(THEMUS) - AC_SUBST(FONT_THUMBNAILER_CFLAGS) - AC_SUBST(FONT_THUMBNAILER_LIBS) - AC_SUBST(FONT_VIEW_CFLAGS) - AC_SUBST(FONT_VIEW_LIBS) - AC_SUBST(FONT_METHOD_CFLAGS) - AC_SUBST(FONT_METHOD_LIBS) - AC_SUBST(FONT_METHOD_CFLAGS) - AC_SUBST(FONT_METHOD_LIBS) - AC_SUBST(FONT_CONTEXT_MENU_CFLAGS) - AC_SUBST(FONT_CONTEXT_MENU_LIBS) AC_SUBST(FONTILUS) # update LIBS for $export_dynamic @@ -262,7 +257,6 @@ if test x$enable_vfs_methods = xyes; then FONT_THUMBNAILER_LIBS=`echo $FONT_THUMBNAILER_LIBS | sed -e "s/$export_dynamic//"` FONT_METHOD_LIBS=`echo $FONT_METHOD_LIBS | sed -e "s/$export_dynamic//"` fi - GLIB_DEFINE_LOCALEDIR(FONTILUS_LOCALEDIR) fi dnl ============================================== @@ -351,7 +345,8 @@ dnl ALSA section dnl ============================================== have_alsa=no AC_ARG_ENABLE(alsa, - AC_HELP_STRING([--disable-alsa],[Turn off support for ALSA version 0.9 or higher]), + AC_HELP_STRING([--disable-alsa], + [Turn off support for ALSA version 0.9 or higher]), [case "${enableval}" in yes) WANT_ALSA=yes ;; no) WANT_ALSA=no ;; @@ -418,7 +413,7 @@ dnl ============================================== COMMON_CFLAGS="-I\$(top_srcdir)/capplets/common" COMMON_LIBS="\$(top_builddir)/capplets/common/libcommon.la" -EXTRA_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-properties\\\"\" -DGNOMELOCALEDIR=\"\\\"${prefix}/${DATADIRNAME}/locale\\\"\"" +EXTRA_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-properties\\\"\"" GNOMECC_CAPPLETS_CFLAGS="${COMMON_CFLAGS} ${CAPPLET_CFLAGS} ${EXTRA_CFLAGS}" GNOMECC_CAPPLETS_LIBS="${COMMON_LIBS} ${CAPPLET_LIBS}" @@ -431,48 +426,15 @@ AC_SUBST(GNOMECC_CAPPLETS_CLEANFILES) AC_SUBST(GNOMECC_CAPPLETS_CFLAGS) AC_SUBST(GNOMECC_CAPPLETS_LIBS) -AC_SUBST(GTK_CFLAGS) -AC_SUBST(GTK_LIBS) - -AC_SUBST(GNOME_CFLAGS) -AC_SUBST(GNOME_LIBS) - -AC_SUBST(GNOME_SETTINGS_DAEMON_CFLAGS) -AC_SUBST(GNOME_SETTINGS_DAEMON_LIBS) - -AC_SUBST(VFS_CAPPLET_CFLAGS) -AC_SUBST(VFS_CAPPLET_LIBS) - -AC_SUBST(SOUND_CAPPLET_CFLAGS) -AC_SUBST(SOUND_CAPPLET_LIBS) - -AC_SUBST(FONT_CAPPLET_CFLAGS) -AC_SUBST(FONT_CAPPLET_LIBS) - -AC_SUBST(AT_CAPPLET_CFLAGS) -AC_SUBST(AT_CAPPLET_LIBS) - -AC_SUBST(DISPLAY_CAPPLET_CFLAGS) -AC_SUBST(DISPLAY_CAPPLET_LIBS) - -AC_SUBST(GNOMECC_CFLAGS) -AC_SUBST(GNOMECC_LIBS) - -AC_SUBST(GNOME_DESKTOP_CFLAGS) -AC_SUBST(GNOME_DESKTOP_LIBS) - -AC_SUBST(METACITY_CFLAGS) -AC_SUBST(METACITY_LIBS) - -AC_SUBST(LIBXKLAVIER_CFLAGS) -AC_SUBST(LIBXKLAVIER_LIBS) - dnl ============================================== dnl End: Define the main variables dnl ============================================== GCONF_CONFIG_SOURCE= -AC_ARG_ENABLE(gconf-source, [ --enable-gconf-source=sourceaddress Where to install schema files.],GCONF_CONFIG_SOURCE=$enable_gconf_source,) +AC_ARG_ENABLE(gconf-source, + AC_HELP_STRING([--enable-gconf-source=sourceaddress], + [Where to install schema files.]), + GCONF_CONFIG_SOURCE=$enable_gconf_source,) if test "x$GCONF_CONFIG_SOURCE" = "x"; then GCONF_CONFIG_SOURCE="xml::\${DESTDIR}\${sysconfdir}/gconf/gconf.xml.defaults" @@ -526,7 +488,7 @@ dnl ======================================= dnl End: Variables for config_archiverConf.sh.in dnl ======================================= -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile po/Makefile.in idl/Makefile @@ -575,14 +537,18 @@ capplets/default-applications/default-applications.desktop.in capplets/accessibility/at-properties/at-properties.desktop.in capplets/accessibility/keyboard/accessibility-keyboard.desktop.in capplets/background/background.desktop.in -capplets/url-properties/url-properties.desktop.in capplets/ui-properties/gnome-ui-properties.desktop.in capplets/network/gnome-network-preferences.desktop.in -capplets/file-types/file-types-capplet.desktop.in -capplets/file-types/file-types.desktop.in capplets/windows/window-properties.desktop.in -capplets/localization/localization.desktop.in capplets/keyboard/keyboard.desktop.in control-center/gnomecc.desktop.in ]) + +dnl *** the following desktop files don't seem to be included in "make dist" +dnl capplets/url-properties/url-properties.desktop.in +dnl capplets/file-types/file-types-capplet.desktop.in +dnl capplets/file-types/file-types.desktop.in +dnl capplets/localization/localization.desktop.in + dnl due to a bug in intltool we need to expand something from the root last control-center.spec +AC_OUTPUT diff --git a/control-center/Makefile.am b/control-center/Makefile.am index 59a1fdfc3..7a0ab66e1 100644 --- a/control-center/Makefile.am +++ b/control-center/Makefile.am @@ -28,13 +28,12 @@ IMAGES = text-selection-frame.png VARIABLES = \ gnomecc_rounded_rect_frame $(srcdir)/text-selection-frame.png -pixbuf_file = $(top_builddir)/control-center/gnomecc-rounded-rect-pixbuf.h pixbuf_file = gnomecc-rounded-rect-pixbuf.h $(pixbuf_file) : $(IMAGES) $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) > $@ -EXTRA_DIST = gnomecc.desktop.in $(IMAGES) +EXTRA_DIST = gnomecc.desktop.in $(IMAGES) $(icon_DATA) BUILT_SOURCES = $(pixbuf_file) DISTCLEANFILES = gnomecc.desktop $(pixbuf_file) diff --git a/gnome-settings-daemon/actions/Makefile.am b/gnome-settings-daemon/actions/Makefile.am index 6939798af..51892f52f 100644 --- a/gnome-settings-daemon/actions/Makefile.am +++ b/gnome-settings-daemon/actions/Makefile.am @@ -1,36 +1,36 @@ +INCLUDES = $(GNOME_CFLAGS) -I$(top_srcdir) $(GST_CFLAGS) + noinst_LTLIBRARIES = libacme.la +libacme_la_SOURCES = \ + acme-volume.c acme-volume.h \ + acme-volume-dummy.c acme-volume-dummy.h + +libacme_la_LIBADD = \ + $(GST_LIBS) $(ALSA_LIBS) + + if HAVE_ALSA -ALSA_CFLAGS = -DHAVE_ALSA -ALSA_files = acme-volume-alsa.c acme-volume-alsa.h +INCLUDES += -DHAVE_ALSA +libacme_la_SOURCES += acme-volume-alsa.c acme-volume-alsa.h endif if HAVE_OSS -OSS_CFLAGS = -DHAVE_OSS -OSS_files = acme-volume-oss.c acme-volume-oss.h +INCLUDES += -DHAVE_OSS +libacme_la_SOURCES += acme-volume-oss.c acme-volume-oss.h endif if HAVE_FB -FB_CFLAGS = -DHAVE_FB -FB_files = acme-fb-level.c acme-fb-level.h +INCLUDES += -DHAVE_FB +libacme_la_SOURCES += acme-fb-level.c acme-fb-level.h endif if HAVE_GSTREAMER -HAVE_GST_CFLAGS = -DHAVE_GSTREAMER -GST_files = acme-volume-gstreamer.c acme-volume-gstreamer.h +INCLUDES += -DHAVE_GSTREAMER +libacme_la_SOURCES += acme-volume-gstreamer.c acme-volume-gstreamer.h endif -INCLUDES = $(GNOME_CFLAGS) -I$(top_srcdir) $(ALSA_CFLAGS) $(OSS_CFLAGS) $(FB_CFLAGS) $(HAVE_GST_CFLAGS) $(GST_CFLAGS) - -libacme_la_SOURCES = \ - $(FB_files) $(OSS_files) $(ALSA_files) \ - $(GST_files) \ - acme-volume.c acme-volume.h \ - acme-volume-dummy.c acme-volume-dummy.h - -libacme_la_LIBADD = \ - $(GST_LIBS) $(ALSA_LIBS) Datadir = $(datadir)/control-center-2.0/interfaces/ Data_DATA = acme.glade diff --git a/schemas/Makefile.am b/schemas/Makefile.am index e56d37d17..ccb60284a 100644 --- a/schemas/Makefile.am +++ b/schemas/Makefile.am @@ -15,11 +15,13 @@ if GCONF_SCHEMAS_INSTALL install-data-local: if test -z "$(DESTDIR)" ; then \ for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ done \ fi else install-data-local: endif -EXTRA_DIST=$(schema_in_files) $(schema_DATA) +EXTRA_DIST=$(schema_in_files) + +CLEANFILES = $(schema_DATA) diff --git a/vfs-methods/fontilus/Makefile.am b/vfs-methods/fontilus/Makefile.am index f5a9f4445..4e3db47ba 100644 --- a/vfs-methods/fontilus/Makefile.am +++ b/vfs-methods/fontilus/Makefile.am @@ -41,7 +41,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) if GCONF_SCHEMAS_INSTALL install-data-local: if test -z "$(DESTDIR)"; then \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/fontilus.schemas; \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule fontilus.schemas; \ fi else install-data-local: @@ -51,12 +51,11 @@ endif @INTLTOOL_DIRECTORY_RULE@ @INTLTOOL_SCHEMAS_RULE@ +CLEANFILES = $(desktop_in_files) $(desktop_DATA) \ + $(schemas_DATA) $(vfsdirectory_DATA) + EXTRA_DIST = \ font-method.conf \ font-method.directory.in \ - fontilus.keys \ - fontilus.mime \ - fontilus.applications \ - fontilus.schemas \ fontilus.schemas.in \ - gnome-font-viewer.desktop.in + gnome-font-viewer.desktop.in.in diff --git a/vfs-methods/fontilus/font-view.c b/vfs-methods/fontilus/font-view.c index 7a6d90e42..49ce0ff49 100644 --- a/vfs-methods/fontilus/font-view.c +++ b/vfs-methods/fontilus/font-view.c @@ -384,7 +384,7 @@ main(int argc, char **argv) GdkPixmap *pixmap; GdkColor white = { 0, 0xffff, 0xffff, 0xffff }; - bindtextdomain(GETTEXT_PACKAGE, FONTILUS_LOCALEDIR); + bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); textdomain(GETTEXT_PACKAGE); diff --git a/vfs-methods/fontilus/fontilus-context-menu.c b/vfs-methods/fontilus/fontilus-context-menu.c index fa7a84160..039ba0dcf 100644 --- a/vfs-methods/fontilus/fontilus-context-menu.c +++ b/vfs-methods/fontilus/fontilus-context-menu.c @@ -206,7 +206,7 @@ nautilus_module_initialize (GTypeModule *module) default_client = gconf_client_get_default(); /* set up translation catalog */ - bindtextdomain (GETTEXT_PACKAGE, FONTILUS_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); } diff --git a/vfs-methods/themus/Makefile.am b/vfs-methods/themus/Makefile.am index fba8b2ba4..3078d185c 100644 --- a/vfs-methods/themus/Makefile.am +++ b/vfs-methods/themus/Makefile.am @@ -64,7 +64,7 @@ CLEANFILES = themus-theme-applier.desktop themus-theme-applier.desktop.in if GCONF_SCHEMAS_INSTALL install-data-local: if test -z "$(DESTDIR)"; then \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/themus.schemas; \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule themus.schemas; \ fi else install-data-local: @@ -73,15 +73,13 @@ endif @INTLTOOL_DESKTOP_RULE@ @INTLTOOL_SCHEMAS_RULE@ +CLEANFILES = $(desktop_in_files) $(desktop_DATA) \ + $(schemas_DATA) $(vfsdirectory_DATA) + EXTRA_DIST = \ $(Glade_DATA) \ apply-font.glade \ theme-method.directory.in \ theme-method.conf \ - $(schemas_DATA) \ $(schemas_in_files) \ themus-theme-applier.desktop.in.in - -DISTCLEANFILES = \ - theme-method.directory \ - themus.schemas diff --git a/vfs-methods/themus/themus-properties-main.c b/vfs-methods/themus/themus-properties-main.c index c0a746943..3db413507 100644 --- a/vfs-methods/themus/themus-properties-main.c +++ b/vfs-methods/themus/themus-properties-main.c @@ -109,7 +109,7 @@ nautilus_module_initialize (GTypeModule *module) themus_properties_view_register_type (module); /* set up translation catalog */ - bindtextdomain (GETTEXT_PACKAGE, FONTILUS_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); } |