Also close bug

[filters.git] / Makefile

diff --git a/Makefile b/Makefile
index 13d54a4e13ab5324ec3e1929c77f3c48161a06b3..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,12 +14,7 @@ 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) samples
+all:   $(OTHER) $(BUILD)
 
 install:       $(BUILD) $(OTHER)
        install -d $(DESTDIR)/usr/games
@@ -27,12 +25,8 @@ install:     $(BUILD) $(OTHER)
        cd $(DESTDIR)/usr/share/man/man6 && \
                $(foreach prog,$(BUILD) $(OTHER),ln -s filters.6 $(prog).6;)
 
-samples:       $(BUILD) $(OTHER)
-       -rm -f SAMPLES
-       PATH=.:$$PATH; export PATH; echo $(BUILD) $(OTHER) | xargs -n 1 sh makesample.sh
-
 clean:
-       $(RM) -f core *.o *~ $(BUILD) SAMPLES
+       $(RM) -f core *.o *~ $(BUILD)
        cd ky00te.dir && make clean
 
 .SUFFIXES: .l
@@ -40,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