From 3d7f097f6cd12763139a307228c6f10fc86b6804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se> Date: Fri, 24 Nov 2006 17:19:38 +0100 Subject: [PATCH] New variables TS_C and TS_CXX. Setup for compiling the C++ file cxx-test.cxx. Rev: src/nettle/testsuite/Makefile.in:1.24 --- testsuite/Makefile.in | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index 0f08191c..1fb0db40 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -25,7 +25,10 @@ TS_SOURCES = aes-test.c arcfour-test.c arctwo-test.c \ rsa-test.c rsa-encrypt-test.c rsa-keygen-test.c \ dsa-test.c dsa-keygen-test.c \ yarrow-test.c -TARGETS = $(TS_SOURCES:.c=$(EXEEXT)) + +TS_C = $(TS_SOURCES:.c=$(EXEEXT)) +TS_CXX = @CXX_TESTS@ +TARGETS = $(TS_C) $(TS_CXX) TS_SH = sexp-conv-test pkcs1-conv-test symbols-test TS_ALL = $(TARGETS) $(TS_SH) EXTRA_SOURCES = sha1-huge-test.c @@ -33,7 +36,7 @@ EXTRA_TARGETS = $(EXTRA_SOURCES:.c=$(EXEEXT)) SOURCES = $(TS_SOURCES) testutils.c -DISTFILES = $(SOURCES) $(EXTRA_SOURCES) Makefile.in .test-rules.make \ +DISTFILES = $(SOURCES) $(EXTRA_SOURCES) cxx-test.cxx Makefile.in .test-rules.make \ $(TS_SH) run-tests teardown-env \ rfc1750.txt testutils.h @@ -42,6 +45,10 @@ all: $(TARGETS) $(EXTRA_TARGETS) .c.$(OBJEXT): $(COMPILE) -c $< && $(DEP_PROCESS) +.SUFFIXES: .cxx +.cxx.$(OBJEXT): + $(COMPILE_CXX) -c $< && $(DEP_PROCESS) + # BSD (and Solaris) make doesn't allow extra dependencies together one # single-suffix rules, which makes it impossible or almost impossible # to use suffix rules to build the test executables. So we use an @@ -51,11 +58,16 @@ TEST_OBJS = testutils.$(OBJEXT) -lnettle $(LIBS) .PHONY: test-rules test-rules: - for f in $(TARGETS) $(EXTRA_TARGETS) ; do \ + (for f in $(TS_C) $(EXTRA_TARGETS) ; do \ echo $$f'$$(EXEEXT): '$$f'.$$(OBJEXT)' ; \ echo ' $$(LINK) '$$f'.$$(OBJEXT) $$(TEST_OBJS) -o '$$f'$$(EXEEXT)' ; \ echo ; \ - done > $(srcdir)/.test-rules.make + done ; \ + for f in $(TS_CXX) ; do \ + echo $$f'$$(EXEEXT): '$$f'.$$(OBJEXT)' ; \ + echo ' $$(LINK_CXX) '$$f'.$$(OBJEXT) $$(TEST_OBJS) -o '$$f'$$(EXEEXT)' ; \ + echo ; \ + done) > $(srcdir)/.test-rules.make include $(srcdir)/.test-rules.make -- GitLab