[gnome-panel/merge-gnome-applets] Fix trashapplet build

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

commit 0e0e9d21cba24d8dffb6d1411b1ce3b74a154b3e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed May 28 01:06:00 2014 +0300

    Fix trashapplet build

 applets/Makefile.am                 |    1 +
 applets/trashapplet/src/Makefile.am |    8 ++++++--
 configure.ac                        |    4 ++++
 gnome-applets/Makefile.am           |    7 -------
 gnome-applets/configure.ac          |   16 ----------------
 5 files changed, 11 insertions(+), 25 deletions(-)
---
diff --git a/applets/Makefile.am b/applets/Makefile.am
index 2872c69..05b5aca 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -8,6 +8,7 @@ SUBDIRS =                       \
        notification_area       \
        null_applet \
        stickynotes     \
+       trashapplet     \
        wncklet
 
 if APPLET_ACCESSX
diff --git a/applets/trashapplet/src/Makefile.am b/applets/trashapplet/src/Makefile.am
index 7b579ea..75b2ad6 100644
--- a/applets/trashapplet/src/Makefile.am
+++ b/applets/trashapplet/src/Makefile.am
@@ -1,7 +1,10 @@
 AM_CPPFLAGS = -I$(top_srcdir)          \
-          $(GNOME_APPLETS_CFLAGS)      \
+          $(LIBPANEL_APPLET_CFLAGS)    \
           $(GIO_CFLAGS)                \
           $(WARN_CFLAGS)               \
+          -I$(srcdir)/../../libpanel-applet \
+          -I$(top_builddir)/libpanel-applet \
+          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
            -DTRASH_MENU_UI_DIR=\""$(pkgdatadir)/ui"\"
 
 libexec_PROGRAMS = trashapplet
@@ -14,7 +17,8 @@ trashapplet_SOURCES = \
        xstuff.h
 
 trashapplet_LDADD =            \
-       $(GNOME_APPLETS_LIBS)   \
+       ../../../libpanel-applet/libpanel-applet-4.la   \
+       $(LIBPANEL_APPLET_LIBS) \
        $(GIO_LIBS)             \
        $(X_LIBS)
 
diff --git a/configure.ac b/configure.ac
index 1ea270d..3b7fb91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -805,6 +805,9 @@ applets/stickynotes/data/Makefile
 applets/stickynotes/help/Makefile
 applets/stickynotes/Makefile
 applets/stickynotes/pixmaps/Makefile
+applets/trashapplet/help/Makefile
+applets/trashapplet/Makefile
+applets/trashapplet/src/Makefile
 applets/wncklet/Makefile
 doc/Makefile
 doc/reference/Makefile
@@ -877,6 +880,7 @@ echo "
              - multiload               $build_gtop_applets
              - null_applet             always
              - stickynotes             $enable_stickynotes
+             - trashapplet             always
 
             Using DBUS:                $HAVE_DBUS
             Using NetworkManager:      $HAVE_NETWORKMANAGER
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index c34790f..f296ad3 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -1,10 +1,3 @@
-always_built_SUBDIRS =  \
-       trashapplet     \
-
-SUBDIRS = \
-       po                      \
-       $(always_built_SUBDIRS) \
-
 DIST_SUBDIRS = \
        po              \
        drivemount      \
diff --git a/gnome-applets/configure.ac b/gnome-applets/configure.ac
index eef67d2..7d1237b 100644
--- a/gnome-applets/configure.ac
+++ b/gnome-applets/configure.ac
@@ -203,20 +203,4 @@ gnome-applets.spec
 Makefile
 po/Makefile.in
 man/Makefile
-trashapplet/help/Makefile
-trashapplet/Makefile
-trashapplet/src/Makefile
 ])
-
-dnl ***************************************************************************
-dnl *** Display Summary                                                     ***
-dnl ***************************************************************************
-echo "
-gnome-applets-$VERSION configure summary:
-
-       Prefix:                         ${prefix}
-       Source code location:           ${srcdir}
-       Compiler:                       ${CC}
-
-        - trashapplet                  always
-" >&2