From ef23063989a9543bd83656ed5f30e3a3aa9448b0 Mon Sep 17 00:00:00 2001 From: Marius Gavrilescu Date: Thu, 30 Jul 2015 20:05:57 +0300 Subject: [PATCH] Simplify Makefile and add hardening --- Makefile | 17 ++++++----------- ky00te.dir/makefile | 2 +- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 2e68610..ed7923f 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,10 @@ LEX = flex BUILD = jethro kraut cockney jive nyc ken ky00te newspeak nethackify scramble OTHER = eleet b1ff chef jibberish upside-down rasterman studly fudd \ censor spammer uniencode pirate kenny scottish fanboy LOLCAT -CFLAGS = -O2 +ifndef CFLAGS +CFLAGS = -O2 +endif +CFLAGS += $(CPPFLAGS) export CFLAGS INSTALL_PROGRAM = install @@ -11,11 +14,6 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif -# And debug building. -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) -CFLAGS += -g -endif - all: $(OTHER) $(BUILD) install: $(BUILD) $(OTHER) @@ -36,16 +34,13 @@ clean: .l: $(RM) $*.c $(LEX) -t $< > $*.c - $(CC) -o $@ $*.c $(CFLAGS) -lfl + $(CC) -o $@ $*.c $(CFLAGS) -lfl $(LDFLAGS) $(RM) $*.c .SUFFIXES: .dir -.dir: +.dir: cd $<; make -ky00te: - cd ky00te.dir && make - nethackify: nethackify.c scramble: scramble.c diff --git a/ky00te.dir/makefile b/ky00te.dir/makefile index 715559e..17a410d 100644 --- a/ky00te.dir/makefile +++ b/ky00te.dir/makefile @@ -5,7 +5,7 @@ clean: rm -f ../ky00te ../ky00te: y.tab.o lex.yy.o - $(CC) -o ../ky00te lex.yy.o y.tab.o $(CFLAGS) -lfl + $(CC) -o ../ky00te lex.yy.o y.tab.o $(CFLAGS) -lfl $(LDFLAGS) lex.yy.o: lex.yy.c y.tab.h $(CC) $(CFLAGS) -c lex.yy.c -- 2.39.2