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

---
 gksu/Makefile.am | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

(limited to 'gksu/Makefile.am')

diff --git a/gksu/Makefile.am b/gksu/Makefile.am
index 0ace449..93431c8 100644
--- a/gksu/Makefile.am
+++ b/gksu/Makefile.am
@@ -1,9 +1,29 @@
-AM_CFLAGS = -g -O2 -Wall
-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" $(CAJA_CFLAGS)
+NULL =
+
+AM_CPPFLAGS =					\
+	$(DISABLE_DEPRECATED_CPPFLAGS)		\
+	-DMATELOCALEDIR=\""$(datadir)/locale"\"	\
+	-I$(top_builddir)			\
+	$(NULL)
+
+AM_CFLAGS =					\
+	$(WARN_CFLAGS)				\
+	$(NULL)
+
+caja_extensiondir = $(libdir)/caja/extensions-2.0
 
-caja_extensiondir=$(libdir)/caja/extensions-2.0
 caja_extension_LTLIBRARIES = libcaja-gksu.la
+
 libcaja_gksu_la_SOURCES = libcaja-gksu.c
+libcaja_gksu_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)				\
+	-DDATA_DIR=\"$(datadir)\"		\
+	-DPREFIX=\"$(prefix)\"			\
+	$(NULL)
+libcaja_gksu_la_CFLAGS =			\
+	$(AM_CFLAGS)				\
+	$(CAJA_CFLAGS)				\
+	$(NULL)
 libcaja_gksu_la_LDFLAGS = -module -avoid-version -no-undefined
 libcaja_gksu_la_LIBADD  = $(CAJA_LIBS)
 
-- 
cgit v1.2.1