summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--capplets/about-me/Makefile.am1
-rw-r--r--capplets/accessibility/at-properties/Makefile.am10
-rw-r--r--capplets/appearance/Makefile.am1
-rw-r--r--capplets/common/Makefile.am11
-rw-r--r--capplets/default-applications/Makefile.am1
-rw-r--r--capplets/display/Makefile.am12
-rw-r--r--capplets/keybindings/Makefile.am1
-rw-r--r--capplets/keyboard/Makefile.am1
-rw-r--r--capplets/mouse/Makefile.am1
-rw-r--r--capplets/network/Makefile.am1
-rw-r--r--capplets/time-admin/src/Makefile.am7
-rw-r--r--capplets/windows/Makefile.am8
-rw-r--r--font-viewer/Makefile.am2
-rw-r--r--libwindow-settings/Makefile.am5
-rw-r--r--shell/Makefile.am7
-rw-r--r--typing-break/Makefile.am1
16 files changed, 44 insertions, 26 deletions
diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am
index 0ce7d84f..59b68313 100644
--- a/capplets/about-me/Makefile.am
+++ b/capplets/about-me/Makefile.am
@@ -40,6 +40,7 @@ $(desktop_DATA): $(Desktop_in_files)
include $(top_srcdir)/gla11y.mk
AM_CPPFLAGS = \
+ $(WARN_CFLAGS) \
$(MATECC_CAPPLETS_CFLAGS) \
$(LIBEBOOK_CFLAGS) \
-DDATADIR="\"$(datadir)\"" \
diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am
index d845ba31..3475536f 100644
--- a/capplets/accessibility/at-properties/Makefile.am
+++ b/capplets/accessibility/at-properties/Makefile.am
@@ -27,10 +27,12 @@ pixmap_DATA = \
include $(top_srcdir)/gla11y.mk
-AM_CPPFLAGS = $(AT_CAPPLET_CFLAGS) \
- $(MATECC_CAPPLETS_CFLAGS) \
- -DPIXMAPDIR=\""$(pixmapdir)"\" \
- -DMATECC_DATA_DIR="\"$(pkgdatadir)\""
+AM_CPPFLAGS = \
+ $(WARN_CFLAGS) \
+ $(AT_CAPPLET_CFLAGS) \
+ $(MATECC_CAPPLETS_CFLAGS) \
+ -DPIXMAPDIR=\""$(pixmapdir)"\" \
+ -DMATECC_DATA_DIR="\"$(pkgdatadir)\""
CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES)
EXTRA_DIST = \
$(ui_files) \
diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am
index 7b44070c..93f27c95 100644
--- a/capplets/appearance/Makefile.am
+++ b/capplets/appearance/Makefile.am
@@ -52,6 +52,7 @@ wallpaperdir = $(datadir)/mate-background-properties
backgrounddir = $(datadir)/backgrounds
AM_CPPFLAGS = \
+ $(WARN_CFLAGS) \
$(MARCO_CFLAGS) \
$(MATECC_CAPPLETS_CFLAGS) \
$(FONT_CAPPLET_CFLAGS) \
diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am
index c0e4481c..d7e5742b 100644
--- a/capplets/common/Makefile.am
+++ b/capplets/common/Makefile.am
@@ -2,19 +2,20 @@ EXTRA_DIST =
AM_CPPFLAGS = \
-DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \
- -DMATELOCALEDIR="\"$(datadir)/locale\"" \
+ -DMATELOCALEDIR="\"$(datadir)/locale\"" \
-DGTK_ENGINE_DIR="\"$(GTK_ENGINE_DIR)\"" \
-DG_LOG_DOMAIN=\"capplet-common\" \
-DINSTALL_PREFIX=\"$(prefix)\" \
-I$(top_srcdir) \
-I$(top_srcdir)/libwindow-settings \
-DPIXMAP_DIR=\""$(datadir)/mate-control-center/pixmaps"\" \
+ $(WARN_CFLAGS) \
$(CAPPLET_CFLAGS) \
$(DBUS_CFLAGS) \
$(MATE_DESKTOP_CFLAGS) \
- $(MARCO_CFLAGS) \
+ $(MARCO_CFLAGS) \
$(GSD_DBUS_CFLAGS) \
- $(GIO_CFLAGS) \
+ $(GIO_CFLAGS) \
$(DCONF_CFLAGS)
@@ -25,8 +26,8 @@ libcommon_la_SOURCES = \
activate-settings-daemon.h \
capplet-util.c \
capplet-util.h \
- dconf-util.c \
- dconf-util.h \
+ dconf-util.c \
+ dconf-util.h \
file-transfer-dialog.c \
file-transfer-dialog.h \
mate-theme-apply.c \
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index d00cd389..4468fc2a 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -29,6 +29,7 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = mate-default-applications.pc
AM_CPPFLAGS = \
+ $(WARN_CFLAGS) \
$(MATECC_CAPPLETS_CFLAGS) \
$(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \
-DAPPLICATIONSDIR=\""$(datadir)/applications"\"
diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am
index c5e92882..e6fec237 100644
--- a/capplets/display/Makefile.am
+++ b/capplets/display/Makefile.am
@@ -47,11 +47,13 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(Desktop_in_files)
$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-AM_CPPFLAGS = $(DISPLAY_CAPPLET_CFLAGS) \
- $(MATECC_CAPPLETS_CFLAGS) \
- -DSBINDIR="\"$(sbindir)\"" \
- -DMATELOCALEDIR="\"$(datadir)/locale\"" \
- -DMATECC_DATA_DIR="\"$(pkgdatadir)\""
+AM_CPPFLAGS = \
+ $(WARN_CFLAGS) \
+ $(DISPLAY_CAPPLET_CFLAGS) \
+ $(MATECC_CAPPLETS_CFLAGS) \
+ -DSBINDIR="\"$(sbindir)\"" \
+ -DMATELOCALEDIR="\"$(datadir)/locale\"" \
+ -DMATECC_DATA_DIR="\"$(pkgdatadir)\""
foo-marshal.c: foo-marshal.list
@GLIB_GENMARSHAL@ --prefix=foo_marshal $< --header > $@
diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am
index d03f0f88..29810577 100644
--- a/capplets/keybindings/Makefile.am
+++ b/capplets/keybindings/Makefile.am
@@ -38,6 +38,7 @@ mate-keybinding-properties-resources.h mate-keybinding-properties-resources.c: o
$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name keybindings $<
AM_CPPFLAGS = \
+ $(WARN_CFLAGS) \
$(MATECC_CAPPLETS_CFLAGS) \
-DMATECC_DATA_DIR="\"$(pkgdatadir)\""
CLEANFILES = \
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index 0581eee6..33a4fea3 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -40,6 +40,7 @@ mate-keyboard-properties-resources.h mate-keyboard-properties-resources.c: org.m
$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name keyboard $<
AM_CPPFLAGS = \
+ $(WARN_CFLAGS) \
$(MATECC_CAPPLETS_CFLAGS) \
$(LIBMATEKBDUI_CFLAGS) \
-DMATECC_DATA_DIR="\"$(pkgdatadir)\""
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index 8494f986..e4e72516 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -27,6 +27,7 @@ mate-mouse-properties-resources.h mate-mouse-properties-resources.c: org.mate.mc
$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name mouse $<
AM_CPPFLAGS = \
+ $(WARN_CFLAGS) \
$(MATECC_CAPPLETS_CFLAGS) \
-DMATECC_DATA_DIR="\"$(pkgdatadir)\""
CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES)
diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am
index 90abdf1a..09bf2abe 100644
--- a/capplets/network/Makefile.am
+++ b/capplets/network/Makefile.am
@@ -24,6 +24,7 @@ mate-network-properties-resources.h mate-network-properties-resources.c: org.mat
$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name network $<
AM_CPPFLAGS = \
+ $(WARN_CFLAGS) \
$(MATECC_CAPPLETS_CFLAGS)
CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES)
diff --git a/capplets/time-admin/src/Makefile.am b/capplets/time-admin/src/Makefile.am
index 95b930d8..4cdff4fa 100644
--- a/capplets/time-admin/src/Makefile.am
+++ b/capplets/time-admin/src/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = mate-time-admin
BUILT_SOURCES = mate-time-admin-resources.h mate-time-admin-resources.c
nodist_mate_time_admin_SOURCES = $(BUILT_SOURCES)
-mate_time_admin_SOURCES = \
+mate_time_admin_SOURCES = \
main.c time-map.c time-share.c time-tool.c time-zone.c \
time-map.h time-share.h time-tool.h time-zone.h
@@ -14,8 +14,9 @@ mate-time-admin-resources.h mate-time-admin-resources.c: org.mate.mcc.ta.gresour
mate_time_admin_LDADD = $(MATECC_CAPPLETS_LIBS)
mate_time_admin_LDFLAGS = -export-dynamic
-AM_CPPFLAGS = \
- $(MATECC_CAPPLETS_CFLAGS) \
+AM_CPPFLAGS = \
+ $(WARN_CFLAGS) \
+ $(MATECC_CAPPLETS_CFLAGS) \
-DTIMPZONEDIR="\"$(datadir)/mate-time-admin/map/\""
diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am
index 4c505a11..b6f5e854 100644
--- a/capplets/windows/Makefile.am
+++ b/capplets/windows/Makefile.am
@@ -22,9 +22,11 @@ mate-window-properties-resources.h mate-window-properties-resources.c: org.mate.
$(desktop_DATA): $(Desktop_in_files)
$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-AM_CPPFLAGS = $(MATECC_CAPPLETS_CFLAGS) \
- -DUIDIR=\""$(uidir)"\" \
- -DPIXMAPDIR=\""$(pixmapdir)"\"
+AM_CPPFLAGS = \
+ $(WARN_CFLAGS) \
+ $(MATECC_CAPPLETS_CFLAGS) \
+ -DUIDIR=\""$(uidir)"\" \
+ -DPIXMAPDIR=\""$(pixmapdir)"\"
CLEANFILES = $(BUILT_SOURCES) $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA)
EXTRA_DIST = $(Desktop_in_files) org.mate.mcc.windows.gresource.xml window-properties.ui
diff --git a/font-viewer/Makefile.am b/font-viewer/Makefile.am
index dad9d5ac..501c610c 100644
--- a/font-viewer/Makefile.am
+++ b/font-viewer/Makefile.am
@@ -1,5 +1,5 @@
-AM_CPPFLAGS = $(FONT_VIEWER_CFLAGS) $(MATECC_CAPPLETS_CFLAGS) -DDIRECTORY_DIR=\"$(directorydir)\" \
+AM_CPPFLAGS = $(WARN_CFLAGS) $(FONT_VIEWER_CFLAGS) $(MATECC_CAPPLETS_CFLAGS) -DDIRECTORY_DIR=\"$(directorydir)\" \
-DMATELOCALEDIR=\"$(datadir)/locale\"
bin_PROGRAMS = mate-thumbnail-font mate-font-viewer
diff --git a/libwindow-settings/Makefile.am b/libwindow-settings/Makefile.am
index f745a43b..cd9228c5 100644
--- a/libwindow-settings/Makefile.am
+++ b/libwindow-settings/Makefile.am
@@ -1,12 +1,13 @@
WM_MODULE_DIR=$(libdir)/window-manager-settings
AM_CPPFLAGS = \
- -DMATELOCALEDIR="\"$(datadir)/locale\"" \
- -DMATE_ICONDIR=\""$(datadir)/pixmaps"\" \
+ -DMATELOCALEDIR="\"$(datadir)/locale\"" \
+ -DMATE_ICONDIR=\""$(datadir)/pixmaps"\" \
-DG_LOG_DOMAIN=\"capplet-common\" \
-DMATE_WM_PROPERTY_PATH=\"$(datadir)/mate/wm-properties\" \
-DMATE_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" \
-I$(top_srcdir)/ \
+ $(WARN_CFLAGS) \
@CAPPLET_CFLAGS@ \
-DMARCO_THEME_DIR=\""$(datadir)/themes"\"
diff --git a/shell/Makefile.am b/shell/Makefile.am
index e2f81ba8..15447108 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -3,11 +3,12 @@ REAL_LIBSLAB_LIBS = $(top_builddir)/libslab/libmate-slab.la
AM_CPPFLAGS = \
-I$(top_srcdir) \
- $(REAL_LIBSLAB_CFLAGS) \
- $(MATECC_SHELL_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(REAL_LIBSLAB_CFLAGS) \
+ $(MATECC_SHELL_CFLAGS) \
-DMATELOCALEDIR="\"$(datadir)/locale\""
-bin_PROGRAMS = mate-control-center
+bin_PROGRAMS = mate-control-center
mate_control_center_SOURCES = \
control-center.c
diff --git a/typing-break/Makefile.am b/typing-break/Makefile.am
index c004f21d..8233b4c1 100644
--- a/typing-break/Makefile.am
+++ b/typing-break/Makefile.am
@@ -22,6 +22,7 @@ mate_typing_monitor_CPPFLAGS = \
mate_typing_monitor_CFLAGS = \
@TYPING_CFLAGS@ \
@MATE_DESKTOP_CFLAGS@ \
+ $(WARN_CFLAGS) \
$(AM_CFLAGS)
mate_typing_monitor_LDADD = @TYPING_LIBS@ @MATE_DESKTOP_LIBS@ @SCREENSAVER_LIBS@
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-11 11:53:25 +0000