From 78c0e74df0f8388a4f4a4ae0842178cb6ab6ac92 Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Sat, 1 Jul 2006 14:43:37 +0300 Subject: [PATCH] build: Don't use $(AM_CFLAGS) anymore. Use $(CPPFLAGS) instead. $(AM_CFLAGS) is one of the variables set by Automake, which ELinks no longer uses. $(CPPFLAGS) should be used whenever the C preprocessor is run, according to the GNU Coding Standards. (My build environment does have an important -I option there.) [ From commit 40e257bedd59c35b4a54c5e85e4391383ad6bf84 in ELinks 0.12.GIT. --KON ] --- Makefile.config.in | 2 +- Makefile.lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index 17a4e02c..ad44eb87 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -161,7 +161,7 @@ LIBS = @LIBS@ INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) MAKE_COLOR = @MAKE_COLOR@ diff --git a/Makefile.lib b/Makefile.lib index b0953760..644955f0 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -51,7 +51,7 @@ quiet_cmd_ld_objs = " [$(LD_COLOR)LD$(END_COLOR)] $(RELPATH)$@" cmd_link = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) quiet_cmd_sparse = ' [SPARSE] $(RELPATH)$(2)' - cmd_sparse = $(SPARSE) $(DEFS) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) $(SPARSE_FLAGS) $(2) + cmd_sparse = $(SPARSE) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SPARSE_FLAGS) $(2) # Recursive make quiet_cmd_recmake = "[$(INFO_COLOR)MAKE $(3)$(END_COLOR)] $(RELPATH)$(2)"