makefile cleanup and safety (don't rm -rf)

[ott/enhance] / makefile

diff --git a/makefile b/makefile
index 5d6ad886afacf4d7f0a264379b7d21a1eb346566..b3fb84a51d5f6ae2b8cbff67e81cf9d822942957 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 # "makefile" is automatically generated from "makefile.1.mak"
-# 04.12.2022
+# 07.12.2022
 # 
 # Copyright (C) 2022  Balthasar Szczepański
 # 
@@ -105,17 +105,41 @@ npb1.h\
 npb2.h\
 npb_ong1.h\
 npb_403.h\
-nh.h
+nh.h\
+nf.h\
+rvl.h\
+df.h\
+mpb.h\
+mpb_503.h\
+nclr.h\
+t1.h
 
 CGI=\
-bluenh-cgi
+bluenh-cgi\
+nofading-cgi\
+reveal-cgi\
+diff-cgi\
+npb-cgi\
+pal-cgi\
+t-1-cgi
 
 HTM_CGI=\
-bluenh.htm
+bluenh.htm\
+nofading.htm\
+reveal.htm\
+diff.htm\
+npb.htm\
+pal.htm\
+t-1.htm
 
 HTM_CGI_1=\
-bluenh.1.htm
-
+bluenh.1.htm\
+nofading.1.htm\
+reveal.1.htm\
+diff.1.htm\
+npb.1.htm\
+pal.1.htm\
+t-1.1.htm
 
 # keep these 2 lists in the same order!:
 GENERATE_FROM=\
@@ -144,8 +168,7 @@ index.htm\
 $(HTM_CGI)\
 param.png
 
-#all: 403 npb npbd npb-ong1 npbd-ong1 bluenh bluenhd insert extract seediff insertframe mremapt-1 compare nofading nofadingd
-all: $(BIN) $(WWW)
+all: $(BIN) $(WWW) enhance.conf
        
 
 makefile: makefile.1.mak $(CONFIGFILE)
@@ -177,7 +200,7 @@ f2h: f2h.c
        $(CC) $(CF) -o f2h f2h.c
 
 $(HTM_CGI): %.htm: enhance-top.htm enhance-bottom.htm %.1.htm $(CONFIGFILE)
-       $(CAT) enhance-top.htm $*.1.htm enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_$* $(CONFIGFILE) > bluenh.htm
+       $(CAT) enhance-top.htm $*.1.htm enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_$* $(CONFIGFILE) > $*.htm
 
 index.htm: enhance-top.htm enhance-bottom.htm $(HTM_CGI_1) $(CONFIGFILE)
        $(CAT) enhance-top.htm $(HTM_CGI_1) enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_enhance $(CONFIGFILE) > index.htm
@@ -192,7 +215,7 @@ mktree:
 
 ifdef BIN_PATH
 cp_bin: $(BIN) setuid | mktree
-       $(RM) -rf $(BIN_PATH)/*
+       $(RM) -f $(BIN_PATH)/*
        $(CP) -p $(BIN) $(BIN_PATH)
 endif
 
@@ -202,34 +225,12 @@ cp_conf: enhance.conf
 cp_www: $(WWW) | mktree
        $(CP) -r $(WWW) $(WWW_PATH)
 
-install: cp_bin cp_www cp_conf
+install: all cp_bin cp_www cp_conf
 
 clean:
        $(RM) -f enhance $(C_STANDALONE) $(STANDALONE) $(TO_GENERATE) f2h $(H_PNG) $(H_SUBTOOL) $(CGI) index.htm $(HTM_CGI)
 
 PHONY: all clean install setuid mktree cp_bin cp_www
 
-#npbd-ong1: npb npbd-ong1.cpp makefile
-#      $(CC) $(CF) -o npbd-ong1 npbd-ong1.cpp $(LF2)
-#
-#npbd: npb npbd.cpp makefile
-#      $(CC) $(CF) -o npbd npbd.cpp $(LF2)
-#
-#bluenhd: bluenhd.cpp makefile
-#      $(CC) $(CF) -o bluenhd bluenhd.cpp $(LF2)
-#
-#seediff: seediff.c makefile
-#      $(CC) $(CF) $(LF) -o seediff seediff.c
-#
-#insertframe: insertframe.c makefile
-#      $(CC) $(CF) -o insertframe insertframe.c $(LF2)
-#
-#remapt-1: remapt-1.c makefile
-#      $(CC) $(CF) $(LF) -o remapt-1 remapt-1.c
-#
 #compare: compare.c makefile
 #      $(CC) $(CF) $(LF) -o compare compare.c
-#
-#nofadingd: nofadingd.c makefile
-#      $(CC) $(CF) $(LF) -o nofadingd nofadingd.c
-#