diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-01-03 22:16:16 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-01-03 22:16:16 +0100 |
| commit | 53640a3ce09a433a92d88d864b2b062b0a684c59 (patch) | |
| tree | 229497c12f421c305de56da0a6c75f04169bc089 | |
| parent | 35e1d6538a8767526b9cae66134441b146503a21 (diff) | |
unittesting: build a separate static lib
When configure --enable-debug has been used, all files in lib/ are now
built twice and a separate static library crafted for unit-testing will
be linked. The unit tests in the tests/unit subdir will use that
library.
| -rw-r--r-- | lib/Makefile.am | 17 | ||||
| -rw-r--r-- | tests/unit/Makefile.am | 13 |
2 files changed, 25 insertions, 5 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 4a35c72c6..0c7497f62 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -46,7 +46,7 @@ lib_LTLIBRARIES = libcurl.la LIBCURL_LIBS = @LIBCURL_LIBS@ # This might hold -Werror -CFLAGS += @CURL_CFLAG_EXTRAS@ +libcurl_la_CFLAGS = $(CFLAGS) @CURL_CFLAG_EXTRAS@ # Specify our include paths here, and do it relative to $(top_srcdir) and # $(top_builddir), to ensure that these paths which belong to the library @@ -116,12 +116,23 @@ if MIMPURE MIMPURE = -mimpure-text endif -libcurl_la_LDFLAGS = $(UNDEF) $(VERSIONINFO) $(MIMPURE) $(LIBCURL_LIBS) +LINKFLAGS=$(UNDEF) $(MIMPURE) $(LIBCURL_LIBS) + +libcurl_la_LDFLAGS = $(LINKFLAGS) $(VERSIONINFO) + +# as unit testing will compile and link everything an extra time, we only +# do it if debug is enabled +if CURLDEBUG +noinst_LTLIBRARIES = libcurlu.la +libcurlu_la_CFLAGS = -DUNITTESTS +libcurlu_la_LDFLAGS = -static $(LINKFLAGS) +endif # Makefile.inc provides the CSOURCES and HHEADERS defines include Makefile.inc libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS) +libcurlu_la_SOURCES = $(CSOURCES) $(HHEADERS) WIN32SOURCES = $(CSOURCES) WIN32HEADERS = $(HHEADERS) config-win32.h diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 69792283f..501ddebe0 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -52,11 +52,13 @@ INCLUDES = -I$(top_builddir)/include/curl \ -I$(top_srcdir)/tests/libtest endif +if CURLDEBUG + EXTRA_DIST = Makefile.inc -LDADD = $(top_srcdir)/tests/libtest/first.o $(top_builddir)/lib/libcurl.la \ +LDADD = $(top_srcdir)/tests/libtest/first.o $(top_builddir)/lib/libcurlu.la \ @CURL_LIBS@ -DEPENDENCIES = $(top_builddir)/lib/libcurl.la +DEPENDENCIES = $(top_builddir)/lib/libcurlu.la # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES, # noinst_PROGRAMS, lib*_SOURCES, and lib*_CFLAGS) @@ -66,3 +68,10 @@ if NO_UNDEFINED # The -no-undefined flag is crucial to build fine on some platforms UNDEF = -no-undefined endif + + +else +# do nothing if debug was not enabled +all: + +endif
\ No newline at end of file |