[gnome-panel] fish: update Makefile.am

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

commit 38b3e2d8d0ec8c12c8aba380ca5368edcad04523
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Oct 28 02:07:11 2016 +0300

    fish: update Makefile.am

 applets/fish/Makefile.am |   92 ++++++++++++++++++++++++++-------------------
 1 files changed, 53 insertions(+), 39 deletions(-)
---
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 0925c8b..30232b7 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -1,26 +1,35 @@
 NULL =
 
-libfish_applet_la_CFLAGS = \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
+fish_applet_libdir = $(pkglibdir)
+fish_applet_lib_LTLIBRARIES = libfish-applet.la
+
+libfish_applet_la_SOURCES = \
+       fish-applet.c \
+       fish-applet.h \
+       $(BUILT_SOURCES) \
+       $(NULL)
+
+libfish_applet_la_CPPFLAGS = \
        -DFISH_ICONDIR=\""$(fishbitmapsdir)"\" \
-       -I$(srcdir) \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        -I$(srcdir)/../../libpanel-applet \
        -I$(top_builddir)/libpanel-applet \
+       -I$(top_srcdir) \
+       $(AM_CPPFLAGS) \
+       $(NULL)
+
+libfish_applet_la_CFLAGS = \
        $(LIBPANEL_APPLET_CFLAGS) \
        $(FISH_CFLAGS) \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
        $(NULL)
 
-libfish_applet_la_SOURCES = \
-       fish-applet.c \
-       fish-applet.h \
-       $(BUILT_SOURCES)
-
 libfish_applet_la_LIBADD = \
-       ../../libpanel-applet/libpanel-applet.la        \
-       $(FISH_LIBS)                                    \
-       $(LIBPANEL_APPLET_LIBS)
+       $(top_builddir)/libpanel-applet/libpanel-applet.la \
+       $(LIBPANEL_APPLET_LIBS) \
+       $(FISH_LIBS) \
+       $(NULL)
 
 libfish_applet_la_LDFLAGS = \
        -module -avoid-version \
@@ -30,9 +39,6 @@ libfish_applet_la_LDFLAGS = \
 
 APPLET_LOCATION   = $(pkglibdir)/libfish-applet.so
 
-fish_applet_libdir = $(pkglibdir)
-fish_applet_lib_LTLIBRARIES = libfish-applet.la
-
 appletdir       = $(appletsdir)
 applet_in_files = org.gnome.panel.FishApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
@@ -46,21 +52,23 @@ $(applet_in_files): $(applet_in_files).in Makefile
 @PANEL_INTLTOOL_PANEL_APPLET_RULE@
 
 fishbitmapsdir = $(datadir)/gnome-panel/fish
-fishbitmaps_DATA =     \
-       wanda.fish      \
-       wanda.png       \
-       fishanim.fish   \
-       fishanim.png    \
-       oldwanda.fish   \
-       oldwanda.png    \
-       footguy.fish    \
-       footguy.png     \
-       monkey.fish     \
-       monkey.png
-
-ui_FILES =             \
-       fish.ui         \
-       fish-menu.ui
+fishbitmaps_DATA = \
+       wanda.fish \
+       wanda.png \
+       fishanim.fish \
+       fishanim.png \
+       oldwanda.fish \
+       oldwanda.png \
+       footguy.fish \
+       footguy.png \
+       monkey.fish \
+       monkey.png \
+       $(NULL)
+
+ui_FILES = \
+       fish.ui \
+       fish-menu.ui \
+       $(NULL)
 
 fish-resources.c: fish.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/fish.gresource.xml)
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name fish $<
@@ -68,17 +76,23 @@ fish-resources.c: fish.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourced
 fish-resources.h: fish.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/fish.gresource.xml)
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name fish $<
 
-BUILT_SOURCES =                \
-       fish-resources.c        \
-       fish-resources.h
+BUILT_SOURCES = \
+       fish-resources.c \
+       fish-resources.h \
+       $(NULL)
 
-EXTRA_DIST =                                           \
-       wanda.svg                                       \
-       $(fishbitmaps_DATA)                             \
-       org.gnome.panel.FishApplet.panel-applet.in.in   \
-       $(ui_FILES)                                     \
-       fish.gresource.xml
+EXTRA_DIST = \
+       wanda.svg \
+       org.gnome.panel.FishApplet.panel-applet.in.in \
+       fish.gresource.xml \
+       $(fishbitmaps_DATA) \
+       $(ui_FILES) \
+       $(NULL)
 
-CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_DATA).in
+CLEANFILES = \
+       $(applet_DATA) \
+       $(applet_DATA).in \
+       $(BUILT_SOURCES) \
+       $(NULL)
 
 -include $(top_srcdir)/git.mk