[gnome-panel] build: use AX_COMPILER_FLAGS
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] build: use AX_COMPILER_FLAGS
- Date: Sat, 26 Sep 2015 22:00:49 +0000 (UTC)
commit d7f954b628b7f56ec30d2fac1066cbaf8b91a08f
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sat Sep 26 23:24:02 2015 +0300
build: use AX_COMPILER_FLAGS
applets/clock/Makefile.am | 63 ++++++++++-----
applets/fish/Makefile.am | 40 +++++----
applets/notification_area/Makefile.am | 57 +++++++++----
applets/wncklet/Makefile.am | 48 ++++++-----
configure.ac | 25 +++---
gnome-panel/Makefile.am | 97 +++++++++++++++-------
gnome-panel/libpanel-applet-private/Makefile.am | 59 ++++++++++----
gnome-panel/libpanel-util/Makefile.am | 30 +++++---
libpanel-applet/Makefile.am | 35 ++++++---
9 files changed, 292 insertions(+), 162 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index b46aa1c..860afc3 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -1,13 +1,16 @@
+NULL =
+
SUBDIRS = pixmaps
noinst_LTLIBRARIES = libsystem-timezone.la
noinst_PROGRAMS = test-system-timezone
-AM_CPPFLAGS = \
- $(TZ_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS)
-
-AM_CFLAGS = $(WARN_CFLAGS)
+libsystem_timezone_la_CFLAGS = \
+ $(LIBPANEL_APPLET_CFLAGS) \
+ $(TZ_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
libsystem_timezone_la_SOURCES = \
system-timezone.c \
@@ -23,7 +26,7 @@ CALENDAR_SOURCES = \
calendar-debug.h
endif
-CLOCK_SOURCES = \
+libclock_applet_la_SOURCES = \
calendar-window.c \
calendar-window.h \
clock.c \
@@ -45,20 +48,23 @@ CLOCK_SOURCES = \
$(BUILT_SOURCES) \
$(CALENDAR_SOURCES)
-CLOCK_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- $(LIBPANEL_APPLET_CFLAGS) \
- $(CLOCK_CFLAGS) \
- $(CLOCK_EDS_CFLAGS) \
- -I$(srcdir)/../../libpanel-applet \
- -I$(top_builddir)/libpanel-applet \
- -I$(srcdir)/../../gnome-panel \
- -I$(top_builddir)/gnome-panel \
+libclock_applet_la_CFLAGS = \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DCLOCK_EDS_ICONDIR="\"$(CLOCK_EDS_ICONDIR)\"" \
- -DGWEATHER_I_KNOW_THIS_IS_UNSTABLE
-
-CLOCK_LDADD = \
+ -DGWEATHER_I_KNOW_THIS_IS_UNSTABLE \
+ -I$(srcdir)/../../libpanel-applet \
+ -I$(top_builddir)/libpanel-applet \
+ -I$(srcdir)/../../gnome-panel \
+ -I$(top_builddir)/gnome-panel \
+ $(LIBPANEL_APPLET_CFLAGS) \
+ $(TZ_CFLAGS) \
+ $(CLOCK_CFLAGS) \
+ $(CLOCK_EDS_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
+
+libclock_applet_la_LIBADD = \
../../libpanel-applet/libpanel-applet.la \
../../gnome-panel/libpanel-util/libpanel-util.la \
$(CLOCK_LIBS) \
@@ -67,19 +73,32 @@ CLOCK_LDADD = \
libsystem-timezone.la \
-lm
+libclock_applet_la_LDFLAGS = \
+ -module -avoid-version \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
test_system_timezone_SOURCES = \
test-system-timezone.c
test_system_timezone_LDADD = libsystem-timezone.la
+test_system_timezone_CFLAGS = \
+ $(LIBPANEL_APPLET_CFLAGS) \
+ $(TZ_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
+
+test_system_timezone_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libclock-applet.so
clock_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
clock_appletlib_LTLIBRARIES = libclock-applet.la
-libclock_applet_la_SOURCES = $(CLOCK_SOURCES)
-libclock_applet_la_CPPFLAGS = $(CLOCK_CPPFLAGS)
-libclock_applet_la_LIBADD = $(CLOCK_LDADD)
-libclock_applet_la_LDFLAGS = -module -avoid-version
-libclock_applet_la_CFLAGS = $(AM_CFLAGS)
$(libclock_applet_la_OBJECTS): $(BUILT_SOURCES)
clock-marshallers.c: clock-marshallers.list
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 6612895..6a1ecfb 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -1,32 +1,36 @@
-AM_CPPFLAGS = \
- $(LIBPANEL_APPLET_CFLAGS) \
- $(FISH_CFLAGS) \
- -I$(srcdir) \
- -I$(srcdir)/../../libpanel-applet \
- -I$(top_builddir)/libpanel-applet \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DFISH_ICONDIR=\""$(fishbitmapsdir)"\" \
- $(DISABLE_DEPRECATED_CFLAGS)
-
-AM_CFLAGS = $(WARN_CFLAGS)
-
-FISH_SOURCES = \
+NULL =
+
+libfish_applet_la_CFLAGS = \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DFISH_ICONDIR=\""$(fishbitmapsdir)"\" \
+ -I$(srcdir) \
+ -I$(srcdir)/../../libpanel-applet \
+ -I$(top_builddir)/libpanel-applet \
+ $(LIBPANEL_APPLET_CFLAGS) \
+ $(FISH_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
+
+libfish_applet_la_SOURCES = \
fish.c \
$(BUILT_SOURCES)
-FISH_LDADD = \
+libfish_applet_la_LIBADD = \
../../libpanel-applet/libpanel-applet.la \
$(FISH_LIBS) \
$(LIBPANEL_APPLET_LIBS)
+libfish_applet_la_LDFLAGS = \
+ -module -avoid-version \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libfish-applet.so
fish_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
fish_applet_lib_LTLIBRARIES = libfish-applet.la
-libfish_applet_la_SOURCES = $(FISH_SOURCES)
-libfish_applet_la_LIBADD = $(FISH_LDADD)
-libfish_applet_la_LDFLAGS = -module -avoid-version
-libfish_applet_la_CFLAGS = $(AM_CFLAGS)
appletdir = $(appletsdir)
applet_in_files = org.gnome.panel.FishApplet.panel-applet.in
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index ddc63d9..b77a36d 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -1,18 +1,20 @@
+NULL =
+
noinst_LTLIBRARIES = libtray.la
noinst_PROGRAMS = testtray
-AM_CPPFLAGS = \
- $(NOTIFICATION_AREA_CFLAGS) \
- $(LIBPANEL_APPLET_CFLAGS) \
- -I$(srcdir) \
- -I$(srcdir)/../../libpanel-applet \
- -I$(top_builddir)/libpanel-applet \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DG_LOG_DOMAIN=\""notification-area-applet"\" \
- -DNOTIFICATION_AREA_MENU_UI_DIR=\""$(uidir)"\" \
- $(DISABLE_DEPRECATED_CFLAGS)
-
-AM_CFLAGS = $(WARN_CFLAGS)
+libtray_la_CFLAGS = \
+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DG_LOG_DOMAIN=\""notification-area-applet"\" \
+ -DNOTIFICATION_AREA_MENU_UI_DIR=\""$(uidir)"\" \
+ -I$(srcdir) \
+ -I$(srcdir)/../../libpanel-applet \
+ -I$(top_builddir)/libpanel-applet \
+ $(NOTIFICATION_AREA_CFLAGS) \
+ $(LIBPANEL_APPLET_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
libtray_la_SOURCES = \
fixedtip.h \
@@ -24,29 +26,48 @@ libtray_la_SOURCES = \
na-tray-manager.c \
na-tray-manager.h
-NOTIFICATION_AREA_SOURCES = main.c main.h
+libnotification_area_applet_la_CFLAGS = $(libtray_la_CFLAGS)
+
+libnotification_area_applet_la_SOURCES = main.c main.h
-NOTIFICATION_AREA_LDADD = \
+libnotification_area_applet_la_LIBADD = \
libtray.la \
../../libpanel-applet/libpanel-applet.la \
$(X_LIBS) \
$(NOTIFICATION_AREA_LIBS) \
$(LIBPANEL_APPLET_LIBS)
+libnotification_area_applet_la_LDFLAGS = \
+ -module -avoid-version \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
testtray_SOURCES = testtray.c
testtray_LDADD = \
libtray.la \
$(X_LIBS) \
$(NOTIFICATION_AREA_LIBS)
+testtray_CFLAGS = \
+ -I$(srcdir) \
+ -I$(srcdir)/../../libpanel-applet \
+ -I$(top_builddir)/libpanel-applet \
+ $(NOTIFICATION_AREA_CFLAGS) \
+ $(LIBPANEL_APPLET_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
+
+testtray_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libnotification-area-applet.so
notification_area_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
notification_area_appletlib_LTLIBRARIES = libnotification-area-applet.la
-libnotification_area_applet_la_SOURCES = $(NOTIFICATION_AREA_SOURCES)
-libnotification_area_applet_la_LIBADD = $(NOTIFICATION_AREA_LDADD)
-libnotification_area_applet_la_LDFLAGS = -module -avoid-version
-libnotification_area_applet_la_CFLAGS = $(AM_CFLAGS)
appletdir = $(appletsdir)
applet_in_files = org.gnome.panel.NotificationAreaApplet.panel-applet.in
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index 79ca5fe..183463d 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -1,17 +1,19 @@
-AM_CPPFLAGS = \
- $(LIBPANEL_APPLET_CFLAGS) \
- $(WNCKLET_CFLAGS) \
- -I$(top_builddir) \
- -I$(top_builddir)/applets/wncklet \
- -I$(top_srcdir)/libpanel-applet \
- -I$(top_builddir)/libpanel-applet \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
- $(DISABLE_DEPRECATED_CFLAGS)
-
-AM_CFLAGS = $(WARN_CFLAGS)
-
-WNCKLET_SOURCES = \
+NULL =
+
+libwnck_applet_la_CFLAGS = \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
+ -I$(top_builddir) \
+ -I$(top_builddir)/applets/wncklet \
+ -I$(top_srcdir)/libpanel-applet \
+ -I$(top_builddir)/libpanel-applet \
+ $(LIBPANEL_APPLET_CFLAGS) \
+ $(WNCKLET_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
+
+libwnck_applet_la_SOURCES = \
wncklet.c \
wncklet.h \
window-menu.c \
@@ -22,21 +24,25 @@ WNCKLET_SOURCES = \
workspace-switcher.h \
showdesktop.c \
showdesktop.h \
- $(BUILT_SOURCES)
+ $(BUILT_SOURCES) \
+ $(NULL)
-WNCKLET_LDADD = \
+libwnck_applet_la_LIBADD = \
../../libpanel-applet/libpanel-applet.la \
$(WNCKLET_LIBS) \
- $(LIBPANEL_APPLET_LIBS)
+ $(LIBPANEL_APPLET_LIBS) \
+ $(NULL)
+
+libwnck_applet_la_LDFLAGS = \
+ -module -avoid-version \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libwnck-applet.so
wnck_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
wnck_appletlib_LTLIBRARIES = libwnck-applet.la
-libwnck_applet_la_SOURCES = $(WNCKLET_SOURCES)
-libwnck_applet_la_LIBADD = $(WNCKLET_LDADD)
-libwnck_applet_la_LDFLAGS = -module -avoid-version
-libwnck_applet_la_CFLAGS = $(AM_CFLAGS)
appletdir = $(appletsdir)
applet_in_files = org.gnome.panel.Wncklet.panel-applet.in
diff --git a/configure.ac b/configure.ac
index c302989..9081b0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,18 @@ dnl **************************************************************************
AX_IS_RELEASE([git-directory])
dnl **************************************************************************
+dnl Enable debug
+dnl **************************************************************************
+
+AX_CHECK_ENABLE_DEBUG([yes])
+
+dnl **************************************************************************
+dnl Add warning flags
+dnl **************************************************************************
+
+AX_COMPILER_FLAGS([WARN_CFLAGS], [WARN_LDFLAGS])
+
+dnl **************************************************************************
dnl Initialize automake
dnl **************************************************************************
@@ -74,8 +86,6 @@ AM_PATH_PYTHON
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
-GNOME_COMPILE_WARNINGS([maximum])
-
# Check for introspection
GOBJECT_INTROSPECTION_CHECK([0.9.5])
@@ -85,16 +95,6 @@ m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below
PANEL_INTLTOOL_PANEL_APPLET_RULE='%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard
$(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
AC_SUBST([PANEL_INTLTOOL_PANEL_APPLET_RULE])
-AC_ARG_ENABLE(deprecation_flags,
- [AC_HELP_STRING([--enable-deprecation-flags],
- [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],,
- [enable_deprecation_flags=no])
-
-if test "x$enable_deprecation_flags" = "xyes"; then
- DISABLE_DEPRECATED_CFLAGS=$DISABLE_DEPRECATED
- AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-fi
-
AC_CHECK_HEADERS(crt_externs.h)
AC_CHECK_FUNCS(_NSGetEnviron)
@@ -320,7 +320,6 @@ echo " sbindir .........................: ${sbindir}"
echo " sysconfdir ......................: ${sysconfdir}"
echo ""
echo " Maintainer mode .................: ${USE_MAINTAINER_MODE}"
-echo " Use *_DISABLE_DEPRECATED ........: ${enable_deprecation_flags}"
echo ""
echo " Evolution-Data-Server support ...: ${enable_eds}"
echo " XRandr support ..................: ${have_randr}"
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 8308edf..f7ff864 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -1,23 +1,15 @@
NULL =
-SUBDIRS = libpanel-applet-private libpanel-util
+SUBDIRS = \
+ libpanel-applet-private \
+ libpanel-util \
+ $(NULL)
bin_PROGRAMS = \
- gnome-panel \
- gnome-desktop-item-edit \
- panel-test-applets
-
-AM_CPPFLAGS = \
- $(PANEL_CFLAGS) \
- -I. \
- -I$(srcdir) \
- -I$(top_builddir)/gnome-panel \
- -I$(top_builddir)/gnome-panel/libpanel-util \
- -DPANELDATADIR=\""$(datadir)/gnome-panel"\" \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- $(DISABLE_DEPRECATED_CFLAGS)
-
-AM_CFLAGS = $(WARN_CFLAGS)
+ gnome-panel \
+ gnome-desktop-item-edit \
+ panel-test-applets \
+ $(NULL)
panel_sources = \
$(gnome_panel_BUILT_SOURCES) \
@@ -123,21 +115,34 @@ gnome_panel_SOURCES = \
$(panel_sources) \
$(panel_headers)
-gnome_panel_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- $(XRANDR_CFLAGS) \
- -DPANEL_MODULES_DIR=\"$(modulesdir)\" \
- -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
- -DGNOME_DESKTOP_USE_UNSTABLE_API
+gnome_panel_CFLAGS = \
+ -DPANEL_MODULES_DIR=\"$(modulesdir)\" \
+ -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
+ -DGNOME_DESKTOP_USE_UNSTABLE_API \
+ -DPANELDATADIR=\""$(datadir)/gnome-panel"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -I$(srcdir) \
+ -I$(top_builddir)/gnome-panel \
+ -I$(top_builddir)/gnome-panel/libpanel-util \
+ $(XRANDR_CFLAGS) \
+ $(PANEL_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
gnome_panel_LDADD = \
$(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private.la \
$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
$(PANEL_LIBS) \
$(XRANDR_LIBS) \
- $(X_LIBS)
+ $(X_LIBS) \
+ $(NULL)
-gnome_panel_LDFLAGS = -export-dynamic
+gnome_panel_LDFLAGS = \
+ -export-dynamic \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
gnome_desktop_item_edit_SOURCES = \
gnome-desktop-item-edit.c \
@@ -146,10 +151,27 @@ gnome_desktop_item_edit_SOURCES = \
panel-util.c \
xstuff.c
+gnome_desktop_item_edit_CFLAGS = \
+ -DPANELDATADIR=\""$(datadir)/gnome-panel"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -I$(srcdir) \
+ -I$(top_builddir)/gnome-panel \
+ -I$(top_builddir)/gnome-panel/libpanel-util \
+ $(PANEL_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
+
gnome_desktop_item_edit_LDADD = \
$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
$(PANEL_LIBS) \
- $(X_LIBS)
+ $(X_LIBS) \
+ $(NULL)
+
+gnome_desktop_item_edit_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
panel_test_applets_SOURCES = \
$(panel_test_applets_BUILT_SOURCES) \
@@ -158,17 +180,30 @@ panel_test_applets_SOURCES = \
panel-applets-manager.c \
panel-test-applets.c
-panel_test_applets_CPPFLAGS = \
- $(AM_CPPFLAGS) \
+panel_test_applets_CFLAGS = \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DPANELDATADIR=\""$(datadir)/gnome-panel"\" \
-DPANEL_MODULES_DIR=\"$(modulesdir)\" \
- -DPANEL_APPLETS_DIR=\"$(appletsdir)\"
+ -DPANEL_APPLETS_DIR=\"$(appletsdir)\" \
+ -I$(srcdir) \
+ -I$(top_builddir)/gnome-panel \
+ -I$(top_builddir)/gnome-panel/libpanel-util \
+ $(PANEL_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
panel_test_applets_LDADD = \
$(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private-mini.la \
$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
- $(PANEL_LIBS)
+ $(PANEL_LIBS) \
+ $(NULL)
-panel_test_applets_LDFLAGS = -export-dynamic
+panel_test_applets_LDFLAGS = \
+ -export-dynamic \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
panel_enum_headers = \
$(top_srcdir)/gnome-panel/panel-enums.h \
diff --git a/gnome-panel/libpanel-applet-private/Makefile.am b/gnome-panel/libpanel-applet-private/Makefile.am
index 6469b3c..2d615e9 100644
--- a/gnome-panel/libpanel-applet-private/Makefile.am
+++ b/gnome-panel/libpanel-applet-private/Makefile.am
@@ -1,20 +1,22 @@
-noinst_LTLIBRARIES = \
- libpanel-applet-private.la \
- libpanel-applet-private-mini.la
-
-AM_CPPFLAGS = \
- $(PANEL_CFLAGS) \
- -I. \
- -I$(srcdir) \
- -I$(top_srcdir)/gnome-panel \
- -I$(top_builddir)/gnome-panel \
- -I$(top_builddir)/gnome-panel/libpanel-applet-private \
- -I$(top_builddir)/gnome-panel/libpanel-util \
- -DDATADIR=\""$(datadir)"\" \
- -DPANEL_APPLETS_DIR=\"$(appletsdir)\" \
- $(DISABLE_DEPRECATED_CFLAGS)
-
-AM_CFLAGS = $(WARN_CFLAGS)
+NULL =
+
+noinst_LTLIBRARIES = \
+ libpanel-applet-private.la \
+ libpanel-applet-private-mini.la \
+ $(NULL)
+
+libpanel_applet_private_la_CFLAGS = \
+ -DDATADIR=\""$(datadir)"\" \
+ -DPANEL_APPLETS_DIR=\"$(appletsdir)\" \
+ -I$(srcdir) \
+ -I$(top_srcdir)/gnome-panel \
+ -I$(top_builddir)/gnome-panel \
+ -I$(top_builddir)/gnome-panel/libpanel-applet-private \
+ -I$(top_builddir)/gnome-panel/libpanel-util \
+ $(PANEL_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
libpanel_applet_private_la_SOURCES = \
panel-applets-manager-dbus.c \
@@ -24,6 +26,24 @@ libpanel_applet_private_la_SOURCES = \
panel-applet-frame-dbus.c \
panel-applet-frame-dbus.h
+libpanel_applet_private_la_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
+libpanel_applet_private_mini_la_CFLAGS = \
+ -DDATADIR=\""$(datadir)"\" \
+ -DPANEL_APPLETS_DIR=\"$(appletsdir)\" \
+ -I$(srcdir) \
+ -I$(top_srcdir)/gnome-panel \
+ -I$(top_builddir)/gnome-panel \
+ -I$(top_builddir)/gnome-panel/libpanel-applet-private \
+ -I$(top_builddir)/gnome-panel/libpanel-util \
+ $(PANEL_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
+
libpanel_applet_private_mini_la_SOURCES =\
panel-applet-mini.c \
panel-applets-manager-dbus.c \
@@ -31,4 +51,9 @@ libpanel_applet_private_mini_la_SOURCES =\
panel-applet-container.c \
panel-applet-container.h
+libpanel_applet_private_mini_la_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
-include $(top_srcdir)/git.mk
diff --git a/gnome-panel/libpanel-util/Makefile.am b/gnome-panel/libpanel-util/Makefile.am
index 544bcdf..532c5d5 100644
--- a/gnome-panel/libpanel-util/Makefile.am
+++ b/gnome-panel/libpanel-util/Makefile.am
@@ -1,14 +1,15 @@
-noinst_LTLIBRARIES = libpanel-util.la
+NULL =
-AM_CPPFLAGS = \
- $(PANEL_CFLAGS) \
- -I. \
- -I$(srcdir) \
- -I$(top_builddir)/gnome-panel/libpanel-util \
- -DDATADIR=\""$(datadir)"\" \
- $(DISABLE_DEPRECATED_CFLAGS)
+noinst_LTLIBRARIES = libpanel-util.la
-AM_CFLAGS = $(WARN_CFLAGS)
+libpanel_util_la_CFLAGS = \
+ -DDATADIR=\""$(datadir)"\" \
+ -I$(srcdir) \
+ -I$(top_builddir)/gnome-panel/libpanel-util \
+ $(PANEL_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
BUILT_SOURCES = \
dbus-login1-manager.c \
@@ -54,9 +55,16 @@ libpanel_util_la_SOURCES = \
panel-show.c \
panel-show.h \
panel-xdg.c \
- panel-xdg.h
+ panel-xdg.h \
+ $(NULL)
+
+libpanel_util_la_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
EXTRA_DIST = \
- org.freedesktop.login1.Manager.xml
+ org.freedesktop.login1.Manager.xml \
+ $(NULL)
-include $(top_srcdir)/git.mk
diff --git a/libpanel-applet/Makefile.am b/libpanel-applet/Makefile.am
index add2a3c..cec3348 100644
--- a/libpanel-applet/Makefile.am
+++ b/libpanel-applet/Makefile.am
@@ -1,13 +1,15 @@
+NULL =
+
lib_LTLIBRARIES = libpanel-applet.la
noinst_PROGRAMS = test-dbus-applet
-AM_CPPFLAGS = \
- $(LIBPANEL_APPLET_CFLAGS) \
- -I$(top_builddir)/libpanel-applet \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- $(DISABLE_DEPRECATED_CFLAGS)
-
-AM_CFLAGS = $(WARN_CFLAGS)
+libpanel_applet_la_CFLAGS = \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -I$(top_builddir)/libpanel-applet \
+ $(LIBPANEL_APPLET_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
libpanel_appletincludedir = $(includedir)/gnome-panel/libpanel-applet
libpanel_appletinclude_HEADERS = \
@@ -29,8 +31,19 @@ libpanel_applet_la_LIBADD = \
$(X_LIBS)
libpanel_applet_la_LDFLAGS = \
- -version-info $(LIB_PANEL_APPLET_LT_VERSION) \
- -no-undefined
+ -version-info $(LIB_PANEL_APPLET_LT_VERSION) \
+ -no-undefined \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
+test_dbus_applet_CFLAGS = \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -I$(top_builddir)/libpanel-applet \
+ $(LIBPANEL_APPLET_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
test_dbus_applet_LDADD = \
$(LIBPANEL_APPLET_LIBS) \
@@ -116,10 +129,10 @@ built_introspection_sources = \
PanelApplet-$(LIBPANEL_APPLET_API_VERSION).gir: libpanel-applet.la
PanelApplet_ LIBPANEL_APPLET_GIR_VERSION@_gir_INCLUDES = GObject-2.0 Gtk-3.0
-PanelApplet_ LIBPANEL_APPLET_GIR_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS)
+PanelApplet_ LIBPANEL_APPLET_GIR_VERSION@_gir_CFLAGS = $(libpanel_applet_la_CFLAGS)
PanelApplet_ LIBPANEL_APPLET_GIR_VERSION@_gir_LIBS = libpanel-applet.la
PanelApplet_ LIBPANEL_APPLET_GIR_VERSION@_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
$(addprefix $(builddir)/,$(built_introspection_sources))
-PanelApplet_ LIBPANEL_APPLET_GIR_VERSION@_gir_SCANNERFLAGS = --identifier-prefix=Panel --symbol-prefix=panel
--pkg-export=libpanel-applet
+PanelApplet_ LIBPANEL_APPLET_GIR_VERSION@_gir_SCANNERFLAGS = --identifier-prefix=Panel --symbol-prefix=panel
--pkg-export=libpanel-applet $(WARN_SCANNERFLAGS)
INTROSPECTION_GIRS += PanelApplet-$(LIBPANEL_APPLET_API_VERSION).gir
girdir = $(datadir)/gir-1.0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
