Clarify AM_CPPFLAGS.

Signed-off-by: Andrew Borodin <[email protected]>
ssvb · Mar 4, 2016 · c4258d4 · c4258d4
1 parent be158fa
commit c4258d4
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 13 deletions.
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -52,7 +52,7 @@ if CHARSET
 libmc_la_SOURCES += charsets.c charsets.h
 endif
 
-AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CPPFLAGS)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 libmc_la_LIBADD = \
 	event/libmcevent.la \

diff --git a/lib/event/Makefile.am b/lib/event/Makefile.am
@@ -7,4 +7,4 @@ libmcevent_la_SOURCES = \
 	manage.c \
 	raise.c
 
-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS)
diff --git a/lib/skin/Makefile.am b/lib/skin/Makefile.am
@@ -9,4 +9,4 @@ libmcskin_la_SOURCES = \
 	lines.c \
 	internal.h
 
-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS)
diff --git a/lib/widget/Makefile.am b/lib/widget/Makefile.am
@@ -22,4 +22,4 @@ libmcwidget_la_SOURCES = \
 	widget-common.c widget-common.h \
 	wtools.c wtools.h
 
-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -26,7 +26,7 @@ SUBDIRS += consaver
 AM_CPPFLAGS += -DSAVERDIR=\""$(pkglibexecdir)"\"
 endif
 
-AM_CPPFLAGS += -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS)
+AM_CPPFLAGS += -I$(top_srcdir) $(GLIB_CFLAGS)
 
 localedir = $(datadir)/locale
 pkglibexecdir = $(libexecdir)/@PACKAGE@

diff --git a/src/subshell/Makefile.am b/src/subshell/Makefile.am
@@ -6,4 +6,4 @@ libsubshell_la_SOURCES = \
 	proxyfunc.c \
 	subshell.h
 
-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS)
diff --git a/src/vfs/sftpfs/Makefile.am b/src/vfs/sftpfs/Makefile.am
@@ -1,5 +1,5 @@
 
-AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(LIBSSH_CFLAGS)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(LIBSSH_CFLAGS) $(PCRE_CPPFLAGS)
 
 noinst_LTLIBRARIES = libvfs-sftpfs.la
 

diff --git a/tests/lib/search/Makefile.am b/tests/lib/search/Makefile.am
@@ -4,9 +4,10 @@ AM_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib/search \
-	@CHECK_CFLAGS@
+	@CHECK_CFLAGS@ \
+	@PCRE_CPPFLAGS@
 
-LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la
+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la @PCRE_LIBS@
 
 TESTS = \
 	glob_prepare_replace_str \

diff --git a/tests/src/editor/Makefile.am b/tests/src/editor/Makefile.am
@@ -4,13 +4,15 @@ AM_CPPFLAGS = \
 	-DTEST_SHARE_DIR=\"$(abs_srcdir)\" \
 	$(GLIB_CFLAGS) \
 	-I$(top_srcdir) \
-	@CHECK_CFLAGS@
+	@CHECK_CFLAGS@ \
+	@PCRE_CPPFLAGS@
 
 AM_LDFLAGS = @TESTS_LDFLAGS@
 
 LIBS=@CHECK_LIBS@  \
 	$(top_builddir)/src/libinternal.la \
-	$(top_builddir)/lib/libmc.la
+	$(top_builddir)/lib/libmc.la \
+	@PCRE_LIBS@
 
 if ENABLE_VFS_SMB
 # this is a hack for linking with own samba library in simple way

diff --git a/tests/src/filemanager/Makefile.am b/tests/src/filemanager/Makefile.am
@@ -5,13 +5,15 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib/vfs \
 	-DTEST_SHARE_DIR=\"$(abs_srcdir)\" \
-	@CHECK_CFLAGS@
+	@CHECK_CFLAGS@ \
+	@PCRE_CPPFLAGS@
 
 AM_LDFLAGS = @TESTS_LDFLAGS@
 
 LIBS=@CHECK_LIBS@  \
 	$(top_builddir)/src/libinternal.la \
-	$(top_builddir)/lib/libmc.la
+	$(top_builddir)/lib/libmc.la \
+	@PCRE_LIBS@
 
 if ENABLE_VFS_SMB
 # this is a hack for linking with own samba library in simple way