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

---
 open-terminal/Makefile.am | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

(limited to 'open-terminal')

diff --git a/open-terminal/Makefile.am b/open-terminal/Makefile.am
index ea3e070..f1c77fb 100644
--- a/open-terminal/Makefile.am
+++ b/open-terminal/Makefile.am
@@ -1,23 +1,34 @@
-AM_CPPFLAGS =						\
-	-DG_LOG_DOMAIN=\"Caja-Open-Terminal\"	\
-	-DDATADIR=\"$(datadir)\"			\
-	-DMATELOCALEDIR=\""$(datadir)/locale"\" 	\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	$(WARN_CFLAGS)                                  \
-	$(DISABLE_DEPRECATED_CFLAGS)			\
-	$(CAJA_CFLAGS)				\
-	$(OPENTERMINAL_CFLAGS)
+NULL =
+
+AM_CPPFLAGS =					\
+	$(DISABLE_DEPRECATED_CPPFLAGS)		\
+	-DMATELOCALEDIR=\""$(datadir)/locale"\"	\
+	-I$(top_builddir)			\
+	$(NULL)
 
-caja_extensiondir=$(CAJA_EXTENSION_DIR)
+AM_CFLAGS =					\
+	$(WARN_CFLAGS)				\
+	$(NULL)
 
-caja_extension_LTLIBRARIES=libcaja-open-terminal.la
+caja_extensiondir = $(CAJA_EXTENSION_DIR)
 
-libcaja_open_terminal_la_SOURCES = \
-	caja-open-terminal.c       \
-	caja-open-terminal.h       \
-	open-terminal.c
+caja_extension_LTLIBRARIES = libcaja-open-terminal.la
 
+libcaja_open_terminal_la_SOURCES =		\
+	caja-open-terminal.c			\
+	caja-open-terminal.h			\
+	open-terminal.c				\
+	$(NULL)
+libcaja_open_terminal_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)				\
+	-DG_LOG_DOMAIN=\"Caja-Open-Terminal\"	\
+	-DDATADIR=\"$(datadir)\"		\
+	$(NULL)
+libcaja_open_terminal_la_CFLAGS =		\
+	$(AM_CFLAGS)				\
+	$(CAJA_CFLAGS)				\
+	$(OPENTERMINAL_CFLAGS)			\
+	$(NULL)
 libcaja_open_terminal_la_LDFLAGS = -module -avoid-version
 libcaja_open_terminal_la_LIBADD  = $(CAJA_LIBS) $(OPENTERMINAL_LIBS)
 
-- 
cgit v1.2.1