tuning makefiles - mingw, msvc, cygwin

This commit is contained in:
Karel Miko 2017-06-07 20:14:27 +02:00 committed by Steffen Jaeckel
parent b51a3f6dab
commit 7aaa423004
3 changed files with 25 additions and 27 deletions

View File

@ -187,7 +187,7 @@ src/stream/chacha/chacha_keystream.o src/stream/chacha/chacha_setup.o src/stream
src/stream/rc4/rc4.o src/stream/rc4/rc4_test.o src/stream/sober128/sober128.o \
src/stream/sober128/sober128_test.o
#List of test objects to compile (all goes to libtomcrypt_prof.a)
#List of test objects to compile
TOBJECTS=tests/base64_test.o tests/cipher_hash_test.o tests/common.o tests/der_tests.o tests/dh_test.o \
tests/dsa_test.o tests/ecc_test.o tests/file_test.o tests/katja_test.o tests/mac_test.o tests/misc_test.o \
tests/modes_test.o tests/multi_test.o tests/no_prng.o tests/pkcs_1_eme_test.o tests/pkcs_1_emsa_test.o \
@ -235,19 +235,18 @@ $(LIBMAIN_D) $(LIBMAIN_I): $(OBJECTS)
$(STRIP) -S $(LIBMAIN_D)
#Demo tools/utilities
hashsum: demos/hashsum.o tests/common.o $(LIBMAIN_S)
hashsum.exe: demos/hashsum.o tests/common.o $(LIBMAIN_S)
$(CC) $? $(LTC_LDFLAGS) -o $@
crypt: demos/crypt.o tests/common.o $(LIBMAIN_S)
ltcrypt.exe: demos/ltcrypt.o tests/common.o $(LIBMAIN_S)
$(CC) $? $(LTC_LDFLAGS) -o $@
small: demos/small.o tests/common.o $(LIBMAIN_S)
small.exe: demos/small.o tests/common.o $(LIBMAIN_S)
$(CC) $? $(LTC_LDFLAGS) -o $@
tv_gen: demos/tv_gen.o tests/common.o $(LIBMAIN_S)
tv_gen.exe: demos/tv_gen.o tests/common.o $(LIBMAIN_S)
$(CC) $? $(LTC_LDFLAGS) -o $@
timing.exe: demos/timing.o tests/common.o $(LIBMAIN_S)
$(CC) $? $(LTC_LDFLAGS) -o $@
#Tests + timing tests
timing.exe: demos/timing.o tests/common.o $(LIBMAIN_S)
$(CC) demos/timing.o tests/common.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
@echo NOTICE: start the tests by: timing.exe
#Tests
test.exe: $(TOBJECTS) $(LIBMAIN_S)
$(CC) $(TOBJECTS) $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
@echo NOTICE: start the tests by: test.exe
@ -257,8 +256,8 @@ all: $(LIBMAIN_S) $(LIBMAIN_I) $(LIBMAIN_D) hashsum.exe ltcrypt.exe small.exe tv
test: test.exe
clean:
@cmd /c del /Q *_tv.txt 2>nul
@cmd /c del /Q /S *.o *.a *.exe *.dll 2>nul
@-cmd /c del /Q *_tv.txt 2>nul
@-cmd /c del /Q /S *.o *.a *.exe *.dll 2>nul
#Install the library + headers
install: $(LIBMAIN_S) $(LIBMAIN_I) $(LIBMAIN_D)

View File

@ -180,7 +180,7 @@ src/stream/chacha/chacha_keystream.obj src/stream/chacha/chacha_setup.obj src/st
src/stream/rc4/rc4.obj src/stream/rc4/rc4_test.obj src/stream/sober128/sober128.obj \
src/stream/sober128/sober128_test.obj
#List of test objects to compile (all goes to tomcrypt_prof.lib)
#List of test objects to compile
TOBJECTS=tests/base64_test.obj tests/cipher_hash_test.obj tests/common.obj tests/der_tests.obj tests/dh_test.obj \
tests/dsa_test.obj tests/ecc_test.obj tests/file_test.obj tests/katja_test.obj tests/mac_test.obj tests/misc_test.obj \
tests/modes_test.obj tests/multi_test.obj tests/no_prng.obj tests/pkcs_1_eme_test.obj tests/pkcs_1_emsa_test.obj \
@ -222,28 +222,28 @@ $(LIBMAIN_S): $(OBJECTS)
lib /out:$(LIBMAIN_S) $(OBJECTS)
#Demo tools/utilities
hashsum.exe: demos/hashsum.c $(LIBMAIN_S)
cl $(LTC_CFLAGS) demos/hashsum.c $(LIBMAIN_S) $(LTC_LDFLAGS)
hashsum.exe: demos/hashsum.c tests/common.c $(LIBMAIN_S)
cl $(LTC_CFLAGS) demos/hashsum.c tests/common.c $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
ltcrypt.exe: demos/ltcrypt.c $(LIBMAIN_S)
cl $(LTC_CFLAGS) demos/ltcrypt.c $(LIBMAIN_S) $(LTC_LDFLAGS)
cl $(LTC_CFLAGS) demos/ltcrypt.c tests/common.c $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
small.exe: demos/small.c $(LIBMAIN_S)
cl $(LTC_CFLAGS) demos/small.c $(LIBMAIN_S) $(LTC_LDFLAGS)
cl $(LTC_CFLAGS) demos/small.c tests/common.c $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
tv_gen.exe: demos/tv_gen.c $(LIBMAIN_S)
cl $(LTC_CFLAGS) demos/tv_gen.c $(LIBMAIN_S) $(LTC_LDFLAGS)
#Tests + timing tests
cl $(LTC_CFLAGS) demos/tv_gen.c tests/common.c $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
timing.exe: demos/timing.c $(LIBMAIN_S)
cl $(LTC_CFLAGS) demos/timing.c $(LIBMAIN_S) $(LTC_LDFLAGS)
cl $(LTC_CFLAGS) demos/timing.c tests/common.c $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
#Tests
test.exe: $(LIBMAIN_S) $(TOBJECTS)
cl $(LTC_CFLAGS) $(TOBJECTS) $(LIBMAIN_S) $(LTC_LDFLAGS)
cl $(LTC_CFLAGS) $(TOBJECTS) $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
all: $(LIBMAIN_S) hashsum.exe ltcrypt.exe small.exe tv_gen.exe timing.exe test.exe
test: test.exe
clean:
@cmd /c del /Q *_tv.txt 2>nul
@cmd /c del /Q /S *.OBJ *.LIB *.EXE *.DLL 2>nul
@-cmd /c del /Q *_tv.txt 2>nul
@-cmd /c del /Q /S *.OBJ *.LIB *.EXE *.DLL 2>nul
#Install the library + headers
install: $(LIBMAIN_S)

View File

@ -245,11 +245,10 @@ small: demos/small.o tests/common.o $(LIBMAIN_S)
$(CC) demos/small.o tests/common.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
tv_gen: demos/tv_gen.o tests/common.o $(LIBMAIN_S)
$(CC) demos/tv_gen.o tests/common.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
timing: demos/timing.o tests/common.o $(LIBMAIN_S)
$(CC) demos/timing.o tests/common.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
#Tests + timing tests
timing: demos/timing.o $(LIBMAIN_S) tests/common.o
$(CC) demos/timing.o $(LIBMAIN_S) tests/common.o $(LTC_LDFLAGS) -o $@
@echo "NOTICE: start the timing tests by: ./timing"
#Tests
test: $(TOBJECTS) $(LIBMAIN_S)
$(CC) $(TOBJECTS) $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
@echo "NOTICE: start the tests by: ./test"