AuroraMiddleware/libtomcrypt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

re-group demos and really build everything in 'all' target

Browse Source
This commit is contained in:
Steffen Jaeckel 2017-07-14 12:18:18 +02:00
parent 22c13b49d8
commit bffaab4eed
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefile
View File

@ -63,12 +63,6 @@ ifneq ($V,1)
endif endif
${silent} $(RANLIB) $@ ${silent} $(RANLIB) $@
timing: $(LIBNAME) $(TIMINGS)
ifneq ($V,1)
@echo " * ${CC} $@"
endif
${silent} $(CC) $(LTC_LDFLAGS) $(TIMINGS) $(LIB_PRE) $(LIBNAME) $(LIB_POST) $(EXTRALIBS) -o $(TIMING)
test: $(LIBNAME) $(TOBJECTS) test: $(LIBNAME) $(TOBJECTS)
ifneq ($V,1) ifneq ($V,1)
@echo " * ${CC} $@" @echo " * ${CC} $@"

3
makefile.shared
View File

@ -61,9 +61,6 @@ uninstall: .common_uninstall
test: $(LIBNAME) $(TOBJECTS) test: $(LIBNAME) $(TOBJECTS)
$(LT) --mode=link --tag=CC $(CC) $(LTC_CFLAGS) $(CPPFLAGS) $(LTC_LDFLAGS) -o $(TEST) $(TOBJECTS) $(LIBNAME) $(EXTRALIBS) $(LT) --mode=link --tag=CC $(CC) $(LTC_CFLAGS) $(CPPFLAGS) $(LTC_LDFLAGS) -o $(TEST) $(TOBJECTS) $(LIBNAME) $(EXTRALIBS)
timing: $(TIMINGS) $(LIBNAME)
$(LT) --mode=link --tag=CC $(CC) $(LTC_CFLAGS) $(CPPFLAGS) $(LTC_LDFLAGS) -o $(TIMING) $^ $(EXTRALIBS)
# 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)

22
makefile_include.mk
View File

@ -124,14 +124,24 @@ DOBJECTS = $(DSOURCES:.c=.o)
#List of tests headers #List of tests headers
THEADERS = $(wildcard tests/*.h) THEADERS = $(wildcard tests/*.h)
TIMING=timing
TEST=test TEST=test
USEFUL_DEMOS=hashsum # Demos that are even somehow useful and could be installed as a system-tool
UNBROKEN_DEMOS=$(USEFUL_DEMOS) ltcrypt small tv_gen sizes constants USEFUL_DEMOS = hashsum
DEMOS=$(UNBROKEN_DEMOS) openssl-enc
TIMINGS=demos/timing.o # Demos that are usable but only rarely make sense to be installed
USEABLE_DEMOS = ltcrypt sizes constants
# Demos that are used for testing or measuring
TEST_DEMOS = small timing tv_gen
# Demos that are in one config broken
# openssl-enc - can't be build with LTC_EASY
BROKEN_DEMOS = openssl-enc
# Combine demos in groups
UNBROKEN_DEMOS = $(TEST_DEMOS) $(USEABLE_DEMOS) $(USEFUL_DEMOS)
DEMOS = $(UNBROKEN_DEMOS) $(BROKEN_DEMOS)
#LIBPATH The directory for libtomcrypt to be installed to. #LIBPATH The directory for libtomcrypt to be installed to.
#INCPATH The directory to install the header files for libtomcrypt. #INCPATH The directory to install the header files for libtomcrypt.
@ -356,7 +366,7 @@ $(TOBJECTS): $(HEADERS) $(THEADERS)
bins: $(USEFUL_DEMOS) bins: $(USEFUL_DEMOS)
all: all_test all: all_test $(BROKEN_DEMOS)
all_test: test $(UNBROKEN_DEMOS) all_test: test $(UNBROKEN_DEMOS)