[gnome-panel] wncklet: update Makefile.am

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

commit a40b68ae06258415050ebd6df4d03dd6b82c8ba4
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Oct 31 19:14:21 2016 +0200

    wncklet: update Makefile.am

 applets/wncklet/Makefile.am |   46 ++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 18 deletions(-)
---
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index b6339c3..2ef3b74 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -1,12 +1,19 @@
 NULL =
 
-libwnck_applet_la_CFLAGS = \
+wnck_appletlibdir = $(pkglibdir)
+wnck_appletlib_LTLIBRARIES = libwnck-applet.la
+
+libwnck_applet_la_CPPFLAGS = \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
        -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
        -I$(top_builddir) \
        -I$(top_builddir)/applets/wncklet \
        -I$(top_srcdir)/libpanel-applet \
        -I$(top_builddir)/libpanel-applet \
+       $(AM_CPPFLAGS) \
+       $(NULL)
+
+libwnck_applet_la_CFLAGS = \
        $(LIBPANEL_APPLET_CFLAGS) \
        $(WNCKLET_CFLAGS) \
        $(WARN_CFLAGS) \
@@ -28,9 +35,9 @@ libwnck_applet_la_SOURCES = \
        $(NULL)
 
 libwnck_applet_la_LIBADD = \
-       ../../libpanel-applet/libpanel-applet.la        \
-       $(WNCKLET_LIBS)                                 \
+       $(top_builddir)/libpanel-applet/libpanel-applet.la \
        $(LIBPANEL_APPLET_LIBS) \
+       $(WNCKLET_LIBS) \
        $(NULL)
 
 libwnck_applet_la_LDFLAGS = \
@@ -39,10 +46,7 @@ libwnck_applet_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(NULL)
 
-APPLET_LOCATION   = $(pkglibdir)/libwnck-applet.so
-
-wnck_appletlibdir = $(pkglibdir)
-wnck_appletlib_LTLIBRARIES = libwnck-applet.la
+APPLET_LOCATION = $(pkglibdir)/libwnck-applet.so
 
 appletdir       = $(appletsdir)
 applet_in_files = org.gnome.panel.Wncklet.panel-applet.in
@@ -56,12 +60,12 @@ $(applet_in_files): $(applet_in_files).in Makefile
 
 @PANEL_INTLTOOL_PANEL_APPLET_RULE@
 
-ui_FILES =                             \
-       window-list-menu.ui             \
-       window-list.ui                  \
-       workspace-switcher-menu.ui      \
-       workspace-switcher.ui
-
+ui_FILES = \
+       window-list-menu.ui \
+       window-list.ui \
+       workspace-switcher-menu.ui \
+       workspace-switcher.ui \
+       $(NULL)
 
 wncklet-resources.c: wncklet.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/wncklet.gresource.xml)
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name wncklet $<
@@ -69,15 +73,21 @@ wncklet-resources.c: wncklet.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --s
 wncklet-resources.h: wncklet.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/wncklet.gresource.xml)
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name wncklet $<
 
-BUILT_SOURCES =                \
-       wncklet-resources.c     \
-       wncklet-resources.h
+BUILT_SOURCES = \
+       wncklet-resources.c \
+       wncklet-resources.h \
+       $(NULL)
 
 EXTRA_DIST = \
        org.gnome.panel.Wncklet.panel-applet.in.in \
+       wncklet.gresource.xml \
        $(ui_FILES) \
-       wncklet.gresource.xml
+       $(NULL)
 
-CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_DATA).in
+CLEANFILES = \
+       $(applet_DATA) \
+       $(applet_DATA).in \
+       $(BUILT_SOURCES) \
+       $(NULL)
 
 -include $(top_srcdir)/git.mk