optimize Makefile and usage example (wip)

This commit is contained in:
Manuel Domke
2018-04-22 00:57:22 +02:00
parent 3e04d09937
commit addb720996
2 changed files with 15 additions and 17 deletions

View File

@@ -2,7 +2,7 @@ GIT_VERSION := $(shell git --no-pager describe --tags --always)
GIT_COMMIT := $(shell git rev-parse --verify HEAD)
GIT_DATE := $(firstword $(shell git --no-pager show --date=iso-strict --format="%ad" --name-only))
PREFIX = $(DESTDIR)/usr/local
PREFIX = $(DESTDIR)/usr/local ODIR=obj
CFLAGS = -Wall -Wextra -Werror -std=c99 -O3 -fPIC -I Keccak -I /usr/include/libftdi1 \
-DGIT_VERSION=\"$(GIT_VERSION)\"\
@@ -10,26 +10,24 @@ CFLAGS = -Wall -Wextra -Werror -std=c99 -O3 -fPIC -I Keccak -I /usr/include/libf
-DGIT_DATE=\"$(GIT_DATE)\"\
LDFLAGS= -shared
ODIR=obj
FTDI := $(shell libftdi-config --libs)
all: libinfnoise.a infnoise
all: libinfnoise.a libinfnoise.so infnoise
infnoise: infnoise.c infnoise.h libinfnoise.a infnoise.o daemon.o
infnoise: libinfnoise.a infnoise.o daemon.o
$(CC) $(CFLAGS) -o infnoise infnoise.o daemon.o libinfnoise.a $(FTDI) -lm -lrt -L. -linfnoise
infnoise.o: infnoise.c infnoise.h
$(CC) $(CFLAGS) -c infnoise.c
%.o: %.c infnoise.h libinfnoise.h
$(CC) -c -o $@ $< $(CFLAGS)
daemon.o: daemon.c
$(CC) $(CFLAGS) -c daemon.c
writeentropy.o: writeentropy.c
$(CC) $(CFLAGS) -c writeentropy.c
KeccakF-1600-reference.o: Keccak/KeccakF-1600-reference.c infnoise.h libinfnoise.h
$(CC) -c -o $@ $< $(CFLAGS)
# static lib compiled into infnoise binary
libinfnoise.o: libinfnoise.c libinfnoise.h libinfnoise_private.h healthcheck.c healthcheck.h Keccak/brg_endian.h Keccak/KeccakF-1600-reference.c
$(CC) $(CFLAGS) -c libinfnoise.c healthcheck.c
libinfnoise.o: libinfnoise.c libinfnoise.h libinfnoise_private.h healthcheck.c
$(CC) $(CFLAGS) -c libinfnoise.c
libinfnoise.a: libinfnoise.o healthcheck.o KeccakF-1600-reference.o writeentropy.o
ar rcs libinfnoise.a libinfnoise.o healthcheck.o KeccakF-1600-reference.o writeentropy.o
@@ -39,15 +37,16 @@ libinfnoise.a: libinfnoise.o healthcheck.o KeccakF-1600-reference.o writeentropy
libinfnoise.so: libinfnoise.o healthcheck.o KeccakF-1600-reference.o writeentropy.o
$(CC) $(CFLAGS) -fvisibility=hidden -o libinfnoise.so libinfnoise.o healthcheck.o KeccakF-1600-reference.o writeentropy.o -Wl,--version-script=libinfnoise.version $(FTDI) -lm -shared
KeccakF-1600-reference.o: Keccak/brg_endian.h Keccak/KeccakF-1600-reference.c
$(CC) $(CFLAGS) -c Keccak/KeccakF-1600-reference.c -lm -lrt
libs: libinfnoise.a
clean:
$(RM) infnoise *.o *.a *.gch *.so libinfnoise-example
install:
install-lib: libinfnoise.so
install -d $(PREFIX)/lib
install -m 0755 libinfnoise.so $(PREFIX)/lib
install: infnoise
install -d $(PREFIX)/sbin
install -m 0755 infnoise $(PREFIX)/sbin/
install -d $(PREFIX)/lib/udev/rules.d/

View File

@@ -359,7 +359,6 @@ int main() {
// parameters for readData(..):
bool rawOutput = true;
uint32_t multiplier = 10u;
bool debug = false;
// calculate output size based on the parameters:
// when using the multiplier, we need a result array of 32*MULTIPLIER - otherwise 64(BUFLEN/8) bytes