diff options
| -rw-r--r-- | ChangeLog | 34 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | accessx-status/Makefile.am | 7 | ||||
| -rw-r--r-- | battstat/Makefile.am | 16 | ||||
| -rw-r--r-- | battstat/apmlib/Makefile.am | 11 | ||||
| -rw-r--r-- | cdplayer/Makefile.am | 10 | ||||
| -rw-r--r-- | charpick/Makefile.am | 9 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | drivemount/Makefile.am | 8 | ||||
| -rw-r--r-- | geyes/Makefile.am | 5 | ||||
| -rw-r--r-- | gswitchit/Makefile.am | 17 | ||||
| -rw-r--r-- | gtik/Makefile.am | 11 | ||||
| -rw-r--r-- | gtik/access/Makefile.am | 12 | ||||
| -rw-r--r-- | gweather/Makefile.am | 9 | ||||
| -rw-r--r-- | mini-commander/src/Makefile.am | 15 | ||||
| -rw-r--r-- | mixer/Makefile.am | 12 | ||||
| -rw-r--r-- | modemlights/Makefile.am | 7 | ||||
| -rw-r--r-- | multiload/Makefile.am | 9 | ||||
| -rw-r--r-- | null_applet/Makefile.am | 7 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | stickynotes/Makefile.am | 13 | ||||
| -rw-r--r-- | trashapplet/src/Makefile.am | 7 | ||||
| -rw-r--r-- | wireless/Makefile.am | 16 |
23 files changed, 141 insertions, 104 deletions
@@ -1,3 +1,37 @@ +2004-12-28 Davyd Madeley <davyd@madeley.id.au> + + * Makefile.am: Scrollkeeper fix for distcheck (patch from Mariano + Suárez-Alvarez <mariano@gnome.org> + * configure.in: Bump post release version to 2.9.3.2 + +2004-12-27 Tomasz Kłoczko <kloczek@pld.org.pl> + + * configure.in: add AC_DEFINE_UNQUOTED(GNOMELOCALEDIR, + "${datadir}/locale", [locale directory]) + * accessx-status/Makefile.am: + * battstat/Makefile.am: + * battstat/apmlib/Makefile.am: + * cdplayer/Makefile.am: + * charpick/Makefile.am: + * cpufreq/src/Makefile.am: + * drivemount/Makefile.am: + * geyes/Makefile.am: + * gswitchit/Makefile.am: + * gtik/Makefile.am: + * gtik/access/Makefile.am: + * gweather/Makefile.am: + * libgswitchit/Makefile.am: + * mini-commander/src/Makefile.am: + * mixer/Makefile.am: + * modemlights/Makefile.am: + * modemlights/Makefile.am: + * multiload/Makefile.am: + * null_applet/Makefile.am: + * stickynotes/Makefile.am: + * wireless/Makefile.am: remove all all -DGNOMELOCALEDIR. + Now GNOMELOCALEDIR is declared in single point. Adjustments in + INCLUDES. + 2004-12-27 Davyd Madeley <davyd@madeley.id.au> * NEWS: diff --git a/Makefile.am b/Makefile.am index 7a58f3b03..31f17370b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -84,7 +84,6 @@ DIST_SUBDIRS = \ multiload \ gtik \ gweather \ - mini-commander \ man \ wireless \ accessx-status \ @@ -105,3 +104,7 @@ EXTRA_DIST = \ xmldocs.make \ omf.make +# hack from sound-juicer to get around scrollkeeper's leaving a big +# mess behind. +distuninstallcheck_listfiles = \ + find -regex '.*/var/scrollkeeper/.*' -prune -or -type f -print diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am index c4e8f84ff..ef0824303 100644 --- a/accessx-status/Makefile.am +++ b/accessx-status/Makefile.am @@ -22,10 +22,9 @@ $(server_in_files): $(server_in_files:.server.in=.server.in.in) uidir = $(datadir)/gnome-2.0/ui ui_DATA = GNOME_AccessxApplet.xml -INCLUDES = $(GNOME_APPLETS_CFLAGS) \ - -DGLADEDIR=\""$(gladedir)"\" \ - -DPIXMAPDIR=\""$(datadir)/pixmaps/"\"\ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" +INCLUDES = $(GNOME_APPLETS_CFLAGS) \ + -DGLADEDIR=\""$(gladedir)"\" \ + -DPIXMAPDIR=\""$(datadir)/pixmaps/"\" CLEANFILES = $(server_in_files) $(server_DATA) $(ACCESSX_STATUS_APPLET_CLEANFILES) diff --git a/battstat/Makefile.am b/battstat/Makefile.am index a55f28a7f..171f28c6b 100644 --- a/battstat/Makefile.am +++ b/battstat/Makefile.am @@ -25,15 +25,13 @@ SUBDIRS = docs sounds $(APMDIR) DIST_SUBDIRS = docs sounds apmlib -INCLUDES = \ - $(GNOME_APPLETS_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - $(APMINC) \ - -DDATA_DIR=\"$(datadir)\" \ - -DGLADE_DIR=\"$(gladedir)\" \ - -DG_LOG_DOMAIN=\"battstat_applet\" \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" - +INCLUDES = \ + $(GNOME_APPLETS_CFLAGS) \ + $(LIBGLADE_CFLAGS) \ + $(APMINC) \ + -DDATA_DIR=\"$(datadir)\" \ + -DGLADE_DIR=\"$(gladedir)\" \ + -DG_LOG_DOMAIN=\"battstat_applet\" libexec_PROGRAMS = battstat-applet-2 diff --git a/battstat/apmlib/Makefile.am b/battstat/apmlib/Makefile.am index b09a8e8ce..645adc184 100644 --- a/battstat/apmlib/Makefile.am +++ b/battstat/apmlib/Makefile.am @@ -4,12 +4,11 @@ # Created: Thu Jun 15 23:08:41 CEST 2000 # -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/apmlib \ - $(GNOME_APPLETS_CFLAGS) \ - -DG_LOG_DOMAIN=\"battstat_applet\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/apmlib \ + $(GNOME_APPLETS_CFLAGS) \ + -DG_LOG_DOMAIN=\"battstat_applet\" noinst_LIBRARIES = libapm.a diff --git a/cdplayer/Makefile.am b/cdplayer/Makefile.am index 44d49d4e6..02d4bd751 100644 --- a/cdplayer/Makefile.am +++ b/cdplayer/Makefile.am @@ -1,9 +1,9 @@ SUBDIRS = docs -INCLUDES = -I. \ -$(GNOME_APPLETS_CFLAGS) \ --I$(srcdir) \ --DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -$(CDROM_CFLAGS) +INCLUDES = \ + -I$(srcdir) \ + -I. \ + $(GNOME_APPLETS_CFLAGS) \ + $(CDROM_CFLAGS) if CDDA_SOLARIS CDROM_CDDA_SRCS = \ diff --git a/charpick/Makefile.am b/charpick/Makefile.am index bcdbeea59..093fb7f1c 100644 --- a/charpick/Makefile.am +++ b/charpick/Makefile.am @@ -1,9 +1,10 @@ SUBDIRS = help -INCLUDES = -I. -I$(srcdir) \ - $(GNOME_APPLETS_CFLAGS) $(GUCHARMAP_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" - +INCLUDES = \ + -I. \ + -I$(srcdir) \ + $(GNOME_APPLETS_CFLAGS) \ + $(GUCHARMAP_CFLAGS) libexec_PROGRAMS = charpick_applet2 diff --git a/configure.in b/configure.in index 59e41fc13..fe755d2fd 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_INIT(drivemount/drivemount.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gnome-applets, 2.9.3.1) +AM_INIT_AUTOMAKE(gnome-applets, 2.9.3.2) AM_MAINTAINER_MODE @@ -132,7 +132,7 @@ ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi f GETTEXT_PACKAGE=gnome-applets-2.0 AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package]) - +AC_DEFINE_UNQUOTED(GNOMELOCALEDIR, "${datadir}/locale", [locale directory]) AM_GLIB_GNU_GETTEXT # this is the directory where the *.{mo,gmo} files are installed diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am index ab4f4e766..e6a50da15 100644 --- a/drivemount/Makefile.am +++ b/drivemount/Makefile.am @@ -1,9 +1,9 @@ SUBDIRS = help -INCLUDES = \ --I. -I$(srcdir) \ --DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -$(GNOME_APPLETS_CFLAGS) +INCLUDES = \ + -I. \ + -I$(srcdir) \ + $(GNOME_APPLETS_CFLAGS) libexec_PROGRAMS = drivemount_applet2 diff --git a/geyes/Makefile.am b/geyes/Makefile.am index 2dc2c0291..73fc20a5a 100644 --- a/geyes/Makefile.am +++ b/geyes/Makefile.am @@ -1,8 +1,9 @@ SUBDIRS = themes docs -INCLUDES = -I. -I$(srcdir) \ +INCLUDES = \ + -I. \ + -I$(srcdir) \ $(GNOME_APPLETS_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -I$(includedir) \ -DGEYES_THEMES_DIR=\""$(datadir)/geyes/"\" diff --git a/gswitchit/Makefile.am b/gswitchit/Makefile.am index b3fe549bc..6800c149e 100644 --- a/gswitchit/Makefile.am +++ b/gswitchit/Makefile.am @@ -20,13 +20,16 @@ if ENABLE_FLAGS flags_CFLAGS = -DENABLE_FLAGS=1 endif -COMMON_CFLAGS = -Wall -Werror -I$(top_srcdir) -I. -I$(top_srcdir)/intl \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DG_LOG_DOMAIN=\"GSwitchIt\" \ - -DGLADE_DIR=\""$(gladedir)"\" \ - $(LIBXKLAVIER_CFLAGS) \ - $(flags_CFLAGS) \ - $(LIBGLADE_CFLAGS) +COMMON_CFLAGS = \ + -Wall -Werror \ + -I$(top_srcdir) \ + -I. \ + -I$(top_srcdir)/intl \ + -DG_LOG_DOMAIN=\"GSwitchIt\" \ + -DGLADE_DIR=\""$(gladedir)"\" \ + $(LIBXKLAVIER_CFLAGS) \ + $(flags_CFLAGS) \ + $(LIBGLADE_CFLAGS) COMMON_LIBS = $(LIBXKLAVIER_LIBS) \ $(LIBGLADE_LIBS) \ diff --git a/gtik/Makefile.am b/gtik/Makefile.am index e053ab7a0..cda57ec50 100644 --- a/gtik/Makefile.am +++ b/gtik/Makefile.am @@ -1,11 +1,10 @@ SUBDIRS = access help -INCLUDES = \ - -I$(srcdir) \ - -I$(top_srcdir)/gtik/access \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - $(GNOME_APPLETS_CFLAGS) - $(GNOME_VFS_APPLETS_CFLAGS) \ +INCLUDES = \ + -I$(srcdir) \ + -I$(top_srcdir)/gtik/access \ + $(GNOME_APPLETS_CFLAGS) \ + $(GNOME_VFS_APPLETS_CFLAGS) \ -DGTIK_APPLET_NAME=\"gtik2_applet\" libexec_PROGRAMS = gtik2_applet2 diff --git a/gtik/access/Makefile.am b/gtik/access/Makefile.am index 92287c364..2673c83c6 100644 --- a/gtik/access/Makefile.am +++ b/gtik/access/Makefile.am @@ -1,8 +1,10 @@ -INCLUDES = -I$(srcdir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(GNOME_APPLETS_CFLAGS) $(GNOME_VFS_APPLETS_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) \ - $(GAILUTIL_CFLAGS) +INCLUDES = \ + -I$(srcdir) \ + -I$(top_srcdir) \ + -I$(includedir) \ + $(GNOME_APPLETS_CFLAGS) \ + $(GNOME_VFS_APPLETS_CFLAGS) \ + $(GAILUTIL_CFLAGS) noinst_LTLIBRARIES = libgnomedrawareaaccess.la diff --git a/gweather/Makefile.am b/gweather/Makefile.am index c49a54fe3..a76b3d1d5 100644 --- a/gweather/Makefile.am +++ b/gweather/Makefile.am @@ -2,11 +2,10 @@ SUBDIRS = docs -INCLUDES = \ - -I$(srcdir) \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DGTK_ENABLE_BROKEN \ - $(GNOME_APPLETS_CFLAGS) \ +INCLUDES = \ + -I$(srcdir) \ + -DGTK_ENABLE_BROKEN \ + $(GNOME_APPLETS_CFLAGS) \ $(GNOME_VFS_APPLETS_CFLAGS) libexec_PROGRAMS = gweather-applet-2 diff --git a/mini-commander/src/Makefile.am b/mini-commander/src/Makefile.am index e9092088e..288cf4c1e 100644 --- a/mini-commander/src/Makefile.am +++ b/mini-commander/src/Makefile.am @@ -1,13 +1,12 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = \ - $(GNOME_APPLETS_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - $(WARN_CFLAGS) \ - -I. \ - -I$(srcdir) \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DMC_GLADEDIR=\""$(gladedir)"\" \ +INCLUDES = \ + -I. \ + -I$(srcdir) \ + $(GNOME_APPLETS_CFLAGS) \ + $(LIBGLADE_CFLAGS) \ + $(WARN_CFLAGS) \ + -DMC_GLADEDIR=\""$(gladedir)"\" \ $(GNOME_INCLUDEDIR) libexec_PROGRAMS = mini_commander_applet diff --git a/mixer/Makefile.am b/mixer/Makefile.am index cd7f32f20..c1a175c46 100644 --- a/mixer/Makefile.am +++ b/mixer/Makefile.am @@ -10,11 +10,13 @@ pixmaps_DATA = volume-max.png \ volume-mute.png \ volume-zero.png -INCLUDES = -I. -I$(srcdir) \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \ - $(MIXER_CFLAGS) $(GNOME_APPLETS_CFLAGS) \ +INCLUDES = -I. -I$(srcdir) \ + -DG_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + -DGNOME_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + $(MIXER_CFLAGS) \ + $(GNOME_APPLETS_CFLAGS) \ -DPIXDIR=\""$(pixmapsdir)"\" libexec_PROGRAMS = mixer_applet2 diff --git a/modemlights/Makefile.am b/modemlights/Makefile.am index b2438c4b0..0bde95520 100644 --- a/modemlights/Makefile.am +++ b/modemlights/Makefile.am @@ -1,8 +1,9 @@ SUBDIRS = docs -INCLUDES = -I. -I$(srcdir) \ - $(GNOME_APPLETS_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ +INCLUDES = \ + -I. \ + -I$(srcdir) \ + $(GNOME_APPLETS_CFLAGS) \ -DVERSION=\""$(VERSION)"\" libexec_PROGRAMS = modemlights_applet2 diff --git a/multiload/Makefile.am b/multiload/Makefile.am index 0889619dd..6f4538105 100644 --- a/multiload/Makefile.am +++ b/multiload/Makefile.am @@ -1,10 +1,9 @@ SUBDIRS = docs -INCLUDES = \ - -I$(srcdir) \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - $(GNOME_APPLETS_CFLAGS) \ - $(GTOP_APPLETS_CFLAGS) \ +INCLUDES = \ + -I$(srcdir) \ + $(GNOME_APPLETS_CFLAGS) \ + $(GTOP_APPLETS_CFLAGS) \ -Wall libexec_PROGRAMS = multiload-applet-2 diff --git a/null_applet/Makefile.am b/null_applet/Makefile.am index 76881660c..0abd52ba0 100644 --- a/null_applet/Makefile.am +++ b/null_applet/Makefile.am @@ -1,6 +1,7 @@ -INCLUDES = -I. -I$(srcdir) \ --DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -$(GNOME_APPLETS_CFLAGS) +INCLUDES = \ + -I. \ + -I$(srcdir) \ + $(GNOME_APPLETS_CFLAGS) libexec_PROGRAMS = null_applet diff --git a/po/POTFILES.in b/po/POTFILES.in index 3e2cafc18..ae8d1f55c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -38,7 +38,6 @@ geyes/GNOME_GeyesApplet.xml geyes/geyes.c geyes/geyes.schemas.in geyes/themes.c -gkb-new/descs/base.xml.in gkb-new/xmodmap/base.xml.in gkb-new/xmodmap.sun/base.xml.in gswitchit/GNOME_GSwitchItApplet.xml diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am index c1673f19e..bbb17d398 100644 --- a/stickynotes/Makefile.am +++ b/stickynotes/Makefile.am @@ -2,13 +2,12 @@ SUBDIRS = pixmaps docs -INCLUDES = \ - -I. \ - -I$(srcdir) \ - $(GNOME_APPLETS_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DSTICKYNOTES_GLADEDIR=\"$(gladedir)\" \ +INCLUDES = \ + -I. \ + -I$(srcdir) \ + $(GNOME_APPLETS_CFLAGS) \ + $(LIBGLADE_CFLAGS) \ + -DSTICKYNOTES_GLADEDIR=\"$(gladedir)\" \ -DSTICKYNOTES_ICONDIR=\"$(icondir)\" libexec_PROGRAMS = stickynotes_applet diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am index 21acd743e..8dbbdd20c 100644 --- a/trashapplet/src/Makefile.am +++ b/trashapplet/src/Makefile.am @@ -1,7 +1,6 @@ -INCLUDES = -I$(top_srcdir) \ - $(GNOME_APPLETS_CFLAGS) \ - $(GNOME_VFS_APPLETS_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" +INCLUDES = -I$(top_srcdir) \ + $(GNOME_APPLETS_CFLAGS) \ + $(GNOME_VFS_APPLETS_CFLAGS) libexec_PROGRAMS = trashapplet diff --git a/wireless/Makefile.am b/wireless/Makefile.am index 86fdbe8bc..79bc930b2 100644 --- a/wireless/Makefile.am +++ b/wireless/Makefile.am @@ -3,14 +3,14 @@ NULL= SUBDIRS = docs -INCLUDES = \ - -I$(top_srcdir)/intl \ - $(GNOME_APPLETS_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - -DICONDIR=\""$(datadir)/pixmaps"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED \ +INCLUDES = \ + -DICONDIR=\""$(datadir)/pixmaps"\" \ + -DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGNOME_DISABLE_DEPRECATED \ + -I$(top_srcdir)/intl \ + $(GNOME_APPLETS_CFLAGS) \ + $(LIBGLADE_CFLAGS) \ $(NULL) libexec_PROGRAMS = wireless-applet |