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

---
 share/Makefile.am | 49 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 19 deletions(-)

(limited to 'share')

diff --git a/share/Makefile.am b/share/Makefile.am
index b81d0f2..8a257f3 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,28 +1,39 @@
+NULL =
+
 interfacesdir = $(datadir)/caja-extensions
 interfaces_DATA = share-dialog.ui
 
-libcaja_share_la_CFLAGS =				\
-	-Wall						\
-	-DG_LOG_DOMAIN=\"Caja-Share\"		\
-	-DINTERFACES_DIR=\"$(interfacesdir)\"		\
-	-DDATADIR=\"$(datadir)\"			\
-	-DMATELOCALEDIR=\""$(datadir)/locale"\" 	\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	$(WARN_CFLAGS)                                  \
-	$(DISABLE_DEPRECATED_CFLAGS)			\
-	$(CAJA_CFLAGS)				\
-	$(SHARE_CFLAGS)
+AM_CPPFLAGS =					\
+	$(DISABLE_DEPRECATED_CPPFLAGS)		\
+	-DMATELOCALEDIR=\""$(datadir)/locale"\"	\
+	-I$(top_builddir)			\
+	$(NULL)
 
-caja_extensiondir=$(CAJA_EXTENSION_DIR)
-caja_extension_LTLIBRARIES=libcaja-share.la
+AM_CFLAGS =					\
+	$(WARN_CFLAGS)				\
+	$(NULL)
 
-libcaja_share_la_SOURCES =  \
-	caja-share.c        \
-	caja-share.h	\
-	shares.c		\
-	shares.h
+caja_extensiondir = $(CAJA_EXTENSION_DIR)
 
+caja_extension_LTLIBRARIES = libcaja-share.la
+
+libcaja_share_la_SOURCES =			\
+	caja-share.c				\
+	caja-share.h				\
+	shares.c				\
+	shares.h				\
+	$(NULL)
+libcaja_share_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)				\
+	-DG_LOG_DOMAIN=\"Caja-Share\"		\
+	-DINTERFACES_DIR=\"$(interfacesdir)\"	\
+	-DDATADIR=\"$(datadir)\"		\
+	$(NULL)
+libcaja_share_la_CFLAGS =			\
+	$(AM_CFLAGS)				\
+	$(CAJA_CFLAGS)				\
+	$(SHARE_CFLAGS)				\
+	$(NULL)
 libcaja_share_la_LDFLAGS = -module -avoid-version
 libcaja_share_la_LIBADD  = $(SHARE_LIBS) $(CAJA_LIBS)
 
-- 
cgit v1.2.1