Clarify usage of AM_CPPFLAGS.

Use AM_CPPFLAGS not AM_CFLAGS for includes. GLIB_CFLAGS are CPPFLAGS, actually.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2012-11-14 11:06:47 +04:00
parent d557ade7f6
commit a8030670b7
20 changed files with 60 additions and 29 deletions

View File

@ -7,4 +7,4 @@ libmcconfig_la_SOURCES = \
set.c \
paths.c
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS)

View File

@ -8,4 +8,4 @@ libmcstrutil_la_SOURCES = \
strutilutf8.c \
strverscmp.c
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS)
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)

View File

@ -22,11 +22,11 @@ TTY_SRC = \
libmctty_la_SOURCES = $(TTY_SRC) $(TTY_SCREEN_SRC)
AM_CFLAGS = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
if HAVE_GMODULE
AM_CFLAGS += $(GMODULE_CFLAGS)
AM_CPPFLAGS += $(GMODULE_CFLAGS)
else
AM_CFLAGS += $(GLIB_CFLAGS)
AM_CPPFLAGS += $(GLIB_CFLAGS)
endif

View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libmcvfs.la
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
libmcvfs_la_SOURCES = \
direntry.c \

View File

@ -4,4 +4,4 @@ pkglibexec_PROGRAMS = cons.saver
cons_saver_SOURCES = cons.saver.c
AM_CFLAGS= -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)

View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libmc-vfs.la
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
libmc_vfs_la_SOURCES = plugins_init.c plugins_init.h
SUBDIRS = local

View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
noinst_LTLIBRARIES = libvfs-cpio.la

View File

@ -1,8 +1,10 @@
SUBDIRS = helpers
DIST_SUBDIRS = helpers
AM_CPPFLAGS = -DLIBEXECDIR=\""$(libexecdir)/@PACKAGE@/"\"
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS = \
-DLIBEXECDIR=\""$(libexecdir)/@PACKAGE@/"\" \
$(GLIB_CFLAGS) \
-I$(top_srcdir)
noinst_LTLIBRARIES = libvfs-extfs.la

View File

@ -1,8 +1,10 @@
SUBDIRS = helpers
DIST_SUBDIRS = helpers
AM_CPPFLAGS = -DLIBEXECDIR=\""$(libexecdir)/@PACKAGE@/"\"
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS = \
-DLIBEXECDIR=\""$(libexecdir)/@PACKAGE@/"\" \
$(GLIB_CFLAGS) \
-I$(top_srcdir)
noinst_LTLIBRARIES = libvfs-fish.la

View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
noinst_LTLIBRARIES = libvfs-ftpfs.la

View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
noinst_LTLIBRARIES = libvfs-local.la

View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
noinst_LTLIBRARIES = libvfs-sfs.la

View File

@ -2,8 +2,10 @@ DIST_SUBDIRS =
SUBDIRS = helpers
AM_CPPFLAGS = -DCONFIGDIR=\""@smbconfigdir@"\"
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS = \
-DCONFIGDIR=\""@smbconfigdir@"\" \
$(GLIB_CFLAGS) \
-I$(top_srcdir)
noinst_LTLIBRARIES = libvfs-smbfs.la

View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
noinst_LTLIBRARIES = libvfs-tar.la

View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
noinst_LTLIBRARIES = libvfs-undelfs.la

View File

@ -1,7 +1,8 @@
SUBDIRS = . mcconfig search vfs
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@
LIBS=@CHECK_LIBS@ $(top_builddir)/lib/libmc.la
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@
LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la
TESTS = \
library_independ \

View File

@ -1,6 +1,9 @@
AM_CPPFLAGS = -DWORKDIR=\"$(abs_builddir)\"
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) @CHECK_CFLAGS@
AM_CPPFLAGS = \
-DWORKDIR=\"$(abs_builddir)\" \
$(GLIB_CFLAGS) \
-I$(top_srcdir) \
@CHECK_CFLAGS@
AM_LDFLAGS = @TESTS_LDFLAGS@

View File

@ -1,5 +1,11 @@
AM_CFLAGS = -I$(top_srcdir)/lib/search $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@
LIBS=@CHECK_LIBS@ $(top_builddir)/lib/libmc.la
AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/lib/search \
@CHECK_CFLAGS@
LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la
TESTS = \
regex_replace_esc_seq \

View File

@ -1,6 +1,10 @@
AM_CPPFLAGS = -DTEST_SHARE_DIR=\"$(abs_srcdir)\"
AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib/vfs $(GLIB_CFLAGS) @CHECK_CFLAGS@
AM_CPPFLAGS = \
-DTEST_SHARE_DIR=\"$(abs_srcdir)\" \
$(GLIB_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/lib/vfs \
@CHECK_CFLAGS@
AM_LDFLAGS = @TESTS_LDFLAGS@

View File

@ -1,4 +1,9 @@
AM_CFLAGS = -I$(top_srcdir)/lib/vfs $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@
AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/lib/vfs \
@CHECK_CFLAGS@
AM_LDFLAGS = @TESTS_LDFLAGS@