From 8dac7be438512a8725d3c71e9139bdfdcac1ed8c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 6 May 2013 23:28:04 +0200 Subject: [PATCH] build: fixed unit1394 for debug and metlink builds --- src/Makefile.am | 1 + tests/unit/Makefile.inc | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 9cf1545..72e6772 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,6 +69,7 @@ curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la # if unit tests are enabled, build a static library to link them with if BUILD_UNITTESTS noinst_LTLIBRARIES = libcurltool.la +libcurltool_la_CPPFLAGS = $(LIBMETALINK_CPPFLAGS) $(AM_CPPFLAGS) libcurltool_la_CFLAGS = -DUNITTESTS libcurltool_la_LDFLAGS = -static $(LINKFLAGS) libcurltool_la_SOURCES = $(curl_SOURCES) diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc index a99b9ee..372f5e6 100644 --- a/tests/unit/Makefile.inc +++ b/tests/unit/Makefile.inc @@ -39,5 +39,7 @@ unit1330_SOURCES = unit1330.c $(UNITFILES) unit1330_CPPFLAGS = $(AM_CPPFLAGS) unit1394_SOURCES = unit1394.c $(UNITFILES) -unit1394_CPPFLAGS = $(AM_CPPFLAGS) - +unit1394_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS) +unit1394_LDADD = @LIBMETALINK_LIBS@ $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@ +unit1394_LDFLAGS = @LIBMETALINK_LDFLAGS@ $(top_builddir)/src/libcurltool.la +unit1394_LIBS = -- 1.7.10.4