summaryrefslogtreecommitdiff
path: root/capplets
diff options
context:
space:
mode:
authorrbuj <[email protected]>2019-06-21 12:05:57 +0200
committerRobert Antoni Buj Gelonch <[email protected]>2019-06-22 10:06:37 +0200
commit134c44845eb1ba8632f5f8ea8154d25effd6683b (patch)
tree322997ac1c3aa648f00fcdc3c592c5b20e052d78 /capplets
parentebaa08f8c963e189a28e0dba9ad36292395b3887 (diff)
downloadmate-control-center-134c44845eb1ba8632f5f8ea8154d25effd6683b.tar.bz2
mate-control-center-134c44845eb1ba8632f5f8ea8154d25effd6683b.tar.xz
capplets: Remove the macro MATELOCALEDIR where it's not required
Diffstat (limited to 'capplets')
-rw-r--r--capplets/accessibility/at-properties/Makefile.am3
-rw-r--r--capplets/appearance/Makefile.am1
-rw-r--r--capplets/default-applications/Makefile.am3
-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.am3
-rw-r--r--capplets/time-admin/src/Makefile.am1
-rw-r--r--capplets/windows/Makefile.am1
9 files changed, 3 insertions, 12 deletions
diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am
index 62b1ed5a..ea710733 100644
--- a/capplets/accessibility/at-properties/Makefile.am
+++ b/capplets/accessibility/at-properties/Makefile.am
@@ -27,8 +27,7 @@ include $(top_srcdir)/gla11y.mk
AM_CPPFLAGS = $(AT_CAPPLET_CFLAGS) \
$(MATECC_CAPPLETS_CFLAGS) \
-DPIXMAPDIR=\""$(pixmapdir)"\" \
- -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \
- -DMATELOCALEDIR="\"$(datadir)/locale\""
+ -DMATECC_DATA_DIR="\"$(pkgdatadir)\""
CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT)
EXTRA_DIST = \
$(ui_files) \
diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am
index 7ae3edd1..5e62573a 100644
--- a/capplets/appearance/Makefile.am
+++ b/capplets/appearance/Makefile.am
@@ -54,7 +54,6 @@ AM_CPPFLAGS = \
$(MARCO_CFLAGS) \
$(MATECC_CAPPLETS_CFLAGS) \
$(FONT_CAPPLET_CFLAGS) \
- -DMATELOCALEDIR="\"$(datadir)/locale\"" \
-DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DMATECC_PIXMAP_DIR="\"$(pixmapdir)\"" \
-DWALLPAPER_DATADIR="\"$(wallpaperdir)\""
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index 4adbc4fc..efeb778e 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -31,8 +31,7 @@ pkgconfig_DATA = mate-default-applications.pc
AM_CPPFLAGS = \
$(MATECC_CAPPLETS_CFLAGS) \
$(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \
- -DAPPLICATIONSDIR=\""$(datadir)/applications"\"\
- -DMATELOCALEDIR=\""$(datadir)/locale"\"
+ -DAPPLICATIONSDIR=\""$(datadir)/applications"\"
mate-default-applications-properties-resources.h mate-default-applications-properties-resources.c: org.mate.mcc.da.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.da.gresource.xml)
$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name default_applications $<
diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am
index 2b86f75f..48d8435b 100644
--- a/capplets/keybindings/Makefile.am
+++ b/capplets/keybindings/Makefile.am
@@ -38,7 +38,6 @@ mate-keybinding-properties-resources.h mate-keybinding-properties-resources.c: o
AM_CPPFLAGS = \
$(MATECC_CAPPLETS_CFLAGS) \
- -DMATELOCALEDIR="\"$(datadir)/locale\"" \
-DMATECC_DATA_DIR="\"$(pkgdatadir)\""
CLEANFILES = \
$(BUILT_SOURCES) \
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index a46996d8..7a9858ad 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -41,7 +41,6 @@ mate-keyboard-properties-resources.h mate-keyboard-properties-resources.c: org.m
AM_CPPFLAGS = \
$(MATECC_CAPPLETS_CFLAGS) \
$(LIBMATEKBDUI_CFLAGS) \
- -DMATELOCALEDIR="\"$(datadir)/locale\"" \
-DMATECC_DATA_DIR="\"$(pkgdatadir)\""
CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES)
EXTRA_DIST = \
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index 3a306933..7a3bb4b1 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -27,7 +27,6 @@ mate-mouse-properties-resources.h mate-mouse-properties-resources.c: org.mate.mc
AM_CPPFLAGS = \
$(MATECC_CAPPLETS_CFLAGS) \
- -DMATELOCALEDIR="\"$(datadir)/locale\"" \
-DMATECC_DATA_DIR="\"$(pkgdatadir)\""
CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT)
EXTRA_DIST = \
diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am
index 65b7c6ec..17616ece 100644
--- a/capplets/network/Makefile.am
+++ b/capplets/network/Makefile.am
@@ -23,8 +23,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 = \
- $(MATECC_CAPPLETS_CFLAGS) \
- -DMATELOCALEDIR="\"$(datadir)/locale\""
+ $(MATECC_CAPPLETS_CFLAGS)
CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT)
EXTRA_DIST = $(ui_files) $(desktop_in_files) org.mate.mcc.network.gresource.xml ui-a11y.suppr
diff --git a/capplets/time-admin/src/Makefile.am b/capplets/time-admin/src/Makefile.am
index 6f62b22c..4bf47c9e 100644
--- a/capplets/time-admin/src/Makefile.am
+++ b/capplets/time-admin/src/Makefile.am
@@ -12,7 +12,6 @@ mate_time_admin_LDFLAGS = -export-dynamic
AM_CPPFLAGS = \
$(MATECC_CAPPLETS_CFLAGS) \
-DDATADIR="\"$(datadir)/mate-time-admin/icon/\"" \
- -DMATELOCALEDIR="\"$(datadir)/locale\""\
-DTIMPZONEDIR="\"$(datadir)/mate-time-admin/map/\""
diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am
index cf1b9307..63f75fbb 100644
--- a/capplets/windows/Makefile.am
+++ b/capplets/windows/Makefile.am
@@ -18,7 +18,6 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
AM_CPPFLAGS = $(MATECC_CAPPLETS_CFLAGS) \
-DUIDIR=\""$(uidir)"\" \
- -DMATELOCALEDIR="\"$(datadir)/locale\"" \
-DPIXMAPDIR=\""$(pixmapdir)"\"
CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA)