From: Joel Rosdahl Date: Sat, 29 Aug 2015 16:15:36 +0000 (+0200) Subject: Remove unnecessary extra_cppflags, extra_ldflags and all_ldflags variables X-Git-Tag: v3.2.4~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a458a8e5e94859615376265548bf4c93d1f246c9;p=thirdparty%2Fccache.git Remove unnecessary extra_cppflags, extra_ldflags and all_ldflags variables --- diff --git a/Makefile.in b/Makefile.in index d3621cd66..30beb2bfd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,8 +19,7 @@ LIBS = @LIBS@ RANLIB = @RANLIB@ all_cflags = $(CFLAGS) -all_cppflags = @DEFS@ @extra_cppflags@ -DSYSCONFDIR=$(sysconfdir) -I. -I$(srcdir) $(CPPFLAGS) -all_ldflags = $(LDFLAGS) @extra_ldflags@ +all_cppflags = @DEFS@ -DSYSCONFDIR=$(sysconfdir) -I. -I$(srcdir) $(CPPFLAGS) extra_libs = @extra_libs@ base_sources = \ @@ -53,7 +52,7 @@ files_to_distclean = Makefile config.h config.log config.status all: ccache$(EXEEXT) ccache$(EXEEXT): $(ccache_objs) $(extra_libs) - $(CC) $(all_cflags) -o $@ $(ccache_objs) $(all_ldflags) $(extra_libs) $(LIBS) + $(CC) $(all_cflags) -o $@ $(ccache_objs) $(LDFLAGS) $(extra_libs) $(LIBS) .PHONY: install install: all @@ -88,7 +87,7 @@ quicktest: test/main$(EXEEXT) test/main$(EXEEXT) test/main$(EXEEXT): $(base_objs) $(test_objs) $(extra_libs) - $(CC) $(all_cflags) -o $@ $(base_objs) $(test_objs) $(all_ldflags) $(extra_libs) $(LIBS) + $(CC) $(all_cflags) -o $@ $(base_objs) $(test_objs) $(LDFLAGS) $(extra_libs) $(LIBS) test/main.o: test/suites.h diff --git a/configure.ac b/configure.ac index 9e6558894..0be44a40b 100644 --- a/configure.ac +++ b/configure.ac @@ -16,8 +16,6 @@ case $host in ;; esac -AC_SUBST(extra_cppflags) -AC_SUBST(extra_ldflags) AC_SUBST(extra_libs) AC_SUBST(include_dev_mk) AC_SUBST(test_suites) @@ -115,17 +113,16 @@ else fi if test x${use_bundled_zlib} = xyes; then - extra_cppflags="-I\$(srcdir)/zlib" - extra_ldflags="-Lzlib" + CPPFLAGS="$CPPFLAGS -I\$(srcdir)/zlib" extra_libs="zlib/libz.a" mkdir -p zlib else - extra_ldflags="-lz" + LIBS="$LIBS -lz" fi dnl Linking on Windows needs ws2_32 if test x${windows_os} = xyes; then - extra_ldflags="$extra_ldflags -lws2_32" + LIBS="$LIBS -lws2_32" fi AC_C_BIGENDIAN