From 10b956e4a7cbc5e5e672a7698270f82478c9f349 Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Sun, 6 Jan 2013 01:04:25 +0200 Subject: [PATCH] test/Makefile: cleanup * regtest_compat is now EXTRA target * regtest_system is built against libusual.a --- test/Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/Makefile b/test/Makefile index ed9dd50..5dc4ba0 100644 --- a/test/Makefile +++ b/test/Makefile @@ -16,22 +16,22 @@ regtest_system_SOURCES = \ test_socket.c test_getopt.c test_ctype.c test_fnmatch.c \ test_common.h tinytest.h tinytest_macros.h -regtest_compat_SOURCES := $(regtest_system_SOURCES) -nodist_regtest_compat_SOURCES = test_config.h - -regtest_compat_EMBED_LIBUSUAL = 1 -#regtest_system_EMBED_LIBUSUAL = 1 - +# build regtest_system against actual library regtest_system_LDADD = ../libusual.a -regtest_system_LDFLAGS = #-pthread - +regtest_system_LDFLAGS = regtest_system_CPPFLAGS = -I.. -I. -regtest_compat_CPPFLAGS := $(regtest_system_CPPFLAGS) -DUSUAL_TEST_CONFIG -regtest_compat_LDFLAGS = #-pthread + +# build regtest_compat as embedded project +regtest_compat_EMBED_LIBUSUAL = 1 +regtest_compat_CPPFLAGS := -I.. -I. -DUSUAL_TEST_CONFIG +regtest_compat_LDFLAGS = +regtest_compat_SOURCES := $(regtest_system_SOURCES) +nodist_regtest_compat_SOURCES = test_config.h EXTRA_DIST = Makefile tinytest_demo.c force_compat.sed test_cfparser.ini -noinst_PROGRAMS = regtest_system regtest_compat +noinst_PROGRAMS = regtest_system +EXTRA_PROGRAMS = regtest_compat include ../build.mk -- 2.39.5