From eaf20dda5b3c4b98748dc5fe90514f10340fd0ac Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Fri, 5 May 2017 15:39:39 +0200 Subject: [PATCH] demos must now link against testprof/common.o --- makefile | 4 ++-- makefile.mingw | 8 ++++---- makefile.shared | 2 +- makefile.unix | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/makefile b/makefile index aa569a42..6bb73426 100644 --- a/makefile +++ b/makefile @@ -85,11 +85,11 @@ endif # build the demos from a template define DEMO_template -$(1): demos/$(1).o $$(LIBNAME) +$(1): demos/$(1).o $$(LIBNAME) testprof/common.o ifneq ($V,1) @echo " * $${CC} $$@" endif - $${silent} $$(CC) $$(CFLAGS) $$< $$(LIB_PRE) $$(LIBNAME) $$(LIB_POST) $$(EXTRALIBS) -o $(1) + $${silent} $$(CC) $$(CFLAGS) $$< testprof/common.o $$(LIB_PRE) $$(LIBNAME) $$(LIB_POST) $$(EXTRALIBS) -o $(1) endef $(foreach demo, $(strip $(DEMOS)), $(eval $(call DEMO_template,$(demo)))) diff --git a/makefile.mingw b/makefile.mingw index 5b1cbc27..644815eb 100644 --- a/makefile.mingw +++ b/makefile.mingw @@ -241,13 +241,13 @@ $(LIBMAIN_D) $(LIBMAIN_I): $(OBJECTS) $(STRIP) -S $(LIBMAIN_D) #Demo tools/utilities -hashsum.exe: demos/hashsum.o $(LIBMAIN_S) +hashsum: demos/hashsum.o testprof/common.o $(LIBMAIN_S) $(CC) $? $(LTC_LDFLAGS) -o $@ -ltcrypt.exe: demos/ltcrypt.o $(LIBMAIN_S) +crypt: demos/crypt.o testprof/common.o $(LIBMAIN_S) $(CC) $? $(LTC_LDFLAGS) -o $@ -small.exe: demos/small.o $(LIBMAIN_S) +small: demos/small.o testprof/common.o $(LIBMAIN_S) $(CC) $? $(LTC_LDFLAGS) -o $@ -tv_gen.exe: demos/tv_gen.o $(LIBMAIN_S) +tv_gen: demos/tv_gen.o testprof/common.o $(LIBMAIN_S) $(CC) $? $(LTC_LDFLAGS) -o $@ #Tests + timing tests diff --git a/makefile.shared b/makefile.shared index c6086985..e0eb1139 100644 --- a/makefile.shared +++ b/makefile.shared @@ -59,7 +59,7 @@ timing: $(LIBNAME) $(LIBTEST) $(TIMINGS) # build the demos from a template define DEMO_template -$(1): demos/$(1).o $$(LIBNAME) +$(1): demos/$(1).o testprof/common.o $$(LIBNAME) ifneq ($V,1) @echo " * $${CC} $$@" endif diff --git a/makefile.unix b/makefile.unix index b93315cd..0074be1d 100644 --- a/makefile.unix +++ b/makefile.unix @@ -243,13 +243,13 @@ $(LIBMAIN_S): $(OBJECTS) $(RANLIB) $@ #Demo tools/utilities -hashsum: demos/hashsum.o $(LIBMAIN_S) +hashsum: demos/hashsum.o testprof/common.o $(LIBMAIN_S) $(CC) $? $(LTC_LDFLAGS) -o $@ -ltcrypt: demos/ltcrypt.o $(LIBMAIN_S) +ltcrypt: demos/ltcrypt.o testprof/common.o $(LIBMAIN_S) $(CC) $? $(LTC_LDFLAGS) -o $@ -small: demos/small.o $(LIBMAIN_S) +small: demos/small.o testprof/common.o $(LIBMAIN_S) $(CC) $? $(LTC_LDFLAGS) -o $@ -tv_gen: demos/tv_gen.o $(LIBMAIN_S) +tv_gen: demos/tv_gen.o testprof/common.o $(LIBMAIN_S) $(CC) $? $(LTC_LDFLAGS) -o $@ #Tests + timing tests