From 311bb17b20c4fdbb1af29bf66ab01d0309ee0efe Mon Sep 17 00:00:00 2001 From: = Date: Sat, 20 May 2017 20:26:38 -0400 Subject: Fixed tests, modified makefile. --- Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fe662af..ad72584 100644 --- a/Makefile +++ b/Makefile @@ -5,12 +5,14 @@ endif CC := gcc LD := gcc -CFLAGS = -Wall -Wextra -Os -g -std=c99 -pedantic +CFLAGS = -Wall -Wextra -Os -std=c99 -pedantic -fstack-protector-all +CFLAGS += $(USER_CFLAGS) ifeq ($(shell uname -s),OpenBSD) CFLAGS += -I/usr/local/include endif LDFLAGS = -lz +LDFLAGS += $(USER_LDFLAGS) ifeq ($(shell uname -s),OpenBSD) LDFLAGS += -liconv -L/usr/local/lib endif @@ -30,18 +32,22 @@ all: $(BINDIR)/nekopack $(BINDIR)/nekopack: $(OBJECTS) $(OBJDIR)/main.o @mkdir -p $(BINDIR) - @$(LD) $(LDFLAGS) $(OBJECTS) $(OBJDIR)/main.o -o bin/nekopack + @echo " LD $(@:$(BINDIR)/%=%)" + @$(LD) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(OBJDIR)/main.o -o $(BINDIR)/nekopack $(BINDIR)/test: $(OBJECTS) $(TEST_OBJECTS) @mkdir -p $(BINDIR) - @$(LD) $(LDFLAGS) $(OBJECTS) $(TEST_OBJECTS) -o $(BINDIR)/test + @echo " LD $(@:$(BINDIR)/%=%)" + @$(LD) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(TEST_OBJECTS) -o $(BINDIR)/test $(OBJDIR)/%.o: $(SRCDIR)/%.c @mkdir -p $(OBJDIR) + @echo " CC $(@:$(OBJDIR)/%=%)" @$(CC) $(CFLAGS) -c -o $@ $(SRCDIR)/$*.c $(OBJDIR)/%.o: $(TSTDIR)/%.c @mkdir -p $(OBJDIR) + @echo " CC $(@:$(OBJDIR)/%=%)" @$(CC) $(CFLAGS) -c -o $@ -I $(SRCDIR) $(TSTDIR)/$*.c test: bin/test -- cgit v1.3