move source dehacked to dedicated subdirectory

Makefile

@@ -16,7 +16,7 @@ OBJS=$(FREEDM) $(FREEDOOM1) $(FREEDOOM2)
 all: $(OBJS)
 
 subdirs:
-	$(MAKE) -C lumps
+	$(MAKE) -C lumps/dehacked # graphics/text depends on generated dehacked files
 	$(MAKE) VERSION=$(VERSION) -C graphics/text
 	$(MAKE) -C lumps/playpal
 	$(MAKE) -C lumps/colormap
@@ -111,6 +111,7 @@ clean: wad-image-clean
 
 	$(MAKE) -C dist clean
 	$(MAKE) -C graphics/text clean
+	$(MAKE) -C lumps/dehacked clean
 	$(MAKE) -C lumps/playpal clean
 	$(MAKE) -C lumps/colormap clean
 	$(MAKE) -C lumps/genmidi clean

graphics/text/Makefile

@@ -55,7 +55,7 @@ TEXTGEN_GRAPHICS = $(TEXTGEN_GRAPHIC_LUMPS)                                \
 all: text_strings help.png credit.png wikilrs.png wivctms.png titlepic
 
 # Generate the menu and level strings
-text_strings: config.py fontchars ../../lumps/dehacked.lmp
+text_strings: config.py fontchars ../../lumps/dehacked/dehacked.txt
 	python textgen
 	cp $(TEXTGEN_GRAPHIC_LUMPS) ../
 

lumps/Makefile

@@ -1,12 +0,0 @@
-CPP=../scripts/simplecpp
-
-all: fdm_deh.lmp p1_deh.lmp p2_deh.lmp
-
-fdm_deh.lmp: dehacked.lmp
-	$(CPP) -DFREEDM < $< > $@
-
-p1_deh.lmp: dehacked.lmp
-	$(CPP) -DPHASE1 < $< > $@
-
-p2_deh.lmp: dehacked.lmp
-	$(CPP) -DPHASE2 < $< > $@

lumps/dehacked/Makefile

@@ -0,0 +1,15 @@
+CPP=../../scripts/simplecpp
+
+all: ../fdm_deh.lmp ../p1_deh.lmp ../p2_deh.lmp
+
+../fdm_deh.lmp: dehacked.txt
+	$(CPP) -DFREEDM < $< > $@
+
+../p1_deh.lmp: dehacked.txt
+	$(CPP) -DPHASE1 < $< > $@
+
+../p2_deh.lmp: dehacked.txt
+	$(CPP) -DPHASE2 < $< > $@
+
+clean:
+	$(RM) ../fdm_deh.lmp ../p1_deh.lmp ../p2_deh.lmp

lumps/dehacked/README

@@ -0,0 +1,10 @@
+This directory contains the source DeHackEd patch used for Freedoom.
+
+We generate three unique files for each IWAD, most of the data being
+identical to each other.
+
+- FreeDM has all par times set to 0 and the map names would otherwise
+  override Phase 2.
+- We override the no-clipping cheat in Phase 1 so IDCLIP is used in
+  all games.
+- Phase 2 has map names that would otherwise override FreeDM.