diff options
38 files changed, 281 insertions, 152 deletions
@@ -1,3 +1,10 @@ +2001-09-19 Glynn Foster <glynn.foster@sun.com> + + * configure.in, applets/Makefile.am + Start making things happen for 2.0. Things won't + compile, build or otherwise. + message-of-doom: Added + 2001-09-10 Maciej Stachowiak <mjs@noisehavoc.org> * Makefile.am: Don't build gtik if gnome-vfs is not found. diff --git a/another_clock/Makefile.am b/another_clock/Makefile.am index 00f8f03f4..2001a71ce 100644 --- a/another_clock/Makefile.am +++ b/another_clock/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) \ + -I$(includedir) \ -DVERSION=\""$(VERSION)"\" bin_PROGRAMS = another_clock_applet @@ -12,7 +12,6 @@ another_clock_applet_SOURCES = another_clock.c another_clock_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) another_clockbitmapsdir = $(datadir)/pixmaps diff --git a/asclock/Makefile.am b/asclock/Makefile.am index 577783df5..e79cc3cc0 100644 --- a/asclock/Makefile.am +++ b/asclock/Makefile.am @@ -24,7 +24,6 @@ asclock_applet_SOURCES = \ asclock_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) sysdir = $(datadir)/applets/Clocks diff --git a/autogen.sh b/autogen.sh index ea10bc3dc..7be9115bb 100755 --- a/autogen.sh +++ b/autogen.sh @@ -8,10 +8,15 @@ PKG_NAME="Gnome Applets" (test -f $srcdir/configure.in \ && test -f $srcdir/HACKING \ - && test -d $srcdir/clockmail) || { + && test -d $srcdir/sound-monitor) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level gnome applets directory" + echo " top-level gnome directory" exit 1 } -. $srcdir/macros/autogen.sh + +which gnome-autogen.sh || { + echo "You need to install gnome-common from the GNOME CVS" + exit 1 +} +USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/battery/Makefile.am b/battery/Makefile.am index 89aa34a9b..1b9679960 100644 --- a/battery/Makefile.am +++ b/battery/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl \ -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = battery_applet @@ -18,7 +18,6 @@ battery_applet_SOURCES = battery.c \ session.h battery_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) sysdir = $(datadir)/applets/Monitors diff --git a/bug-applet/Makefile.am b/bug-applet/Makefile.am index 93d204b2d..f0b18b37f 100644 --- a/bug-applet/Makefile.am +++ b/bug-applet/Makefile.am @@ -2,7 +2,7 @@ XML_CFLAGS = `xml-config --cflags` INCLUDES = -I. -I$(srcdir) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) \ + -I$(includedir) \ $(XML_CFLAGS) bin_PROGRAMS = bug-applet @@ -11,7 +11,6 @@ bug_applet_SOURCES = \ bug-applet.c bug_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) \ $(INTLLIBS) \ $(GHTTP_LIB) $(GNOME_XML_LIB) diff --git a/cdplayer/Makefile.am b/cdplayer/Makefile.am index fc1d25a07..8831f4f8c 100644 --- a/cdplayer/Makefile.am +++ b/cdplayer/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = cdplayer_applet @@ -16,7 +16,6 @@ cdplayer_applet_SOURCES = \ cdrom-$(CDROM_HOST).c cdplayer_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) $(CDROM_LIBS) dist-hook: diff --git a/charpick/Makefile.am b/charpick/Makefile.am index 92f6921c6..b667b6e07 100644 --- a/charpick/Makefile.am +++ b/charpick/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) CFLAGS = -ansi -Werror -Wmissing-prototypes -Wmissing-declarations @@ -14,7 +14,6 @@ charpick_applet_SOURCES = charpick.c \ properties.c charpick_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) charpickbitmapsdir = $(datadir)/pixmaps/ diff --git a/clipboard/Makefile.am b/clipboard/Makefile.am index 63ad03fcd..d1462b902 100644 --- a/clipboard/Makefile.am +++ b/clipboard/Makefile.am @@ -1,14 +1,13 @@ INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = clipboard_applet clipboard_applet_SOURCES = clipboard.c clipboard_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) sysdir = $(datadir)/applets/Utility diff --git a/clockmail/Makefile.am b/clockmail/Makefile.am index 3b7732da4..e822cabc8 100644 --- a/clockmail/Makefile.am +++ b/clockmail/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = docs themes INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) \ + -I$(includedir) \ @PIXBUF_CFLAGS@ bin_PROGRAMS = clockmail_applet @@ -35,7 +35,6 @@ clockmail_applet_SOURCES = \ update.h clockmail_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) \ @PIXBUF_LIBS@ diff --git a/configure.in b/configure.in index 7fc4ba4cd..2cf112124 100644 --- a/configure.in +++ b/configure.in @@ -1,38 +1,105 @@ AC_INIT(sound-monitor/main.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gnome-applets, 1.4.0.4) +AM_INIT_AUTOMAKE(gnome-applets, 2.0) AM_MAINTAINER_MODE + AM_PROG_XML_I18N_TOOLS -AM_ACLOCAL_INCLUDE(macros) +dnl Just going to comment stuff out that I don't think we'll need for now +dnl AM_ACLOCAL_INCLUDE(macros) +dnl GNOME_INIT(applets) +GNOME_COMMON_INIT +GNOME_COMPILE_WARNINGS +GNOME_REQUIRE_PKGCONFIG +GNOME_PLATFORM_GNOME_2(yes, force) +GNOME2_X_CHECKS gnome_cv_use_gnome=yes -GNOME_INIT(applets) - AC_ISC_POSIX AC_PROG_CC AC_STDC_HEADERS -AC_ARG_PROGRAM AM_PROG_LIBTOOL +AC_PATH_PROGS(PATH_TO_XRDB, "xrdb") -GNOME_COMPILE_WARNINGS +SCROLLKEEPER_REQUIRED=0.1.4 +LIBGNOME_REQUIRED=1.96.0 +LIBGNOMEUI_REQUIRED=1.96.0 +XML_REQUIRED=2.2.8 +GNOME_VFS_REQUIRED=1.1 +GTK_REQUIRED=1.3.1 +GDK_PIXBUF_REQUIRED=1.3.1 +LIBGNOMECANVAS_REQUIRED=1.102.0 -GNOME_X_CHECKS +dnl ****************************************** +dnl ** pkg-config dependacy checks ** +dnl ****************************************** -SCROLLKEEPER_REQUIRED=0.1.4 -AC_SUBST(SCROLLKEEPER_REQUIRED) +PKG_CHECK_MODULES(GNOME_APPLETS, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gkt+-2.0 >= $GTK_REQUIRED libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED) +AC_SUBST(GNOME_APPLETS_CFLAGS) +AC_SUBST(GNOME_APPLETS_LIBS) + + +dnl Is this really the best way to do things??? I'm not so sure.. +dnl How can we check if pkg-config passed or not? + +dnl PKG_CHECK_MODULES(GNOME_GTOP_APPLETS, blah blah) +dnl AC_SUBST(GNOME_GTOP_APPLETS_CFLAGS) +dnl AC_SUBST(GNOME_GTOP_APPLETS_LIBS) + +dnl PKG_CHECK_MODULES(GNOME_WORDEXP_APPLETS, blah blah) +dnl AC_SUBST(GNOME_WORDEXP_APPLETS_CFLAGS) +dnl AC_SUBST(GNOME_WORDEXP_APPLETS_LIBS) + +dnl PKG_CHECK_MODULES(GNOME_XML_APPLETS, blah blah) +dnl AC_SUBST(GNOME_XML_APPLETS_CFLAGS) +dnl AC_SUBST(GNOME_XML_APPLETS_LIBS) + +dnl PKG_CHECK_MODULES(GNOME_XML_APPLETS, blah blah) +dnl AC_SUBST(GNOME_XML_APPLETS_CFLAGS) +dnl AC_SUBST(GNOME_XML_APPLETS_LIBS) + +dnl PKG_CHECK_MODULES(GNOME_GHTTP_APPLETS, blah blah) +dnl AC_SUBST(GNOME_GHTTP_APPLETS_CFLAGS) +dnl AC_SUBST(GNOME_GHTTP_APPLETS_LIBS) + +dnl ****************************************** +dnl ****************************************** + +ALL_LINGUAS="az ca cs da de el en_GB es et eu fi fr ga gl hu it ja ko lt nl nn no pl pt pt_BR ro ru sk sl sv tr uk wa zh_CN.GB2312 zh_TW" + +AM_GNOME2_GETTEXT + +# this is the directory where the *.{mo,gmo} files are installed +gnomelocaledir='${prefix}/${DATADIRNAME}/locale' +AC_SUBST(gnomelocaledir) + + +dnl utility conditional +AM_CONDITIONAL(FALSE, test "x" = "y") + + +dnl ****************************************** +dnl ** Check for Scrollkeeper ** +dnl ****************************************** -dnl Check for scrollkeeper -AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) +AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config, no) if test x$SCROLLKEEPER_CONFIG = xno; then - AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package) + AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the Scrollkeeper 0.1.4 package) fi +AC_SUBST(SCROLLKEEPER_REQUIRED) + +dnl ****************************************** +dnl ****************************************** -dnl Test whether jw is installed -AC_PATH_PROG(JW,jw,no) + +dnl ****************************************** +dnl ** Test whether jw is installed ** +dnl ****************************************** + +AC_PATH_PROG(JW, jw, no) if test x$JW = xno; then HAVE_JW="no" else @@ -41,21 +108,20 @@ fi AM_CONDITIONAL(HAVE_JW, test "x$HAVE_JW" = "xyes") AC_SUBST(HAVE_JW) +dnl ****************************************** +dnl ****************************************** -dnl Check for new enough gnome-libs -CFLAGS_save=$CFLAGS -LIBS_save=$LIBS -CFLAGS=`gnome-config --cflags gnomeui` -LIBS=`gnome-config --libs gnomeui` -AC_CHECK_LIB(gnomeui, gnome_window_icon_set_default_from_file, ,[ -AC_MSG_ERROR(gnome-libs 1.0.59 or higher is required.)]) - -CFLAGS=$CFLAGS_save -LIBS=$LIBS_save +dnl Check for new enough gnome-libs +dnl CFLAGS_save=$CFLAGS +dnl LIBS_save=$LIBS +dnl CFLAGS=`gnome-config --cflags gnomeui` +dnl LIBS=`gnome-config --libs gnomeui` +dnl AC_CHECK_LIB(gnomeui, gnome_window_icon_set_default_from_file, ,[ +dnl AC_MSG_ERROR(gnome-libs 1.0.59 or higher is required.)]) +dnl CFLAGS=$CFLAGS_save +dnl LIBS=$LIBS_save -dnl utility conditional -AM_CONDITIONAL(FALSE, test "x" = "y") dnl possibly have something like this dnl AM_ARG_ENABLE(old-applets, @@ -71,12 +137,20 @@ dnl fi dnl fi, dnl enable_old_applets=yes) -dnl esd-manager + +dnl ****************************************** +dnl ** ESound Library ** +dnl ****************************************** + have_libesd=no AM_PATH_ESD(,have_libesd=yes, [AC_MSG_WARN([*** \`sound-monitor' will not be built ***])]) AM_CONDITIONAL(HAVE_LIBESD, test yes = $have_libesd) +dnl ****************************************** +dnl ****************************************** + + dnl gumma dnl have_xmms=false dnl CPPFLAGS_save=$CPPFLAGS @@ -95,7 +169,10 @@ dnl if test x$HAVE_XMMS != x$yes; then dnl AC_MSG_WARN([*** \`xmms' plugin for gumma will not be built ***]) dnl fi -dnl screenshooter +dnl ****************************************** +dnl ** screenshooter applet check ** +dnl ****************************************** + have_wordexp=false AC_CHECK_FUNC(wordexp,have_wordexp=true) AM_CONDITIONAL(HAVE_WORDEXP,$have_wordexp) @@ -103,8 +180,15 @@ if test -z "$have_wordexp"; then AC_MSG_WARN([*** No wordexp (glibc >=2.1) Screen-shooter will not be built ***]) fi -dnl cdplayer -AC_CANONICAL_HOST +dnl ****************************************** +dnl ****************************************** + + +dnl ****************************************** +dnl ** cdplayer applet check ** +dnl ****************************************** + +dnl AC_CANONICAL_HOST case "$host" in *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";; *linux*) CDROM_HOST=linux;; @@ -119,14 +203,28 @@ dnl AC_MSG_WARN([*** \`cd' plugin for gumma will not be built ***]) AC_MSG_WARN([*** \`cdplayer' applet will not be built ***]) fi -dnl battery +dnl ****************************************** +dnl ****************************************** + + +dnl ****************************************** +dnl ** battery applet check ** +dnl ****************************************** + case "$host_os" in netbsd*) AC_CHECK_HEADERS(machine/apmvar.h, AC_DEFINE(NETBSD_APM)) ;; esac -dnl mixer +dnl ****************************************** +dnl ****************************************** + + +dnl ******************************************* +dnl ** mixer applet check ** +dnl ******************************************* + P_MIXER= MIXER_LIBS= AC_CHECK_HEADERS(linux/soundcard.h,[P_MIXER=mixer],[ @@ -144,7 +242,15 @@ if test "$P_MIXER" != "mixer"; then AC_MSG_WARN([*** \`mixer' applet will not be built ***]) fi -dnl modemlights +dnl ****************************************** +dnl ****************************************** + + + +dnl ****************************************** +dnl ** modemlights applet check ** +dnl ****************************************** + P_MODEMLIGHTS= case "$host_os" in linux*|freebsd*|netbsd*|openbsd*) @@ -156,17 +262,24 @@ if test "$P_MODEMLIGHTS" != "modemlights"; then AC_MSG_WARN([*** \`modemlights' applet will not be built ***]) fi +dnl ****************************************** +dnl ****************************************** + +dnl Don't need this since xml is in the packages by default dnl Check for xml -GNOME_XML_HOOK -AM_CONDITIONAL(HAVE_LIBXML, test -n "$GNOME_XML_LIB") -if test -z "$GNOME_XML_LIB"; then - AC_MSG_WARN([*** \`gnotes' applet will not be built ***]) - AC_MSG_WARN([*** \`slashapp' applet will not be build ***]) -fi +dnl GNOME_XML_HOOK +dnl AM_CONDITIONAL(HAVE_LIBXML, test -n "$GNOME_XML_LIB") +dnl if test -z "$GNOME_XML_LIB"; then +dnl AC_MSG_WARN([*** \`gnotes' applet will not be built ***]) +dnl AC_MSG_WARN([*** \`slashapp' applet will not be build ***]) +dnl fi -dnl Check for libgtop -GNOME_LIBGTOP_HOOK(,applets_libgtop=yes) +dnl ****************************************** +dnl ** Check for libgtop ** +dnl ****************************************** +GNOME_LIBGTOP_HOOK(,applets_libgtop=yes) +AM_CONDITIONAL(HAVE_LIBGTOP, test -n "$GTOP_LIB") if test x$applets_libgtop != xyes; then AC_MSG_WARN([*** \`cpuload' applet will not be built ***]) AC_MSG_WARN([*** \`cpumemusage' applet will not be built ***]) @@ -175,7 +288,14 @@ if test x$applets_libgtop != xyes; then AC_MSG_WARN([*** \`netload' applet will not be built ***]) fi -dnl Check for ghttp library +dnl ****************************************** +dnl ****************************************** + + +dnl ****************************************** +dnl ** Check for ghttp ** +dnl ****************************************** + GNOME_GHTTP_CHECK AM_CONDITIONAL(HAVE_LIBGHTTP, test -n "$GHTTP_LIB") AC_SUBST(GHTTP_LIB) @@ -185,62 +305,67 @@ if test -z "$GHTTP_LIB"; then AC_MSG_WARN([*** \`gtik' applet will not be built ***]) fi +dnl ****************************************** +dnl ****************************************** + + dnl Check for gnome-vfs library -AC_MSG_CHECKING(for gnome-vfs) -if gnome-config --libs vfs; then - AC_MSG_RESULT(yes) - VFS_LIBS=`gnome-config --libs vfs` - VFS_CFLAGS=`gnome-config --cflags vfs` - HAVE_GNOME_VFS=true -else - AC_MSG_RESULT(no) - HAVE_GNOME_VFS=false - AC_MSG_WARN([*** \`gtik' applet will not be built ***]) -fi -AC_SUBST(VFS_LIBS) -AC_SUBST(VFS_CFLAGS) -AM_CONDITIONAL(HAVE_GNOME_VFS, $HAVE_GNOME_VFS) +dnl AC_MSG_CHECKING(for gnome-vfs) +dnl if gnome-config --libs vfs; then +dnl AC_MSG_RESULT(yes) +dnl VFS_LIBS=`gnome-config --libs vfs` +dnl VFS_CFLAGS=`gnome-config --cflags vfs` +dnl HAVE_GNOME_VFS=true +dnl else +dnl AC_MSG_RESULT(no) +dnl HAVE_GNOME_VFS=false +dnl AC_MSG_WARN([*** \`gtik' applet will not be built ***]) +dnl fi +dnl AC_SUBST(VFS_LIBS) +dnl AC_SUBST(VFS_CFLAGS) +dnl AM_CONDITIONAL(HAVE_GNOME_VFS, $HAVE_GNOME_VFS) + +dnl ****************************************** +dnl ** Fvwm pager ** +dnl ****************************************** -dnl Fvwm pager AC_CHECK_HEADER(fvwm.h, fvwm=true, fvwm=false) AM_CONDITIONAL(HAVE_FVWM, $fvwm) +dnl ****************************************** +dnl ****************************************** + dnl dnl GdkPixBuf dnl -AC_MSG_CHECKING(for GdkPixbuf library >= 0.7.0) -PIXBUF_CFLAGS=`$GNOME_CONFIG --cflags gdk_pixbuf` -PIXBUF_LIBS=`$GNOME_CONFIG --libs gdk_pixbuf` -if test "x$PIXBUF_CFLAGS" != x ; then - vers=`gdk-pixbuf-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test "$vers" -ge 0007000; then - AC_MSG_RESULT(found) - else - AC_MSG_ERROR(You need at least GdkPixbuf version 0.7.0 for the panel) - fi -else - AC_MSG_ERROR(Did not find GdkPixbuf installed) -fi -AC_SUBST(PIXBUF_CFLAGS) -AC_SUBST(PIXBUF_LIBS) +dnl AC_MSG_CHECKING(for GdkPixbuf library >= 0.7.0) +dnl PIXBUF_CFLAGS=`$GNOME_CONFIG --cflags gdk_pixbuf` +dnl PIXBUF_LIBS=`$GNOME_CONFIG --libs gdk_pixbuf` +dnl if test "x$PIXBUF_CFLAGS" != x ; then +dnl vers=`gdk-pixbuf-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +dnl if test "$vers" -ge 0007000; then +dnl AC_MSG_RESULT(found) +dnl else +dnl AC_MSG_ERROR(You need at least GdkPixbuf version 0.7.0 for the panel) +dnl fi +dnl else +dnl AC_MSG_ERROR(Did not find GdkPixbuf installed) +dnl fi +dnl AC_SUBST(PIXBUF_CFLAGS) +dnl AC_SUBST(PIXBUF_LIBS) dnl dnl GdkPixBuf canvas stuff dnl No need to check, we know we have these dnl -CANVAS_PIXBUF_CFLAGS=`$GNOME_CONFIG --cflags gnomecanvaspixbuf` -CANVAS_PIXBUF_LIBS=`$GNOME_CONFIG --libs gnomecanvaspixbuf` -AC_SUBST(CANVAS_PIXBUF_CFLAGS) -AC_SUBST(CANVAS_PIXBUF_LIBS) +dnl CANVAS_PIXBUF_CFLAGS=`$GNOME_CONFIG --cflags gnomecanvaspixbuf` +dnl CANVAS_PIXBUF_LIBS=`$GNOME_CONFIG --libs gnomecanvaspixbuf` +dnl AC_SUBST(CANVAS_PIXBUF_CFLAGS) +dnl AC_SUBST(CANVAS_PIXBUF_LIBS) -ALL_LINGUAS="az ca cs da de el en_GB es et eu fi fr ga gl hu it ja ko lt nl nn no pl pt pt_BR ro ru sk sl sv tr uk wa zh_CN.GB2312 zh_TW" -AM_GNOME_GETTEXT -# this is the directory where the *.{mo,gmo} files are installed -gnomelocaledir='${prefix}/${DATADIRNAME}/locale' -AC_SUBST(gnomelocaledir) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) @@ -452,3 +577,5 @@ dnl netload/Makefile dnl netwatch/Makefile dnl oldslashapp/Makefile dnl winlist/Makefile + +cat $srcdir/message-of-doom diff --git a/cpumemusage/Makefile.am b/cpumemusage/Makefile.am index 5e55c4dd4..2eff7c69c 100644 --- a/cpumemusage/Makefile.am +++ b/cpumemusage/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) \ + -I$(includedir) \ $(LIBGTOP_INCS) bin_PROGRAMS = cpumemusage_applet @@ -14,7 +14,6 @@ cpumemusage_applet_SOURCES = \ proc.h cpumemusage_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) \ $(LIBGTOP_LIBS) $(LIBGTOP_EXTRA_LIBS) diff --git a/diskusage/Makefile.am b/diskusage/Makefile.am index 2a394f05f..b4b966c4c 100644 --- a/diskusage/Makefile.am +++ b/diskusage/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) + -I$(includedir) $(LIBGTOP_INCS) bin_PROGRAMS = diskusage_applet @@ -14,7 +14,6 @@ diskusage_applet_SOURCES = \ properties.h diskusage_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) \ $(LIBGTOP_LIBS) $(LIBGTOP_EXTRA_LIBS) diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am index 38caab038..d6c4f120f 100644 --- a/drivemount/Makefile.am +++ b/drivemount/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) \ + -I$(includedir) \ -D_POSIX_SOURCE CFLAGS = -ansi -Werror -Wmissing-prototypes -Wmissing-declarations @@ -16,7 +16,6 @@ drivemount_applet_SOURCES = \ properties.c drivemount_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) sysdir = $(datadir)/applets/Utility diff --git a/fifteen/Makefile.am b/fifteen/Makefile.am index 09b2140fc..64befb158 100644 --- a/fifteen/Makefile.am +++ b/fifteen/Makefile.am @@ -3,14 +3,13 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = fifteen_applet fifteen_applet_SOURCES = fifteen.c fifteen_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) sysdir = $(datadir)/applets/Amusements diff --git a/geyes/Makefile.am b/geyes/Makefile.am index 44226d6e7..983c81101 100644 --- a/geyes/Makefile.am +++ b/geyes/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = themes docs INCLUDES = -I. -I$(srcdir) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) \ + -I$(includedir) \ -DGEYES_THEMES_DIR=\""$(datadir)/geyes/"\" bin_PROGRAMS = geyes_applet @@ -13,7 +13,6 @@ geyes_applet_SOURCES = \ geyes.h geyes_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) EXTRA_DIST = geyes_applet.desktop.in \ diff --git a/gkb-new/Makefile.am b/gkb-new/Makefile.am index a00ff4d42..482d1cb6b 100644 --- a/gkb-new/Makefile.am +++ b/gkb-new/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) \ + -I$(includedir) \ @PIXBUF_CFLAGS@ -DGNOMEDATADIR=\""$(datadir)"\" bin_PROGRAMS = gkb_applet @@ -26,7 +26,6 @@ gkb_applet_SOURCES = \ #libgkb_applet_la_SOURCES= gkb.c gkb.h prop.c preset.c gkb_applet_LDADD = $(GNOME_APPLETS_LIBS) \ - $(GNOME_LIBDIR) \ $(GNOMEGNORBA_LIBS) $(INTLLIBS) \ @PIXBUF_LIBS@ diff --git a/gnotes/Makefile.am b/gnotes/Makefile.am index dfbda361f..6c8da8aee 100644 --- a/gnotes/Makefile.am +++ b/gnotes/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = gnotes_applet @@ -18,7 +18,6 @@ gnotes_applet_SOURCES = \ properties.c gnotes_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) \ $(GNOME_XML_LIB) \ $(INTLLIBS) diff --git a/gtik/Makefile.am b/gtik/Makefile.am index 5b6a75fda..40fb6031b 100644 --- a/gtik/Makefile.am +++ b/gtik/Makefile.am @@ -1,14 +1,13 @@ INCLUDES = -I$(srcdir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) $(VFS_CFLAGS) \ + -I$(includedir) $(VFS_CFLAGS) \ -DGTIK_APPLET_NAME=\"gtik2_applet\" bin_PROGRAMS = gtik2_applet gtik2_applet_SOURCES = gtik.c -gtik2_applet_LDADD = $(GNOME_LIBDIR) \ - $(GNOMEUI_LIBS) \ +gtik2_applet_LDADD = $(GNOMEUI_LIBS) \ $(GNOME_APPLETS_LIBS) \ $(VFS_LIBS) diff --git a/gumma/Makefile.am b/gumma/Makefile.am index 5fe338bd9..dd543d5f4 100644 --- a/gumma/Makefile.am +++ b/gumma/Makefile.am @@ -11,12 +11,11 @@ SUBDIRS = gqmpeg $(xmms) $(cd) INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = gumma gumma_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) \ $(INTLLIBS) diff --git a/gweather/Makefile.am b/gweather/Makefile.am index 9df295626..0c354eab2 100644 --- a/gweather/Makefile.am +++ b/gweather/Makefile.am @@ -7,7 +7,6 @@ INCLUDES = \ -I$(top_srcdir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -I$(includedir) \ - $(GNOME_INCLUDEDIR) \ $(PIXBUF_CFLAGS) bin_PROGRAMS = gweather @@ -22,7 +21,6 @@ gweather_SOURCES = \ http.c http.h gweather_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) \ $(INTLLIBS) \ $(PIXBUF_LIBS) \ diff --git a/hal/Makefile.am b/hal/Makefile.am index 66b0a4093..36d3caebd 100644 --- a/hal/Makefile.am +++ b/hal/Makefile.am @@ -1,14 +1,13 @@ INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = hal_applet hal_applet_SOURCES = hal.c hal_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) halbitmapsdir = $(datadir)/pixmaps/hal diff --git a/jbc/Makefile.am b/jbc/Makefile.am index 41f24d0c1..21a0b0cb5 100644 --- a/jbc/Makefile.am +++ b/jbc/Makefile.am @@ -8,8 +8,7 @@ INCLUDES = \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -I$(includedir) \ $(PIXBUF_CFLAGS) \ - $(CANVAS_PIXBUF_CFLAGS) \ - $(GNOME_INCLUDEDIR) + $(CANVAS_PIXBUF_CFLAGS) bin_PROGRAMS = jbc_applet @@ -18,7 +17,6 @@ jbc_applet_SOURCES = \ jbc-applet.h jbc_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) \ $(PIXBUF_LIBS) \ $(CANVAS_PIXBUF_LIBS) \ diff --git a/life/Makefile.am b/life/Makefile.am index da3cc3c88..314e90573 100644 --- a/life/Makefile.am +++ b/life/Makefile.am @@ -3,14 +3,13 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = life_applet life_applet_SOURCES = life.c life_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) sysdir = $(datadir)/applets/Amusements diff --git a/message-of-doom b/message-of-doom new file mode 100644 index 000000000..c47c1a2df --- /dev/null +++ b/message-of-doom @@ -0,0 +1,24 @@ + *** IMPORTANT *** + +This is a development version of gnome-applets. You should be using a stable +version, which is available at ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-applets/ +The version you just configured is meant for developers of gnome-libs only: + + * You should not base ANY software on this version of gnome-applets. + +Distributions should *NOT* ship a development package of this gnome-applets. +Do not ship the headers and do not ship the gnome-config script. These +things will conflict with the stable 1.0 series. Package only enough +to satisfy the requirements of some other package. Package only the +library itself. Doing otherwise will do no favors to the community. + + *** You should be using gnome-applets 1.4 instead. *** + +If you are using this source tree from CVS, please run: + cvs update -r gnome-applets-1-4" +now. + + .... + Do not bother the mailing lists, IRC channels, or other forums if you cannot + figure out how to build gnome-appletss HEAD. It is not in working condition. + .... diff --git a/mini-commander/src/Makefile.am b/mini-commander/src/Makefile.am index 3b5b9a508..bbed6dc56 100644 --- a/mini-commander/src/Makefile.am +++ b/mini-commander/src/Makefile.am @@ -34,7 +34,6 @@ mini_commander_applet_SOURCES = \ terminal.h mini_commander_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) \ $(ZVT_LIBS) \ $(INTLLIBS) diff --git a/mixer/Makefile.am b/mixer/Makefile.am index ebb43c703..f3640fd03 100644 --- a/mixer/Makefile.am +++ b/mixer/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = mixer_applet @@ -18,7 +18,6 @@ mixer_applet_SOURCES = \ mixer_applet_LDADD = \ $(MIXER_LIBS) \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) sysdir = $(datadir)/applets/Multimedia diff --git a/modemlights/Makefile.am b/modemlights/Makefile.am index ed3ba880c..314904461 100644 --- a/modemlights/Makefile.am +++ b/modemlights/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) \ + -I$(includedir) \ -DVERSION=\""$(VERSION)"\" bin_PROGRAMS = modemlights_applet @@ -14,7 +14,6 @@ modemlights_applet_SOURCES = \ properties.c modemlights_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) sysdir = $(datadir)/applets/Network diff --git a/multiload/Makefile.am b/multiload/Makefile.am index fd59e7a6e..24ebb4d3d 100644 --- a/multiload/Makefile.am +++ b/multiload/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) + -I$(includedir) $(LIBGTOP_INCS) bin_PROGRAMS = multiload_applet @@ -25,7 +25,6 @@ multiload_applet_SOURCES = cpuload.c \ load-graph.h multiload_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) \ $(LIBGTOP_LIBS) $(LIBGTOP_EXTRA_LIBS) diff --git a/odometer/Makefile.am b/odometer/Makefile.am index 5ae853aef..52afca573 100644 --- a/odometer/Makefile.am +++ b/odometer/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = themes docs INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) \ + -I$(includedir) \ -DODOMETER_THEMES_DIR=\""$(datadir)/odometer/"\" bin_PROGRAMS = odometer_applet @@ -11,7 +11,6 @@ bin_PROGRAMS = odometer_applet odometer_applet_SOURCES = odo.c odo.h properties.c theme.c odometer_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) sysdir = $(datadir)/applets/Amusements diff --git a/quicklaunch/Makefile.am b/quicklaunch/Makefile.am index 1f8cfc1af..e9bf54b01 100644 --- a/quicklaunch/Makefile.am +++ b/quicklaunch/Makefile.am @@ -3,14 +3,13 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = quicklaunch_applet quicklaunch_applet_SOURCES = quicklaunch.c quicklaunch_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) sysdir = $(datadir)/applets/Utility diff --git a/screenshooter/Makefile.am b/screenshooter/Makefile.am index 1f35bbba8..48dc0916b 100644 --- a/screenshooter/Makefile.am +++ b/screenshooter/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = screenshooter_applet @@ -12,7 +12,6 @@ screenshooter_applet_SOURCES = \ window_icon.xpm screenshooter_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) scrshotdir = $(bindir) diff --git a/slashapp/Makefile.am b/slashapp/Makefile.am index d74e7f97f..5e9b0d681 100644 --- a/slashapp/Makefile.am +++ b/slashapp/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I. -I$(srcdir) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = slash_applet @@ -10,7 +10,7 @@ slash_applet_SOURCES = slashapp.c \ properties.c slash_applet_LDADD = \ - $(GNOME_LIBDIR) -lXt \ + -lXt \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) \ $(GHTTP_LIB) $(GNOME_XML_LIB) diff --git a/sound-monitor/Makefile.am b/sound-monitor/Makefile.am index df905f892..69936f725 100644 --- a/sound-monitor/Makefile.am +++ b/sound-monitor/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(srcdir) -I$(builddir) \ -I$(top_srcdir) -I$(top_builddir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) \ + -I$(includedir) \ @PIXBUF_CFLAGS@ CFLAGS += $(ESD_CFLAGS) @@ -42,7 +42,6 @@ sound_monitor_applet_SOURCES = \ update.h sound_monitor_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) \ @PIXBUF_LIBS@ diff --git a/sound-monitor/pvd/Makefile.am b/sound-monitor/pvd/Makefile.am index c591c72aa..8f7c7c4a7 100644 --- a/sound-monitor/pvd/Makefile.am +++ b/sound-monitor/pvd/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = esdpvd @@ -12,5 +12,4 @@ esdpvd_SOURCES = \ esdpvd.h esdpvd_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_LIBS) $(GNOMEUI_LIBS) $(INTLLIBS) diff --git a/tickastat/Makefile.am b/tickastat/Makefile.am index aa78edb5f..57f92fded 100644 --- a/tickastat/Makefile.am +++ b/tickastat/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = news_scripts docs INCLUDES = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = tickastat_applet @@ -24,7 +24,6 @@ tickastat_applet_SOURCES = \ $(module_sources) tickastat_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) sysdir = $(datadir)/applets/Utility diff --git a/webcontrol/Makefile.am b/webcontrol/Makefile.am index 6143606f1..38cddf0f4 100644 --- a/webcontrol/Makefile.am +++ b/webcontrol/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) bin_PROGRAMS = webcontrol_applet @@ -16,7 +16,6 @@ webcontrol_applet_SOURCES = \ webcontrol.h webcontrol_applet_LDADD = \ - $(GNOME_LIBDIR) \ $(GNOME_APPLETS_LIBS) $(INTLLIBS) sysdir = $(datadir)/applets/Network diff --git a/whereami/Makefile.am b/whereami/Makefile.am index 485956eea..94a66777d 100644 --- a/whereami/Makefile.am +++ b/whereami/Makefile.am @@ -1,12 +1,12 @@ SUBDIRS = docs -INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" +INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" bin_PROGRAMS = whereami_applet whereami_applet_SOURCES = whereami.c -whereami_applet_LDADD = $(GNOME_LIBDIR) $(GNOME_APPLETS_LIBS) $(INTLLIBS) +whereami_applet_LDADD = $(GNOME_APPLETS_LIBS) $(INTLLIBS) sysdir = $(datadir)/applets/Utility sys_predata = whereami_applet.desktop.in |