瀏覽代碼

demos must now link against testprof/common.o

Steffen Jaeckel 8 年之前
父節點
當前提交
eaf20dda5b
共有 4 個文件被更改,包括 11 次插入11 次删除
  1. 2 2
      makefile
  2. 4 4
      makefile.mingw
  3. 1 1
      makefile.shared
  4. 4 4
      makefile.unix

+ 2 - 2
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))))

+ 4 - 4
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

+ 1 - 1
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

+ 4 - 4
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