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

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

commit 0b63a6bb295ea56035d5accf068c4f41d7886cf2
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue May 27 23:31:11 2014 +0300

    Fix drivemount applet build

 applets/Makefile.am            |    1 +
 applets/drivemount/Makefile.am |   10 +++++++---
 configure.ac                   |    3 +++
 gnome-applets/Makefile.am      |    1 -
 gnome-applets/configure.ac     |    3 ---
 5 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/applets/Makefile.am b/applets/Makefile.am
index 55d3657..b8b7a32 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS =                      \
        charpick \
        clock                   \
+       drivemount \
        fish                    \
        notification_area       \
        wncklet
diff --git a/applets/drivemount/Makefile.am b/applets/drivemount/Makefile.am
index bc77638..a39a748 100644
--- a/applets/drivemount/Makefile.am
+++ b/applets/drivemount/Makefile.am
@@ -3,8 +3,11 @@ SUBDIRS = help
 AM_CPPFLAGS =                                  \
        -I.                                     \
        -I$(srcdir)                             \
+       -I$(srcdir)/../../libpanel-applet \
+       -I$(top_builddir)/libpanel-applet \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DDRIVEMOUNT_MENU_UI_DIR=\""$(uidir)"\" \
-       $(GNOME_APPLETS_CFLAGS)                 \
+       $(LIBPANEL_APPLET_CFLAGS) \
        $(GIO_UNIX_CFLAGS)
        $(WARN_CFLAGS)
 
@@ -18,7 +21,8 @@ drivemount_applet2_SOURCES =  \
        drive-button.h
 
 drivemount_applet2_LDADD =     \
-       $(GNOME_APPLETS_LIBS)   \
+       ../../libpanel-applet/libpanel-applet-4.la \
+       $(LIBPANEL_APPLET_LIBS) \
        $(GIO_UNIX_LIBS)
 
 
@@ -64,7 +68,7 @@ if GCONF_SCHEMAS_INSTALL
 install-data-local:
        if test -z "$(DESTDIR)" ; then \
                for p in $(schemas_DATA) ; do \
-               GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule 
$(top_builddir)/drivemount/$$p ; \
+               GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule 
$(top_builddir)/applets/drivemount/$$p ; \
                done ; \
        fi
 else
diff --git a/configure.ac b/configure.ac
index 6a85b47..767ef83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -600,6 +600,8 @@ applets/cpufreq/Makefile
 applets/cpufreq/pixmaps/Makefile
 applets/cpufreq/src/cpufreq-selector/Makefile
 applets/cpufreq/src/Makefile
+applets/drivemount/help/Makefile
+applets/drivemount/Makefile
 applets/fish/Makefile
 applets/notification_area/Makefile
 applets/wncklet/Makefile
@@ -664,6 +666,7 @@ echo "
                 - building selector    $enable_selector
                 - using PolicyKit      $HAVE_POLKIT
                 - enabling suid bit    $suid
+             - drivemount              always
 
             Using HAL:                 $HAVE_HAL
             Using UPOWER:              $HAVE_UPOWER
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index e4ab40a..d88064f 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -25,7 +25,6 @@ mixer_applet_SUBDIR = mixer
 endif
 
 always_built_SUBDIRS =  \
-       drivemount      \
        geyes           \
        mini-commander  \
        stickynotes     \
diff --git a/gnome-applets/configure.ac b/gnome-applets/configure.ac
index f71fb59..d57a082 100644
--- a/gnome-applets/configure.ac
+++ b/gnome-applets/configure.ac
@@ -419,8 +419,6 @@ AC_OUTPUT([
 gnome-applets.spec
 Makefile
 po/Makefile.in
-drivemount/help/Makefile
-drivemount/Makefile
 geyes/help/Makefile
 geyes/Makefile
 geyes/themes/Makefile
@@ -461,7 +459,6 @@ gnome-applets-$VERSION configure summary:
        Source code location:           ${srcdir}
        Compiler:                       ${CC}
 
-        - drivemount                   always
         - geyes                        always
         - gweather                     $build_libgweather_applets
         - invest-applet                $BUILD_INVEST_APPLET