GNOME.org
 

[gnome-applets] build: use AX_COMPILER_FLAGS

commit fcf3e5b04b522a8319556edf303c3c2755ec6a32
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Sep 27 18:20:28 2015 +0300

    build: use AX_COMPILER_FLAGS

 accessx-status/Makefile.am               |   29 ++++++++++++------
 battstat/Makefile.am                     |   20 +++++++-----
 battstat/apmlib/Makefile.am              |   20 +++++++++---
 brightness/Makefile.am                   |   16 +++++++--
 charpick/Makefile.am                     |   14 +++++++-
 configure.ac                             |   47 ++++--------------------------
 cpufreq/src/Makefile.am                  |   15 +++++++--
 cpufreq/src/cpufreq-selector/Makefile.am |   16 ++++++++--
 drivemount/Makefile.am                   |   15 +++++++--
 geyes/Makefile.am                        |   14 +++++++-
 gweather/Makefile.am                     |   15 +++++++--
 inhibit/Makefile.am                      |   14 +++++++--
 mini-commander/src/Makefile.am           |   15 +++++++--
 modemlights/Makefile.am                  |   16 ++++++++--
 multiload/Makefile.am                    |   14 +++++++-
 netspeed/src/Makefile.am                 |   24 +++++++++++----
 stickynotes/Makefile.am                  |   18 +++++++----
 tracker-search-bar/Makefile.am           |   14 +++++++--
 trashapplet/src/Makefile.am              |   20 +++++++++---
 windowpicker/src/Makefile.am             |   26 +++++++++++-----
 20 files changed, 255 insertions(+), 127 deletions(-)
---
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index d9bc726..b30b7fa 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -1,24 +1,34 @@
-SUBDIRS = help pixmaps
+NULL =
 
-AM_CPPFLAGS = \
-       $(GNOME_APPLETS_CFLAGS) \
-       $(GIO_CFLAGS)           \
-       $(GIO_UNIX_CFLAGS)      \
-       $(WARN_CFLAGS)          \
-       -DACCESSX_PIXMAPS_DIR=\""$(datadir)/pixmaps/accessx-status-applet"\" \
-       -DACCESSX_MENU_UI_DIR=\""$(uidir)"\"
+SUBDIRS = help pixmaps
 
 libexec_PROGRAMS = accessx-status-applet
 
+accessx_status_applet_CFLAGS = \
+       -DACCESSX_PIXMAPS_DIR=\""$(datadir)/pixmaps/accessx-status-applet"\" \
+       -DACCESSX_MENU_UI_DIR=\""$(uidir)"\" \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(GIO_CFLAGS) \
+       $(GIO_UNIX_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
 accessx_status_applet_SOURCES = \
        applet.c \
        applet.h
 
+accessx_status_applet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 accessx_status_applet_LDADD =  \
        $(GNOME_APPLETS_LIBS)   \
        $(GIO_LIBS)             \
        $(GIO_UNIX_LIBS)        \
-        $(X_LIBS)
+       $(X_LIBS) \
+       $(NULL)
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.AccessxStatusApplet.panel-applet.in
@@ -51,5 +61,4 @@ EXTRA_DIST = \
        $(service_in_files) \
        $(ui_DATA)
 
-
 -include $(top_srcdir)/git.mk
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index a75c706..1bebe25 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -1,3 +1,4 @@
+NULL =
 
 builder_DATA = battstat_applet.ui
 
@@ -23,19 +24,19 @@ SUBDIRS = help sounds $(APMDIR)
 
 DIST_SUBDIRS = help sounds apmlib
 
-AM_CPPFLAGS =                                  \
+libexec_PROGRAMS = battstat-applet-2
+
+battstat_applet_2_CFLAGS = \
        $(GNOME_APPLETS_CFLAGS)                 \
        $(LIBNOTIFY_CFLAGS)                     \
        $(UPOWER_CFLAGS)                        \
        $(APMINC)                               \
        $(ACPIINC)                              \
-       $(WARN_CFLAGS)                          \
        -DG_LOG_DOMAIN=\"battstat_applet\"      \
-       -DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\"
-
-
-libexec_PROGRAMS = battstat-applet-2
-
+       -DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\" \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
 
 battstat_applet_2_SOURCES = \
        battstat.h \
@@ -50,6 +51,10 @@ battstat_applet_2_SOURCES = \
        battstat-upower.c \
        battstat-upower.h
 
+battstat_applet_2_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
 
 battstat_applet_2_LDADD = \
                     $(GNOME_APPLETS_LIBS) \
@@ -108,5 +113,4 @@ EXTRA_DIST =                                                        \
        $(service_in_files)                                     \
        $(schemas_in_files)
 
-
 -include $(top_srcdir)/git.mk
diff --git a/battstat/apmlib/Makefile.am b/battstat/apmlib/Makefile.am
index b554f0d..df9d823 100644
--- a/battstat/apmlib/Makefile.am
+++ b/battstat/apmlib/Makefile.am
@@ -4,16 +4,26 @@
 # Created: Thu Jun 15 23:08:41 CEST 2000
 #
 
-AM_CPPFLAGS =                                  \
-       -I$(top_srcdir)                         \
-       -I$(top_srcdir)/apmlib                  \
-       $(GNOME_APPLETS_CFLAGS)                 \
-       -DG_LOG_DOMAIN=\"battstat_applet\"
+NULL =
 
 noinst_LIBRARIES = libapm.a
 
 libapm_a_SOURCES = apmlib.c apm.h
 
+libapm_a_CFLAGS = \
+       -I$(top_srcdir)                         \
+       -I$(top_srcdir)/apmlib                  \
+       -DG_LOG_DOMAIN=\"battstat_applet\" \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+libapm_a_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 CLEANFILES = \
        libapm.a
 
diff --git a/brightness/Makefile.am b/brightness/Makefile.am
index 1b6ba1d..e6b84bb 100644
--- a/brightness/Makefile.am
+++ b/brightness/Makefile.am
@@ -1,20 +1,28 @@
+NULL =
+
 SUBDIRS = icons
 
-AM_CPPFLAGS =                                  \
+libexec_PROGRAMS=gnome-brightness-applet
+
+gnome_brightness_applet_CFLAGS = \
        -I.                                     \
        -I$(srcdir)                             \
        -DBRIGHTNESS_MENU_UI_DIR=\""$(uidir)"\" \
        $(GNOME_APPLETS_CFLAGS)                 \
-       $(WARN_CFLAGS)                          \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
        $(NULL)
 
-libexec_PROGRAMS=gnome-brightness-applet
-
 gnome_brightness_applet_SOURCES =                              \
        dbus-brightness.h                                       \
        dbus-brightness.c                                       \
        brightness-applet.c
 
+gnome_brightness_applet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 gnome_brightness_applet_LDADD =                                        \
        $(GNOME_APPLETS_LIBS)
 
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index 991642a..1d700dd 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -1,11 +1,16 @@
+NULL =
+
 SUBDIRS = help
 
-AM_CPPFLAGS =                                  \
+charpick_applet2_CFLAGS = \
        -I.                                     \
        -I$(srcdir)                             \
        -DCHARPICK_MENU_UI_DIR=\""$(uidir)"\"   \
        $(GNOME_APPLETS_CFLAGS)         \
-       $(GUCHARMAP_CFLAGS)
+       $(GUCHARMAP_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
 
 libexec_PROGRAMS = charpick_applet2
 
@@ -13,6 +18,11 @@ charpick_applet2_SOURCES = charpick.c \
                           charpick.h \
                           properties.c
 
+charpick_applet2_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 charpick_applet2_LDADD = \
                       $(GNOME_APPLETS_LIBS)    \
                       $(GUCHARMAP_LIBS)
diff --git a/configure.ac b/configure.ac
index f317e2c..650e035 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,12 @@ dnl **************************************************************************
 AX_CHECK_ENABLE_DEBUG([yes])
 
 dnl **************************************************************************
+dnl Add warning flags
+dnl **************************************************************************
+
+AX_COMPILER_FLAGS([WARN_CFLAGS], [WARN_LDFLAGS])
+
+dnl **************************************************************************
 dnl Initialize automake
 dnl **************************************************************************
 
@@ -84,51 +90,10 @@ AC_SUBST(X_LIBS)
 dnl Check for libm
 LT_LIB_M
 
-GNOME_COMPILE_WARNINGS
-
 dnl Check for non-portable headers
 AC_CHECK_HEADERS([pty.h values.h])
 
 dnl ***************************************************************************
-dnl *** --enable-more-warnings turns on more compiler warnings              ***
-dnl ***************************************************************************
-AC_ARG_ENABLE(more-warnings,
-[  --enable-more-warnings  Maximum compiler warnings],
-set_more_warnings="$enableval",[
-    set_more_warnings=no
-])
-AC_MSG_CHECKING(for more warnings, including -Werror)
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-    AC_MSG_RESULT(yes)
-    CFLAGS="\
-    -Wall \
-    -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-    -Wnested-externs -Wpointer-arith \
-    -Wcast-align -Wsign-compare \
-    -std=gnu89 \
-    $CFLAGS"
-
-    for option in -Wno-strict-aliasing -Wno-sign-compare; do
-        SAVE_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $option"
-        AC_MSG_CHECKING([whether gcc understands $option])
-        AC_TRY_COMPILE([], [],
-            has_option=yes,
-            has_option=no,)
-        if test $has_option = no; then
-            CFLAGS="$SAVE_CFLAGS"
-        fi
-        AC_MSG_RESULT($has_option)
-        unset has_option
-        unset SAVE_CFLAGS
-    done
-    unset option
-else
-    AC_MSG_RESULT(no)
-fi
-dnl ***************************************************************************
-
-dnl ***************************************************************************
 dnl *** Use pkg-config to check for dependancies                            ***
 dnl ***************************************************************************
 
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index 8dfd9fe..54634b1 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -1,15 +1,19 @@
+NULL =
+
 if BUILD_CPUFREQ_SELECTOR
 selector_SUBDIR = cpufreq-selector
 endif
 
 SUBDIRS = $(selector_SUBDIR)
 
-AM_CPPFLAGS = \
+cpufreq_applet_CFLAGS = \
        -DCPUFREQ_MENU_UI_DIR=\""$(pkgdatadir)/ui"\"            \
        $(GNOME_APPLETS_CFLAGS)                                 \
        $(LIBGLADE_CFLAGS)                                      \
-       $(DBUS_CFLAGS)                                          \
-       $(WARN_CFLAGS)
+       $(DBUS_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
 
 libexec_PROGRAMS = cpufreq-applet
 
@@ -36,6 +40,9 @@ cpufreq_applet_LDADD =  \
        $(LIBCPUFREQ_LIBS)              \
        $(DBUS_LIBS)
 
-       
+cpufreq_applet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/cpufreq/src/cpufreq-selector/Makefile.am b/cpufreq/src/cpufreq-selector/Makefile.am
index 7971a62..74b648c 100644
--- a/cpufreq/src/cpufreq-selector/Makefile.am
+++ b/cpufreq/src/cpufreq-selector/Makefile.am
@@ -1,9 +1,15 @@
+NULL =
+
 cpufreqselectordir = $(bindir)
 
-AM_CPPFLAGS = $(CPUFREQ_SELECTOR_CFLAGS)
+cpufreq_selector_CFLAGS = \
+       $(CPUFREQ_SELECTOR_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
 
 if HAVE_POLKIT
-AM_CPPFLAGS += \
+cpufreq_selector_CFLAGS += \
        $(DBUS_CFLAGS)          \
        $(POLKIT_CFLAGS)
 endif
@@ -44,7 +50,11 @@ cpufreq_selector_LDADD += \
        $(POLKIT_LIBS)
 endif
 
-cpufreq_selector_LDFLAGS = $(LDFLAGS) -Wl,-z,now
+cpufreq_selector_LDFLAGS = \
+       -Wl,-z,now \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
 
 dbus_services_in_files = org.gnome.CPUFreqSelector.service.in
 polkit_in_files = org.gnome.cpufreqselector.policy.in
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index 65bfab9..afb70d8 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -1,12 +1,16 @@
+NULL =
+
 SUBDIRS = help
 
-AM_CPPFLAGS =                                  \
+drivemount_applet2_CFLAGS = \
        -I.                                     \
        -I$(srcdir)                             \
        -DDRIVEMOUNT_MENU_UI_DIR=\""$(uidir)"\" \
        $(GNOME_APPLETS_CFLAGS)                 \
-       $(GIO_UNIX_CFLAGS)
-       $(WARN_CFLAGS)
+       $(GIO_UNIX_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
 
 libexec_PROGRAMS = drivemount_applet2
 
@@ -17,6 +21,11 @@ drivemount_applet2_SOURCES = \
        drive-button.c          \
        drive-button.h
 
+drivemount_applet2_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 drivemount_applet2_LDADD =     \
        $(GNOME_APPLETS_LIBS)   \
        $(GIO_UNIX_LIBS)
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index 94c26ce..409ebb4 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -1,12 +1,17 @@
+NULL =
+
 SUBDIRS = help themes
 
-AM_CPPFLAGS =                                          \
+geyes_applet2_CFLAGS = \
        -I.                                             \
        -I$(srcdir)                                     \
        $(GNOME_APPLETS_CFLAGS)                         \
        -I$(includedir)                                 \
        -DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\"   \
-       -DGEYES_MENU_UI_DIR=\""$(uidir)"\"
+       -DGEYES_MENU_UI_DIR=\""$(uidir)"\" \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
 
 libexec_PROGRAMS = geyes_applet2
 
@@ -15,6 +20,11 @@ geyes_applet2_SOURCES =      \
        themes.c \
        geyes.h
 
+geyes_applet2_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 geyes_applet2_LDADD =          \
        $(GNOME_APPLETS_LIBS)   \
        $(LIBM)
diff --git a/gweather/Makefile.am b/gweather/Makefile.am
index 8908524..c35983f 100644
--- a/gweather/Makefile.am
+++ b/gweather/Makefile.am
@@ -1,8 +1,8 @@
-## Process this file with automake to produce Makefile.in
+NULL =
 
 SUBDIRS = help
 
-AM_CPPFLAGS =                                  \
+gweather_applet_2_CFLAGS = \
        -I$(srcdir)                             \
        -I$(top_srcdir)                         \
        -DGWEATHER_MENU_UI_DIR=\""$(uidir)"\"   \
@@ -10,8 +10,10 @@ AM_CPPFLAGS =                                        \
        $(GNOME_APPLETS_CFLAGS)         \
        $(DBUS_CFLAGS)                          \
        $(LIBNOTIFY_CFLAGS)                     \
-       $(LIBGWEATHER_CFLAGS)                   \
-       $(WARN_CFLAGS)
+       $(LIBGWEATHER_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
 
 libexec_PROGRAMS = gweather-applet-2
 
@@ -24,6 +26,11 @@ gweather_applet_2_SOURCES = \
        gweather-dialog.c gweather-dialog.h \
        gweather-applet.c gweather-applet.h
 
+gweather_applet_2_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 gweather_applet_2_LDADD =      \
        $(DBUS_LIBS)            \
        $(LIBNOTIFY_LIBS)       \
diff --git a/inhibit/Makefile.am b/inhibit/Makefile.am
index c260898..dc87f17 100644
--- a/inhibit/Makefile.am
+++ b/inhibit/Makefile.am
@@ -1,11 +1,14 @@
+NULL =
+
 SUBDIRS = icons
 
-AM_CPPFLAGS =                                  \
+gnome_inhibit_applet_CFLAGS = \
        -I.                                     \
        -I$(srcdir)                             \
        -DINHIBIT_MENU_UI_DIR=\""$(uidir)"\"    \
-       $(GNOME_APPLETS_CFLAGS)                 \
-       $(WARN_CFLAGS)                          \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
        $(NULL)
 
 libexec_PROGRAMS=gnome-inhibit-applet
@@ -15,6 +18,11 @@ gnome_inhibit_applet_SOURCES =                                       \
        dbus-inhibit.c                                  \
        inhibit-applet.c
 
+gnome_inhibit_applet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 gnome_inhibit_applet_LDADD =                                   \
        $(GNOME_APPLETS_LIBS)
 
diff --git a/mini-commander/src/Makefile.am b/mini-commander/src/Makefile.am
index b81d01e..db7c9e4 100644
--- a/mini-commander/src/Makefile.am
+++ b/mini-commander/src/Makefile.am
@@ -1,12 +1,14 @@
-## Process this file with automake to produce Makefile.in
+NULL =
 
-AM_CPPFLAGS =                          \
+mini_commander_applet_CFLAGS = \
        -I.                             \
        -I$(srcdir)                     \
        -DMC_MENU_UI_DIR=\""$(uidir)"\" \
        $(GNOME_APPLETS_CFLAGS) \
-       $(WARN_CFLAGS)                  \
-       $(GNOME_INCLUDEDIR)
+       $(GNOME_INCLUDEDIR) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
 
 libexec_PROGRAMS = mini_commander_applet
 
@@ -31,6 +33,11 @@ mini_commander_applet_SOURCES =                      \
        preferences.h                           \
        gsettings.h
 
+mini_commander_applet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 mini_commander_applet_LDADD =  \
        $(GNOME_APPLETS_LIBS)
 
diff --git a/modemlights/Makefile.am b/modemlights/Makefile.am
index f16a431..dc301c4 100644
--- a/modemlights/Makefile.am
+++ b/modemlights/Makefile.am
@@ -1,8 +1,14 @@
-AM_CPPFLAGS = -I. -I$(srcdir)                          \
+NULL =
+
+modem_applet_CFLAGS = \
+       -I. \
+       -I$(srcdir) \
        -DMODEM_MENU_UI_DIR=\""$(uidir)"\"              \
        $(GNOME_APPLETS_CFLAGS)                         \
+       $(XML2_CFLAGS) \
        $(WARN_CFLAGS) \
-       $(XML2_CFLAGS)
+       $(AM_CFLAGS) \
+       $(NULL)
 
 libexec_PROGRAMS = modem_applet
 
@@ -10,6 +16,11 @@ modem_applet_SOURCES = \
        modem-applet.c \
        modem-applet.h
 
+modem_applet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 modem_applet_LDADD =           \
        $(GNOME_APPLETS_LIBS)   \
        $(MODEMLIGHTS_LIBS) \
@@ -18,7 +29,6 @@ modem_applet_LDADD =          \
 uidir  = $(pkgdatadir)/ui
 ui_DATA        = modem-applet-menu.xml
 
-
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.ModemApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index 8dd4c7c..f6462d8 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -1,11 +1,16 @@
+NULL =
+
 SUBDIRS = help
 
-AM_CPPFLAGS =                  \
+multiload_applet_2_CFLAGS = \
        -I$(srcdir)             \
        -DMULTILOAD_MENU_UI_DIR=\""$(uidir)"\" \
        $(GNOME_APPLETS_CFLAGS) \
        $(GTOP_APPLETS_CFLAGS)  \
-       $(GIO_UNIX_CFLAGS)
+       $(GIO_UNIX_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
 
 libexec_PROGRAMS = multiload-applet-2
 
@@ -21,6 +26,11 @@ multiload_applet_2_SOURCES = \
                        autoscaler.c    \
                        autoscaler.h
 
+multiload_applet_2_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 multiload_applet_2_LDADD = \
                                $(GNOME_APPLETS_LIBS)   \
                                $(GTOP_APPLETS_LIBS)    \
diff --git a/netspeed/src/Makefile.am b/netspeed/src/Makefile.am
index 96cc19b..12b4e4e 100644
--- a/netspeed/src/Makefile.am
+++ b/netspeed/src/Makefile.am
@@ -1,12 +1,17 @@
+NULL =
+
 uidir = $(pkgdatadir)/ui
 
-AM_CFLAGS = \
-       -I$(top_srcdir) \
-       -I$(includedir) \
-       $(GNOME_APPLETS_CFLAGS) \
-       $(GTOP_APPLETS_CFLAGS) \
-       -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-       -DNETSPEED_MENU_UI_DIR=\""$(uidir)"\"
+netspeed_applet2_CFLAGS = \
+       -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+       -DNETSPEED_MENU_UI_DIR=\""$(uidir)"\" \
+       -I$(top_srcdir) \
+       -I$(includedir) \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(GTOP_APPLETS_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
 
 libexec_PROGRAMS = netspeed_applet2
 
@@ -20,6 +25,11 @@ netspeed_applet2_SOURCES = \
   preferences.h \
   preferences.c
 
+netspeed_applet2_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 netspeed_applet2_LDADD = \
         $(GNOME_APPLETS_LIBS) \
         $(GTOP_APPLETS_LIBS) \
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index 259956f..9ee69d7 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -1,4 +1,4 @@
-## Process this file with automake to produce Makefile.in
+NULL =
 
 SUBDIRS = help pixmaps
 
@@ -14,14 +14,16 @@ service_in_files = org.gnome.panel.applet.StickyNotesAppletFactory.service.in
 gsettings_schemas_in_in = org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
 
 if BUILD_STICKYNOTES_APPLET
-AM_CPPFLAGS =                                  \
+stickynotes_applet_CFLAGS = \
+       -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\" \
        -I.                                     \
        -I$(srcdir)                             \
        $(GNOME_APPLETS_CFLAGS)                 \
        $(LIBWNCK_CFLAGS)                       \
-       $(XML2_CFLAGS)                          \
-       $(WARN_CFLAGS)                          \
-       -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\"
+       $(XML2_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
 
 libexec_PROGRAMS = stickynotes_applet
 
@@ -38,6 +40,11 @@ stickynotes_applet_SOURCES = \
        stickynotes_applet_callbacks.c \
        gsettings.h
 
+stickynotes_applet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 stickynotes_applet_LDADD =     \
        $(GNOME_APPLETS_LIBS)   \
        $(LIBWNCK_LIBS)         \
@@ -93,5 +100,4 @@ EXTRA_DIST = \
              $(service_in_files) \
             org.gnome.applets.StickyNotesApplet.panel-applet.in.in
 
-
 -include $(top_srcdir)/git.mk
diff --git a/tracker-search-bar/Makefile.am b/tracker-search-bar/Makefile.am
index bdd5b76..8cca213 100644
--- a/tracker-search-bar/Makefile.am
+++ b/tracker-search-bar/Makefile.am
@@ -1,9 +1,12 @@
-AM_CPPFLAGS =                                  \
+NULL =
+
+tracker_search_bar_CFLAGS = \
        -I.                                     \
        -I$(srcdir)                             \
        $(GNOME_APPLETS_CFLAGS)                 \
-       $(TRACKER_SEARCH_BAR_CFLAGS)            \
-       $(WARN_CFLAGS)                          \
+       $(TRACKER_SEARCH_BAR_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
        $(NULL)
 
 libexec_PROGRAMS = tracker-search-bar
@@ -18,6 +21,11 @@ tracker_search_bar_SOURCES =                           \
        tracker-utils.c                                \
        tracker-utils.h
 
+tracker_search_bar_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 tracker_search_bar_LDADD =                             \
        $(GNOME_APPLETS_LIBS)                          \
        $(TRACKER_SEARCH_BAR_LIBS)
diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am
index ddf5b10..07c9f9a 100644
--- a/trashapplet/src/Makefile.am
+++ b/trashapplet/src/Makefile.am
@@ -1,8 +1,13 @@
-AM_CPPFLAGS = -I$(top_srcdir)          \
-          $(GNOME_APPLETS_CFLAGS)      \
-          $(GIO_CFLAGS)                \
-          $(WARN_CFLAGS)               \
-           -DTRASH_MENU_UI_DIR=\""$(pkgdatadir)/ui"\"
+NULL =
+
+trashapplet_CPPFLAGS = \
+       -DTRASH_MENU_UI_DIR=\""$(pkgdatadir)/ui"\" \
+       -I$(top_srcdir) \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(GIO_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
 
 libexec_PROGRAMS = trashapplet
 
@@ -11,6 +16,11 @@ trashapplet_SOURCES = \
        trash-empty.h \
        trash-empty.c
 
+trashapplet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
 trashapplet_LDADD =            \
        $(GNOME_APPLETS_LIBS)   \
        $(GIO_LIBS)             \
diff --git a/windowpicker/src/Makefile.am b/windowpicker/src/Makefile.am
index ca1979a..0db9b8e 100644
--- a/windowpicker/src/Makefile.am
+++ b/windowpicker/src/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 window_picker_libdir=${pkglibdir}/${LIBPANEL_APPLET_API_VERSION}
 window_picker_lib_LTLIBRARIES=libwindow-picker-applet.la
 
@@ -10,17 +12,25 @@ wp-resources.c wp-resources.h: \
        wp-resources.gresource.xml \
                $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies wp-resources.gresource.xml)
 
-AM_CFLAGS=\
-       $(GNOME_APPLETS_CFLAGS)     \
-       $(LIBWNCK_CFLAGS)           \
-       $(GCC_FLAGS)                            \
-       -I$(top_builddir)                       \
-       -I$(top_srcdir)                         \
-       -D_GNU_SOURCE                           \
+libwindow_picker_applet_la_CFLAGS = \
+       -D_GNU_SOURCE \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
        -DWNCK_I_KNOW_THIS_IS_UNSTABLE=1 \
        -DGTK_DISABLE_SINGLE_INCLUDES \
-    -lm
+       -I$(top_builddir) \
+       -I$(top_srcdir) \
+       -lm \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(LIBWNCK_CFLAGS) \
+       $(GCC_FLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+libwindow_picker_applet_la_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
 
 libwindow_picker_applet_la_LIBADD = \
        $(GNOME_APPLETS_LIBS) \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]