Commit 8dac7be4 authored May 06, 2013 by Daniel Stenberg

build: fixed unit1394 for debug and metlink builds

parent bcf1b9de

src/Makefile.am

+1 −0

Original line number	Diff line number	Diff line
		@@ -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)

tests/unit/Makefile.inc

+4 −2

Original line number	Diff line number	Diff line
		@@ -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 =