generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefile: avoid preprocessor definition usage when linking

Browse Source
This commit is contained in:
Yang Tse
2011-06-01 14:43:25 +02:00
parent a689072f33
commit 685359d4c3
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile.am
View File

@@ -124,7 +124,7 @@ libcurl_la_LDFLAGS = $(LINKFLAGS) $(VERSIONINFO)
# do it if debug is enabled # do it if debug is enabled
if CURLDEBUG if CURLDEBUG
noinst_LTLIBRARIES = libcurlu.la noinst_LTLIBRARIES = libcurlu.la
libcurlu_la_CFLAGS = -DUNITTESTS libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DUNITTESTS
libcurlu_la_LDFLAGS = -static $(LINKFLAGS) libcurlu_la_LDFLAGS = -static $(LINKFLAGS)
endif endif

18
tests/libtest/Makefile.inc
View File

@@ -71,19 +71,19 @@ lib524_SOURCES = lib524.c $(SUPPORTFILES)
lib525_SOURCES = lib525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib525_SOURCES = lib525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib526_SOURCES = lib526.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_SOURCES = lib526.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib527_CFLAGS = -DLIB527 lib527_CPPFLAGS = $(AM_CPPFLAGS) -DLIB527
lib529_SOURCES = lib525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib529_SOURCES = lib525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib529_CFLAGS = -DLIB529 lib529_CPPFLAGS = $(AM_CPPFLAGS) -DLIB529
lib530_SOURCES = lib530.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib530_SOURCES = lib530.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib530_CFLAGS = -DLIB530 lib530_CPPFLAGS = $(AM_CPPFLAGS) -DLIB530
lib532_SOURCES = lib526.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib532_SOURCES = lib526.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib532_CFLAGS = -DLIB532 lib532_CPPFLAGS = $(AM_CPPFLAGS) -DLIB532
lib533_SOURCES = lib533.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib533_SOURCES = lib533.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
@@ -104,12 +104,12 @@ lib543_SOURCES = lib543.c $(SUPPORTFILES)
lib544_SOURCES = lib544.c $(SUPPORTFILES) lib544_SOURCES = lib544.c $(SUPPORTFILES)
lib545_SOURCES = lib544.c $(SUPPORTFILES) lib545_SOURCES = lib544.c $(SUPPORTFILES)
lib545_CFLAGS = -DLIB545 lib545_CPPFLAGS = $(AM_CPPFLAGS) -DLIB545
lib547_SOURCES = lib547.c $(SUPPORTFILES) lib547_SOURCES = lib547.c $(SUPPORTFILES)
lib548_SOURCES = lib547.c $(SUPPORTFILES) lib548_SOURCES = lib547.c $(SUPPORTFILES)
lib548_CFLAGS = -DLIB548 lib548_CPPFLAGS = $(AM_CPPFLAGS) -DLIB548
lib549_SOURCES = lib549.c $(SUPPORTFILES) lib549_SOURCES = lib549.c $(SUPPORTFILES)
@@ -138,7 +138,7 @@ lib562_SOURCES = lib562.c $(SUPPORTFILES)
lib564_SOURCES = lib564.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib564_SOURCES = lib564.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib565_SOURCES = lib510.c $(SUPPORTFILES) lib565_SOURCES = lib510.c $(SUPPORTFILES)
lib565_CFLAGS = -DLIB565 lib565_CPPFLAGS = $(AM_CPPFLAGS) -DLIB565
lib566_SOURCES = lib566.c $(SUPPORTFILES) lib566_SOURCES = lib566.c $(SUPPORTFILES)
@@ -165,4 +165,4 @@ lib582_SOURCES = lib582.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib583_SOURCES = lib583.c $(SUPPORTFILES) lib583_SOURCES = lib583.c $(SUPPORTFILES)
lib585_SOURCES = lib500.c $(SUPPORTFILES) lib585_SOURCES = lib500.c $(SUPPORTFILES)
lib585_CFLAGS = -DLIB585 lib585_CPPFLAGS = $(AM_CPPFLAGS) -DLIB585

2
tests/unit/Makefile.am
View File

@@ -58,7 +58,7 @@ EXTRA_DIST = Makefile.inc
LDADD = $(top_builddir)/lib/libcurlu.la @CURL_LIBS@ LDADD = $(top_builddir)/lib/libcurlu.la @CURL_LIBS@
DEPENDENCIES = $(top_builddir)/lib/libcurlu.la DEPENDENCIES = $(top_builddir)/lib/libcurlu.la
CFLAGS += -DUNITTESTS AM_CPPFLAGS = -DUNITTESTS
# Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES, # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES,
# noinst_PROGRAMS, lib*_SOURCES, and lib*_CFLAGS) # noinst_PROGRAMS, lib*_SOURCES, and lib*_CFLAGS)