TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

demos must now link against testprof/common.o

Browse Source
This commit is contained in:
Steffen Jaeckel 2017-05-05 15:39:39 +02:00
parent 9b8fff6260
commit eaf20dda5b
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefile
View File

@ -85,11 +85,11 @@ endif
# build the demos from a template # build the demos from a template
define DEMO_template define DEMO_template
$(1): demos/$(1).o $$(LIBNAME) $(1): demos/$(1).o $$(LIBNAME) testprof/common.o
ifneq ($V,1) ifneq ($V,1)
@echo " * $${CC} $$@" @echo " * $${CC} $$@"
endif 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 endef
$(foreach demo, $(strip $(DEMOS)), $(eval $(call DEMO_template,$(demo)))) $(foreach demo, $(strip $(DEMOS)), $(eval $(call DEMO_template,$(demo))))

8
makefile.mingw
View File

@ -241,13 +241,13 @@ $(LIBMAIN_D) $(LIBMAIN_I): $(OBJECTS)
$(STRIP) -S $(LIBMAIN_D) $(STRIP) -S $(LIBMAIN_D)
#Demo tools/utilities #Demo tools/utilities
hashsum.exe: demos/hashsum.o $(LIBMAIN_S) hashsum: demos/hashsum.o testprof/common.o $(LIBMAIN_S)
$(CC) $? $(LTC_LDFLAGS) -o $@ $(CC) $? $(LTC_LDFLAGS) -o $@
ltcrypt.exe: demos/ltcrypt.o $(LIBMAIN_S) crypt: demos/crypt.o testprof/common.o $(LIBMAIN_S)
$(CC) $? $(LTC_LDFLAGS) -o $@ $(CC) $? $(LTC_LDFLAGS) -o $@
small.exe: demos/small.o $(LIBMAIN_S) small: demos/small.o testprof/common.o $(LIBMAIN_S)
$(CC) $? $(LTC_LDFLAGS) -o $@ $(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 $@ $(CC) $? $(LTC_LDFLAGS) -o $@
#Tests + timing tests #Tests + timing tests

2
makefile.shared
View File

@ -59,7 +59,7 @@ timing: $(LIBNAME) $(LIBTEST) $(TIMINGS)
# build the demos from a template # build the demos from a template
define DEMO_template define DEMO_template
$(1): demos/$(1).o $$(LIBNAME) $(1): demos/$(1).o testprof/common.o $$(LIBNAME)
ifneq ($V,1) ifneq ($V,1)
@echo " * $${CC} $$@" @echo " * $${CC} $$@"
endif endif

8
makefile.unix
View File

@ -243,13 +243,13 @@ $(LIBMAIN_S): $(OBJECTS)
$(RANLIB) $@ $(RANLIB) $@
#Demo tools/utilities #Demo tools/utilities
hashsum: demos/hashsum.o $(LIBMAIN_S) hashsum: demos/hashsum.o testprof/common.o $(LIBMAIN_S)
$(CC) $? $(LTC_LDFLAGS) -o $@ $(CC) $? $(LTC_LDFLAGS) -o $@
ltcrypt: demos/ltcrypt.o $(LIBMAIN_S) ltcrypt: demos/ltcrypt.o testprof/common.o $(LIBMAIN_S)
$(CC) $? $(LTC_LDFLAGS) -o $@ $(CC) $? $(LTC_LDFLAGS) -o $@
small: demos/small.o $(LIBMAIN_S) small: demos/small.o testprof/common.o $(LIBMAIN_S)
$(CC) $? $(LTC_LDFLAGS) -o $@ $(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 $@ $(CC) $? $(LTC_LDFLAGS) -o $@
#Tests + timing tests #Tests + timing tests