[gnome-panel/merge-gnome-applets] Fix multiload applet build

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 009402a2aae07693b9e8317e740840998156f24b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed May 28 00:49:19 2014 +0300

    Fix multiload applet build

 applets/Makefile.am           |    4 ++++
 applets/multiload/Makefile.am |    8 ++++++--
 configure.ac                  |   14 ++++++++++++++
 gnome-applets/Makefile.am     |    7 -------
 gnome-applets/configure.ac    |   15 +--------------
 5 files changed, 25 insertions(+), 23 deletions(-)
---
diff --git a/applets/Makefile.am b/applets/Makefile.am
index 43d2ee6..9c43e2f 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -36,4 +36,8 @@ if BUILD_MIXER_APPLET
 SUBDIRS += mixer
 endif
 
+if BUILD_GTOP_APPLETS
+SUBDIRS += multiload
+endif
+
 -include $(top_srcdir)/git.mk
diff --git a/applets/multiload/Makefile.am b/applets/multiload/Makefile.am
index a98f66e..601f543 100644
--- a/applets/multiload/Makefile.am
+++ b/applets/multiload/Makefile.am
@@ -2,8 +2,11 @@ SUBDIRS = help
 
 AM_CPPFLAGS =                  \
        -I$(srcdir)             \
+       -I$(srcdir)/../../libpanel-applet \
+       -I$(top_builddir)/libpanel-applet \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DMULTILOAD_MENU_UI_DIR=\""$(uidir)"\" \
-       $(GNOME_APPLETS_CFLAGS) \
+       $(LIBPANEL_APPLET_CFLAGS)       \
        $(GTOP_APPLETS_CFLAGS)  \
        $(GIO_UNIX_CFLAGS)
 
@@ -22,7 +25,8 @@ multiload_applet_2_SOURCES = \
                        autoscaler.h
 
 multiload_applet_2_LDADD = \
-                               $(GNOME_APPLETS_LIBS)   \
+                               ../../libpanel-applet/libpanel-applet-4.la \
+                               $(LIBPANEL_APPLET_LIBS) \
                                $(GTOP_APPLETS_LIBS)    \
                                $(GIO_UNIX_LIBS)        \
                                $(LIBM)
diff --git a/configure.ac b/configure.ac
index 278956c..106b260 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,7 @@ POLKIT_REQUIRED=0.92
 NETWORKMANAGER_REQUIRED=0.7
 LIBNOTIFY_REQUIRED=0.7
 GST10_REQUIRED=0.10.2
+LIBGTOP_REQUIRED=2.11.92
 
 dnl pkg-config dependency checks
 
@@ -373,6 +374,16 @@ PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUI
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
+dnl -- check for libgtop (optional) -------------------------------------------
+build_gtop_applets=false
+PKG_CHECK_MODULES(GTOP_APPLETS,
+                 [libgtop-2.0 >= $LIBGTOP_REQUIRED],
+                 build_gtop_applets=true,
+                AC_MSG_WARN([libgtop not found. Not building gtop applets.]))
+AC_SUBST(GTOP_APPLETS_CFLAGS)
+AC_SUBST(GTOP_APPLETS_LIBS)
+AM_CONDITIONAL(BUILD_GTOP_APPLETS, $build_gtop_applets)
+
 dnl -- check for PolicyKit and PolicyKit-gnome (optional) -----------------------------------------
 POLKIT_CFLAGS=
 POLKIT_LIBS=
@@ -765,6 +776,8 @@ applets/mini-commander/src/Makefile
 applets/mixer/help/Makefile
 applets/mixer/Makefile
 applets/modemlights/Makefile
+applets/multiload/help/Makefile
+applets/multiload/Makefile
 applets/notification_area/Makefile
 applets/wncklet/Makefile
 doc/Makefile
@@ -835,6 +848,7 @@ echo "
              - mini-commander          $enable_mini_commander
              - mixer                   $enable_mixer
              - modemlights             $BUILD_MODEM_LIGHTS
+             - multiload               $build_gtop_applets
 
             Using DBUS:                $HAVE_DBUS
             Using NetworkManager:      $HAVE_NETWORKMANAGER
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index e20ac59..41e2c80 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -1,9 +1,3 @@
-
-gtop_applets = multiload
-if BUILD_GTOP_APPLETS
-gtop_SUBDIRS = $(gtop_applets)
-endif
-
 always_built_SUBDIRS =  \
        stickynotes     \
        trashapplet     \
@@ -12,7 +6,6 @@ always_built_SUBDIRS =  \
 SUBDIRS = \
        po                      \
        $(always_built_SUBDIRS) \
-       $(gtop_SUBDIRS)         \
 
 DIST_SUBDIRS = \
        po              \
diff --git a/gnome-applets/configure.ac b/gnome-applets/configure.ac
index 6cee136..63fc588 100644
--- a/gnome-applets/configure.ac
+++ b/gnome-applets/configure.ac
@@ -16,7 +16,7 @@ GTK_REQUIRED=3.0
 GLIB_REQUIRED=2.22.0
 GIO_REQUIRED=2.15.3
 LIBPANEL_REQUIRED=2.91.90
-LIBGTOP_REQUIRED=2.11.92
+
 LIBXKLAVIER_REQUIRED=4.0
 LIBWNCK_REQUIRED=2.91.0
 GNOME_ICON_THEME_REQUIRED=2.15.91
@@ -112,16 +112,6 @@ AC_SUBST(LIBPANEL_APPLET_DIR)
 AC_SUBST(GNOME_APPLETS_CFLAGS)
 AC_SUBST(GNOME_APPLETS_LIBS)
 
-dnl -- check for libgtop (optional) -------------------------------------------
-build_gtop_applets=false
-PKG_CHECK_MODULES(GTOP_APPLETS,
-                 [libgtop-2.0 >= $LIBGTOP_REQUIRED],
-                 build_gtop_applets=true,
-                AC_MSG_WARN([libgtop not found. Not building gtop applets.]))
-AC_SUBST(GTOP_APPLETS_CFLAGS)
-AC_SUBST(GTOP_APPLETS_LIBS)
-AM_CONDITIONAL(BUILD_GTOP_APPLETS, $build_gtop_applets)
-
 dnl -- check for libwnck (required) -------------------------------------------
 PKG_CHECK_MODULES(LIBWNCK, libwnck-3.0 >= $LIBWNCK_REQUIRED,,
        AC_MSG_ERROR([libwnck is required to build gnome-applets.], 1))
@@ -260,8 +250,6 @@ gnome-applets.spec
 Makefile
 po/Makefile.in
 man/Makefile
-multiload/help/Makefile
-multiload/Makefile
 null_applet/Makefile
 stickynotes/data/Makefile
 stickynotes/help/Makefile
@@ -282,7 +270,6 @@ gnome-applets-$VERSION configure summary:
        Source code location:           ${srcdir}
        Compiler:                       ${CC}
 
-        - multiload                    $build_gtop_applets
         - stickynotes                  $enable_stickynotes
         - trashapplet                  always
 " >&2