From 685359d4c3881acdb4f11285bd77d56a867e09c9 Mon Sep 17 00:00:00 2001 From: Yang Tse <yangsita@gmail.com> Date: Wed, 1 Jun 2011 14:43:25 +0200 Subject: [PATCH] makefile: avoid preprocessor definition usage when linking --- lib/Makefile.am | 2 +- tests/libtest/Makefile.inc | 18 +++++++++--------- tests/unit/Makefile.am | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 3d3e91c528..d3dc9af918 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -124,7 +124,7 @@ libcurl_la_LDFLAGS = $(LINKFLAGS) $(VERSIONINFO) # do it if debug is enabled if CURLDEBUG noinst_LTLIBRARIES = libcurlu.la -libcurlu_la_CFLAGS = -DUNITTESTS +libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DUNITTESTS libcurlu_la_LDFLAGS = -static $(LINKFLAGS) endif diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index d8cda570fa..98e33c1f18 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -71,19 +71,19 @@ lib524_SOURCES = lib524.c $(SUPPORTFILES) lib525_SOURCES = lib525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib526_SOURCES = lib526.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) -lib526_CFLAGS = -DLIB526 +lib526_CPPFLAGS = $(AM_CPPFLAGS) -DLIB526 lib527_SOURCES = lib526.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) -lib527_CFLAGS = -DLIB527 +lib527_CPPFLAGS = $(AM_CPPFLAGS) -DLIB527 lib529_SOURCES = lib525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) -lib529_CFLAGS = -DLIB529 +lib529_CPPFLAGS = $(AM_CPPFLAGS) -DLIB529 lib530_SOURCES = lib530.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) -lib530_CFLAGS = -DLIB530 +lib530_CPPFLAGS = $(AM_CPPFLAGS) -DLIB530 lib532_SOURCES = lib526.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) -lib532_CFLAGS = -DLIB532 +lib532_CPPFLAGS = $(AM_CPPFLAGS) -DLIB532 lib533_SOURCES = lib533.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) @@ -104,12 +104,12 @@ lib543_SOURCES = lib543.c $(SUPPORTFILES) lib544_SOURCES = lib544.c $(SUPPORTFILES) lib545_SOURCES = lib544.c $(SUPPORTFILES) -lib545_CFLAGS = -DLIB545 +lib545_CPPFLAGS = $(AM_CPPFLAGS) -DLIB545 lib547_SOURCES = lib547.c $(SUPPORTFILES) lib548_SOURCES = lib547.c $(SUPPORTFILES) -lib548_CFLAGS = -DLIB548 +lib548_CPPFLAGS = $(AM_CPPFLAGS) -DLIB548 lib549_SOURCES = lib549.c $(SUPPORTFILES) @@ -138,7 +138,7 @@ lib562_SOURCES = lib562.c $(SUPPORTFILES) lib564_SOURCES = lib564.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib565_SOURCES = lib510.c $(SUPPORTFILES) -lib565_CFLAGS = -DLIB565 +lib565_CPPFLAGS = $(AM_CPPFLAGS) -DLIB565 lib566_SOURCES = lib566.c $(SUPPORTFILES) @@ -165,4 +165,4 @@ lib582_SOURCES = lib582.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib583_SOURCES = lib583.c $(SUPPORTFILES) lib585_SOURCES = lib500.c $(SUPPORTFILES) -lib585_CFLAGS = -DLIB585 +lib585_CPPFLAGS = $(AM_CPPFLAGS) -DLIB585 diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index cdd32a5e15..c77a516d59 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -58,7 +58,7 @@ EXTRA_DIST = Makefile.inc LDADD = $(top_builddir)/lib/libcurlu.la @CURL_LIBS@ DEPENDENCIES = $(top_builddir)/lib/libcurlu.la -CFLAGS += -DUNITTESTS +AM_CPPFLAGS = -DUNITTESTS # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES, # noinst_PROGRAMS, lib*_SOURCES, and lib*_CFLAGS) -- GitLab