mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clarify usage of AM_CPPFLAGS.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mcconfig/Makefile.am
View File

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

2
lib/strutil/Makefile.am
View File

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

6
lib/tty/Makefile.am
View File

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

2
lib/vfs/Makefile.am
View File

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

2
src/consaver/Makefile.am
View File

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

2
src/vfs/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libmc-vfs.la 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 libmc_vfs_la_SOURCES = plugins_init.c plugins_init.h
SUBDIRS = local SUBDIRS = local

3
src/vfs/cpio/Makefile.am
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 noinst_LTLIBRARIES = libvfs-cpio.la

6
src/vfs/extfs/Makefile.am
View File

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

6
src/vfs/fish/Makefile.am
View File

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

3
src/vfs/ftpfs/Makefile.am
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 noinst_LTLIBRARIES = libvfs-ftpfs.la

3
src/vfs/local/Makefile.am
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 noinst_LTLIBRARIES = libvfs-local.la

3
src/vfs/sfs/Makefile.am
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 noinst_LTLIBRARIES = libvfs-sfs.la

6
src/vfs/smbfs/Makefile.am
View File

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

3
src/vfs/tar/Makefile.am
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 noinst_LTLIBRARIES = libvfs-tar.la

3
src/vfs/undelfs/Makefile.am
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 noinst_LTLIBRARIES = libvfs-undelfs.la

3
tests/lib/Makefile.am
View File

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

7
tests/lib/mcconfig/Makefile.am
View File

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

8
tests/lib/search/Makefile.am
View File

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

8
tests/lib/vfs/Makefile.am
View File

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

7
tests/src/filemanager/Makefile.am
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@ AM_LDFLAGS = @TESTS_LDFLAGS@