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

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

commit 66a2ee1220b762e387305c5d41719732fa4021e4
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed May 28 00:52:45 2014 +0300

    Fix null_applet build

 applets/Makefile.am             |    1 +
 applets/null_applet/Makefile.am |    9 +++++++--
 configure.ac                    |    2 ++
 gnome-applets/Makefile.am       |    1 -
 gnome-applets/configure.ac      |    1 -
 5 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/applets/Makefile.am b/applets/Makefile.am
index 9c43e2f..b969b3b 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -6,6 +6,7 @@ SUBDIRS =                       \
        geyes \
        mini-commander \
        notification_area       \
+       null_applet \
        wncklet
 
 if APPLET_ACCESSX
diff --git a/applets/null_applet/Makefile.am b/applets/null_applet/Makefile.am
index ac42edd..fa838f2 100644
--- a/applets/null_applet/Makefile.am
+++ b/applets/null_applet/Makefile.am
@@ -4,14 +4,19 @@ service_in_files = org.gnome.panel.applet.NullAppletFactory.service.in
 AM_CPPFLAGS =                  \
        -I.                     \
        -I$(srcdir)             \
-       $(GNOME_APPLETS_CFLAGS) \
+       -I$(srcdir)/../../libpanel-applet \
+       -I$(top_builddir)/libpanel-applet \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+       $(LIBPANEL_APPLET_CFLAGS) \
        $(WARN_CFLAGS)
 
 libexec_PROGRAMS = null_applet
 
 null_applet_SOURCES = null_applet.c null_applet.h
 
-null_applet_LDADD = $(GNOME_APPLETS_LIBS)
+null_applet_LDADD = \
+       ../../libpanel-applet/libpanel-applet-4.la      \
+       $(LIBPANEL_APPLET_LIBS)
 
 appletdir = $(datadir)/gnome-panel/4.0/applets
 applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
diff --git a/configure.ac b/configure.ac
index 106b260..9ecb711 100644
--- a/configure.ac
+++ b/configure.ac
@@ -779,6 +779,7 @@ applets/modemlights/Makefile
 applets/multiload/help/Makefile
 applets/multiload/Makefile
 applets/notification_area/Makefile
+applets/null_applet/Makefile
 applets/wncklet/Makefile
 doc/Makefile
 doc/reference/Makefile
@@ -849,6 +850,7 @@ echo "
              - mixer                   $enable_mixer
              - modemlights             $BUILD_MODEM_LIGHTS
              - multiload               $build_gtop_applets
+             - null_applet             always
 
             Using DBUS:                $HAVE_DBUS
             Using NetworkManager:      $HAVE_NETWORKMANAGER
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index 41e2c80..c9d83cb 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -1,7 +1,6 @@
 always_built_SUBDIRS =  \
        stickynotes     \
        trashapplet     \
-       null_applet
 
 SUBDIRS = \
        po                      \
diff --git a/gnome-applets/configure.ac b/gnome-applets/configure.ac
index 63fc588..ce1c7b2 100644
--- a/gnome-applets/configure.ac
+++ b/gnome-applets/configure.ac
@@ -250,7 +250,6 @@ gnome-applets.spec
 Makefile
 po/Makefile.in
 man/Makefile
-null_applet/Makefile
 stickynotes/data/Makefile
 stickynotes/help/Makefile
 stickynotes/Makefile