diff options
| author | J08nY | 2021-04-10 14:09:59 +0200 |
|---|---|---|
| committer | J08nY | 2021-04-10 15:00:08 +0200 |
| commit | 7e3be900daaae1586ac4a53192dfc7bcc18da34e (patch) | |
| tree | a6c85251b4e41d640e6cd2c0abbcbb7ebefd79cf /lib | |
| parent | d42684b09fe10f74efbdf190e75fec2d50de96b2 (diff) | |
| download | ecgen-7e3be900daaae1586ac4a53192dfc7bcc18da34e.tar.gz ecgen-7e3be900daaae1586ac4a53192dfc7bcc18da34e.tar.zst ecgen-7e3be900daaae1586ac4a53192dfc7bcc18da34e.zip | |
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 13 | ||||
| -rw-r--r-- | lib/parson/Makefile | 6 | ||||
| -rw-r--r-- | lib/sha1/Makefile | 6 |
3 files changed, 10 insertions, 15 deletions
diff --git a/lib/Makefile b/lib/Makefile index ff4ddd5..10a06a1 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,21 +1,20 @@ CC ?= gcc -CFLAGS = -Wall DEBUG ?= 0 TEST ?= 0 FAST ?= 0 ifeq ($(DEBUG), 1) - CFLAGS += -DDEBUG -g -Og -Werror -pedantic + ECGEN_CFLAGS = -DDEBUG -g -Og -Werror -pedantic else ifeq ($(TEST), 1) - CFLAGS += -DNDEBUG --coverage -g -O0 + ECGEN_CFLAGS = -DNDEBUG --coverage -g -O0 else ifeq ($(FAST), 1) ifeq ($(CC), gcc) - CFLAGS += -DNDEBUG -O3 -march=native -pipe + ECGEN_CFLAGS = -DNDEBUG -O3 -march=native -pipe else - CFLAGS += -DNDEBUG -O3 + ECGEN_CFLAGS = -DNDEBUG -O3 endif else - CFLAGS += -DNDEBUG -O2 + ECGEN_CFLAGS = -DNDEBUG -O2 endif export @@ -25,4 +24,4 @@ all: clean: $(MAKE) -C parson clean - $(MAKE) -C sha1 clean
\ No newline at end of file + $(MAKE) -C sha1 clean diff --git a/lib/parson/Makefile b/lib/parson/Makefile index 08e41dd..c94f2c8 100644 --- a/lib/parson/Makefile +++ b/lib/parson/Makefile @@ -1,6 +1,4 @@ CC ?= gcc -CCFLAGS ?= -Wall -LDFLAGS = SOURCES = $(wildcard *.c) OBJECTS = $(SOURCES:.c=.o) @@ -11,13 +9,13 @@ A = libparson.a all: $(TARGET) $(TARGET): $(OBJECTS) - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) + $(CC) $(strip $(CPPFLAGS) $(CFLAGS) -o) $@ $^ $(LDFLAGS) $(LIBS) $(A): $(OBJECTS) ar rcs $(A) $(OBJECTS) %.o: %.c - $(CC) $(CFLAGS) -c $< + $(CC) $(strip $(CPPFLAGS) $(CFLAGS) -c) $< clean: rm -f *.o *.a $(TARGET) diff --git a/lib/sha1/Makefile b/lib/sha1/Makefile index 7c7a1ed..71fbe9e 100644 --- a/lib/sha1/Makefile +++ b/lib/sha1/Makefile @@ -1,6 +1,4 @@ CC ?= gcc -CFLAGS ?= -Wall -LDFLAGS = SOURCES = $(wildcard *.c) OBJECTS = $(SOURCES:.c=.o) @@ -11,13 +9,13 @@ A = libsha1.a all: $(TARGET) $(TARGET): $(OBJECTS) - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) + $(CC) $(strip $(CPPFLAGS) $(CFLAGS) -o) $@ $^ $(LDFLAGS) $(LIBS) $(A): $(OBJECTS) ar rcs $(A) $(OBJECTS) %.o: %.c - $(CC) $(CFLAGS) -c $< + $(CC) $(strip $(CPPFLAGS) $(CFLAGS) -c) $< clean: rm -f *.o *.a $(TARGET) |