summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-04-08 10:34:35 +0200
committerZenWalker <[email protected]>2020-04-08 18:00:21 +0200
commitef9f92c36b5926f397028e1a524f22ff96e321da (patch)
tree2b1748b71cbc71949705a2dffdbbf45fed3f4d5f
parent395c75826b1a4a63236087d2875259553b6cb620 (diff)
downloadmate-applets-ef9f92c36b5926f397028e1a524f22ff96e321da.tar.bz2
mate-applets-ef9f92c36b5926f397028e1a524f22ff96e321da.tar.xz
build: Use WARN_CFLAGS variable
-rw-r--r--accessx-status/Makefile.am1
-rw-r--r--battstat/Makefile.am7
-rw-r--r--charpick/Makefile.am5
-rw-r--r--cpufreq/src/Makefile.am7
-rw-r--r--drivemount/Makefile.am1
-rw-r--r--geyes/Makefile.am7
-rw-r--r--mateweather/Makefile.am11
-rw-r--r--multiload/Makefile.am3
-rw-r--r--netspeed/src/Makefile.am13
-rw-r--r--stickynotes/Makefile.am1
-rw-r--r--trashapplet/src/Makefile.am11
11 files changed, 42 insertions, 25 deletions
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index 688c94d5..0193fbe0 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -1,6 +1,7 @@
SUBDIRS = docs pixmaps
AM_CPPFLAGS = \
+ ${WARN_CFLAGS} \
$(MATE_APPLETS4_CFLAGS) \
$(MATEDESKTOP_CFLAGS) \
$(GIO_CFLAGS) \
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index 884252e3..6d8b3af8 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -24,10 +24,11 @@ SUBDIRS = docs sounds $(APMDIR)
DIST_SUBDIRS = docs sounds apmlib
AM_CPPFLAGS = \
- $(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
+ ${WARN_CFLAGS} \
+ $(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
- $(UPOWER_CFLAGS) \
+ $(UPOWER_CFLAGS) \
$(APMINC) \
$(ACPIINC) \
-DG_LOG_DOMAIN=\"battstat_applet\" \
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index ee1728cd..8f6914ad 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -4,8 +4,9 @@ AM_CPPFLAGS = \
-I. \
-I$(srcdir) \
-DCHARPICK_MENU_UI_DIR=\""$(uidir)"\" \
- $(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
+ ${WARN_CFLAGS} \
+ $(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
$(GUCHARMAP_CFLAGS)
libexec_PROGRAMS = mate-charpick-applet
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index 40d7c01c..b9a3781c 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -29,9 +29,12 @@ mate_cpufreq_applet_SOURCES = \
$(cpufreq_files) \
cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h
-mate_cpufreq_applet_LDADD = \
+mate_cpufreq_applet_CFLAGS = \
+ ${WARN_CFLAGS}
+
+mate_cpufreq_applet_LDADD = \
$(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
+ $(MATEDESKTOP_LIBS) \
$(LIBCPUFREQ_LIBS) \
$(DBUS_LIBS)
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index 7656efd2..7e74702d 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
-I. \
-I$(srcdir) \
-DDRIVEMOUNT_MENU_UI_DIR=\""$(uidir)"\" \
+ ${WARN_CFLAGS} \
$(MATE_APPLETS4_CFLAGS) \
$(MATEDESKTOP_CFLAGS)
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index c3e0550a..f226f218 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -3,11 +3,12 @@ SUBDIRS = themes docs
AM_CPPFLAGS = \
-I. \
-I$(srcdir) \
- $(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
+ $(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
-I$(includedir) \
-DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\" \
- -DGEYES_MENU_UI_DIR=\""$(uidir)"\"
+ -DGEYES_MENU_UI_DIR=\""$(uidir)"\" \
+ ${WARN_CFLAGS}
libexec_PROGRAMS = mate-geyes-applet
diff --git a/mateweather/Makefile.am b/mateweather/Makefile.am
index 37ce65ce..ea6a723d 100644
--- a/mateweather/Makefile.am
+++ b/mateweather/Makefile.am
@@ -5,12 +5,13 @@ SUBDIRS = docs
AM_CPPFLAGS = \
-I$(srcdir) \
-I$(top_srcdir) \
- -DMATEWEATHER_MENU_UI_DIR=\""$(uidir)"\" \
- $(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
+ -DMATEWEATHER_MENU_UI_DIR=\""$(uidir)"\" \
+ $(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
- $(LIBMATEWEATHER_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(LIBMATEWEATHER_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ ${WARN_CFLAGS}
libexec_PROGRAMS = mateweather-applet
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index da30c8da..c3df77d5 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -6,7 +6,8 @@ AM_CPPFLAGS = \
$(MATE_APPLETS4_CFLAGS) \
$(GTOP_APPLETS_CFLAGS) \
$(MATEDESKTOP_CFLAGS) \
- $(GIO_CFLAGS)
+ $(GIO_CFLAGS) \
+ ${WARN_CFLAGS}
libexec_PROGRAMS = mate-multiload-applet
diff --git a/netspeed/src/Makefile.am b/netspeed/src/Makefile.am
index a2bd2cb1..06574ebe 100644
--- a/netspeed/src/Makefile.am
+++ b/netspeed/src/Makefile.am
@@ -1,7 +1,12 @@
-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) \
- $(GIO_CFLAGS) $(GTOP_APPLETS_CFLAGS) \
- $(MATE_APPLETS4_CFLAGS) $(MATEDESKTOP_CFLAGS) \
- -DNETSPEED_MENU_UI_DIR=\""$(datadir)/mate/ui"\"
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(includedir) \
+ $(GIO_CFLAGS) \
+ $(GTOP_APPLETS_CFLAGS) \
+ $(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
+ -DNETSPEED_MENU_UI_DIR=\""$(datadir)/mate/ui"\" \
+ ${WARN_CFLAGS}
libexec_PROGRAMS = mate-netspeed-applet
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index 9adf21ae..a67506bd 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -24,6 +24,7 @@ AM_CPPFLAGS = \
$(XML2_CFLAGS) \
-DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\" \
-DGRESOURCE=\""/org/mate/mate-applets/sticky-notes/\"" \
+ ${WARN_CFLAGS} \
$(NULL)
libexec_PROGRAMS = stickynotes-applet
diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am
index e24c9233..3bc5a097 100644
--- a/trashapplet/src/Makefile.am
+++ b/trashapplet/src/Makefile.am
@@ -1,8 +1,9 @@
-AM_CPPFLAGS = -I$(top_srcdir) \
- $(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
- $(GIO_CFLAGS) \
- -DTRASH_MENU_UI_DIR=\""$(datadir)/mate/ui"\"
+AM_CPPFLAGS = -I$(top_srcdir) \
+ $(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
+ $(GIO_CFLAGS) \
+ -DTRASH_MENU_UI_DIR=\""$(datadir)/mate/ui"\" \
+ ${WARN_CFLAGS}
libexec_PROGRAMS = trashapplet