From 0d372c1a0ae345d8ebbc69c52e9d55165e766109 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Mon, 27 Jan 2020 12:53:27 +0100
Subject: automake: do not include CFLAGS in CPPFLAGS

---
 sendto/plugins/removable-devices/Makefile.am       | 35 ++++++++++++++--------
 .../plugins/removable-devices/removable-devices.c  |  2 +-
 2 files changed, 24 insertions(+), 13 deletions(-)

(limited to 'sendto/plugins/removable-devices')

diff --git a/sendto/plugins/removable-devices/Makefile.am b/sendto/plugins/removable-devices/Makefile.am
index 797353b..6aa8928 100644
--- a/sendto/plugins/removable-devices/Makefile.am
+++ b/sendto/plugins/removable-devices/Makefile.am
@@ -1,19 +1,30 @@
-plugindir = $(libdir)/caja-sendto/plugins
+NULL =
+
+AM_CPPFLAGS =					\
+	$(DISABLE_DEPRECATED_CPPFLAGS)		\
+	-DMATELOCALEDIR=\""$(datadir)/locale"\"	\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)/sendto			\
+	$(NULL)
 
-AM_CPPFLAGS =                                      \
-        -DDATADIR=\"$(datadir)\"                \
-        -DICONDIR=\"$(icondir)\"                \
-	-DLOCALEDIR="\"$(datadir)/locale\""	\
-        -I$(top_srcdir)/sendto                  \
-        -I$(top_builddir)                       \
-        -I$(srcdir)/../				\
-        $(SENDTO_CFLAGS)               \
-        $(DISABLE_DEPRECATED)			\
-	$(WARN_CFLAGS)
+AM_CFLAGS =					\
+	$(WARN_CFLAGS)				\
+	$(SENDTO_CFLAGS)			\
+	$(NULL)
+
+plugindir = $(libdir)/caja-sendto/plugins
 
 plugin_LTLIBRARIES = libnstremovable_devices.la
 
 libnstremovable_devices_la_SOURCES = removable-devices.c
+libnstremovable_devices_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)				\
+	-DDATADIR=\"$(datadir)\"		\
+	-DICONDIR=\"$(icondir)\"		\
+	-I$(srcdir)/../ 			\
+	$(NULL)
+libnstremovable_devices_la_CFLAGS =		\
+	$(AM_CFLAGS)				\
+	$(NULL)
 libnstremovable_devices_la_LDFLAGS = -module -avoid-version
 libnstremovable_devices_la_LIBADD = $(GIO_LIBS) $(SENDTO_LIBS) $(builddir)/../libnstcommon.la
-
diff --git a/sendto/plugins/removable-devices/removable-devices.c b/sendto/plugins/removable-devices/removable-devices.c
index 0ecea14..f8f1445 100644
--- a/sendto/plugins/removable-devices/removable-devices.c
+++ b/sendto/plugins/removable-devices/removable-devices.c
@@ -147,7 +147,7 @@ init (NstPlugin *plugin)
 {
 	g_print ("Init removable-devices plugin\n");
 
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
 	vol_monitor = g_volume_monitor_get ();
-- 
cgit v1.2.1