[gnome-panel] notification-area: update Makefile.am

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

commit 97340ee95dbea982ca10f99d882d9ba29beb2411
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Oct 31 07:37:16 2016 +0200

    notification-area: update Makefile.am

 applets/notification-area/Makefile.am |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/applets/notification-area/Makefile.am b/applets/notification-area/Makefile.am
index f9bfcca..e709e7b 100644
--- a/applets/notification-area/Makefile.am
+++ b/applets/notification-area/Makefile.am
@@ -1,12 +1,18 @@
 NULL =
 
-libnotification_area_applet_la_CFLAGS = \
+notification_area_appletlibdir = $(pkglibdir)
+notification_area_appletlib_LTLIBRARIES = libnotification-area-applet.la
+
+libnotification_area_applet_la_CPPFLAGS = \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
        -DG_LOG_DOMAIN=\""notification-area-applet"\" \
-       -DNOTIFICATION_AREA_MENU_UI_DIR=\""$(uidir)"\" \
        -I$(srcdir) \
        -I$(srcdir)/../../libpanel-applet \
        -I$(top_builddir)/libpanel-applet \
+       $(AM_CPPFLAGS) \
+       $(NULL)
+
+libnotification_area_applet_la_CFLAGS = \
        $(NOTIFICATION_AREA_CFLAGS) \
        $(LIBPANEL_APPLET_CFLAGS) \
        $(WARN_CFLAGS) \
@@ -27,9 +33,10 @@ libnotification_area_applet_la_SOURCES = \
        $(NULL)
 
 libnotification_area_applet_la_LIBADD = \
-       ../../libpanel-applet/libpanel-applet.la        \
-       $(NOTIFICATION_AREA_LIBS)                       \
-       $(LIBPANEL_APPLET_LIBS)
+       $(top_builddir)/libpanel-applet/libpanel-applet.la \
+       $(NOTIFICATION_AREA_LIBS) \
+       $(LIBPANEL_APPLET_LIBS) \
+       $(NULL)
 
 libnotification_area_applet_la_LDFLAGS = \
        -module -avoid-version \
@@ -39,9 +46,6 @@ libnotification_area_applet_la_LDFLAGS = \
 
 APPLET_LOCATION   = $(pkglibdir)/libnotification-area-applet.so
 
-notification_area_appletlibdir = $(pkglibdir)
-notification_area_appletlib_LTLIBRARIES = libnotification-area-applet.la
-
 appletdir       = $(appletsdir)
 applet_in_files = org.gnome.panel.NotificationAreaApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
@@ -54,12 +58,13 @@ $(applet_in_files): $(applet_in_files).in Makefile
 
 @PANEL_INTLTOOL_PANEL_APPLET_RULE@
 
-EXTRA_DIST =                                                           \
-       org.gnome.panel.NotificationAreaApplet.panel-applet.in.in       \
-       $(ui_DATA)
+EXTRA_DIST = \
+       org.gnome.panel.NotificationAreaApplet.panel-applet.in.in \
+       $(NULL)
 
-CLEANFILES =                   \
-       $(applet_DATA)          \
-       $(applet_DATA).in
+CLEANFILES = \
+       $(applet_DATA) \
+       $(applet_DATA).in \
+       $(NULL)
 
 -include $(top_srcdir)/git.mk