Simplify Makefile and add hardening

diff --git a/Makefile b/Makefile
index 2e686108d1a694e0a782a058f79c29e1f7129aba..ed7923f0b403d6e33093e22f5c78edfeaee4e011 100644 (file)
--- 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 715559e9a85b91703dbd17625c2c20c5efbbb5f1..17a410ddaa195cb6ed32eb257f86389feab55aa9 100644 (file)
--- 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