From 89c4f834fffc2cad3d1682e9ba7eda7f7f1ced00 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 4 Oct 2003 14:22:52 +0000 Subject: [PATCH] Makefiles worked only if certain directories and generated files were already present. Source distributions had them, but we didn't commit them to CVS. Fix Makefiles. --- Makefile | 59 ++------------------------------------ info/Makefile | 7 +++-- info/Subjects/Makefile | 2 +- src/client/Makefile | 2 +- src/doconfig/Makefile | 2 +- src/lib/as/Makefile | 2 +- src/lib/commands/Makefile | 2 +- src/lib/common/Makefile | 2 +- src/lib/empthread/Makefile | 2 +- src/lib/gen/Makefile | 2 +- src/lib/global/Makefile | 2 +- src/lib/lwp/Makefile | 2 +- src/lib/player/Makefile | 2 +- src/lib/subs/Makefile | 2 +- src/lib/update/Makefile | 2 +- src/server/Makefile | 2 +- src/util/Makefile | 2 +- 17 files changed, 22 insertions(+), 74 deletions(-) diff --git a/Makefile b/Makefile index 49f44e37..dea41913 100644 --- a/Makefile +++ b/Makefile @@ -328,6 +328,7 @@ ntbinaries: genlibs: @echo 'building generic libraries' + -mkdir lib (cd src/lib/as; $(MAKE) $(GENMASTER)) (cd src/lib/commands; $(MAKE) $(GENMASTER)) (cd src/lib/common; $(MAKE) $(GENMASTER)) @@ -440,20 +441,8 @@ realclean: (rm -rf data/*) -(rm -rf $(EMPDIR)/data/*) -(rm -rf $(EMPDIR)/bin/*) - (cd src/lib/as ; echo "# Empty" > Makedepend) - (cd src/lib/commands ; echo "# Empty" > Makedepend) - (cd src/lib/common ; echo "# Empty" > Makedepend) - (cd src/lib/gen ; echo "# Empty" > Makedepend) - (cd src/lib/global ; echo "# Empty" > Makedepend) - (cd src/lib/player ; echo "# Empty" > Makedepend) - (cd src/lib/subs ; echo "# Empty" > Makedepend) - (cd src/lib/update ; echo "# Empty" > Makedepend) - (cd src/lib/lwp ; echo "# Empty" > Makedepend) - (cd src/lib/empthread ; echo "# Empty" > Makedepend) - (cd src/client ; echo "# Empty" > Makedepend) - (cd src/server ; echo "# Empty" > Makedepend) - (cd src/util ; echo "# Empty" > Makedepend) - (cd src/doconfig ; echo "# Empty" > Makedepend) + rm -rf lib info.nr info.html + rm -f include/gamesdef.h src/client/ipglob.c src/make.src ntrealclean: $(MAKE) ntclean @@ -463,48 +452,6 @@ ntrealclean: cd data -(del /Q *.*) cd .. - cd src/lib/as - echo # Empty > Makedepend - cd ../../../ - cd src/lib/commands - echo # Empty > Makedepend - cd ../../../ - cd src/lib/common - echo # Empty > Makedepend - cd ../../../ - cd src/lib/gen - echo # Empty > Makedepend - cd ../../../ - cd src/lib/global - echo # Empty > Makedepend - cd ../../../ - cd src/lib/player - echo # Empty > Makedepend - cd ../../../ - cd src/lib/subs - echo # Empty > Makedepend - cd ../../../ - cd src/lib/update - echo # Empty > Makedepend - cd ../../../ - cd src/lib/lwp - echo # Empty > Makedepend - cd ../../../ - cd src/lib/empthread - echo # Empty > Makedepend - cd ../../../ - cd src/client - echo # Empty > Makedepend - cd ../../ - cd src/server - echo # Empty > Makedepend - cd ../../ - cd src/util - echo # Empty > Makedepend - cd ../../ - cd src/doconfig - echo # Empty > Makedepend - cd ../../ cd $(EMPDIR)\data -(del /Q *.*) -(rmdir tel) diff --git a/info/Makefile b/info/Makefile index 45573a1e..be204689 100644 --- a/info/Makefile +++ b/info/Makefile @@ -23,7 +23,8 @@ # related information and legal notices. It is expected that any future # projects/authors will amend these files as needed. # -all: +all: + -mkdir ../info.nr @echo "Making automated Subjects." @echo "If this fails, you may not have perl5 installed." -perl info.pl @@ -36,7 +37,8 @@ all: -(cd ../info.nr ; ls -CF > all) @echo Done making info files. -html: +html: + -mkdir ../info.html @echo "Making automated Subjects." @echo "If this fails, you may not have perl5 installed." -perl info.pl @@ -50,4 +52,3 @@ html: (cp ls2html.pl ../info.html) -(cd ../info.html ; ls -CF *.html | perl ls2html.pl > all.html) @echo Done making HTML info files. - diff --git a/info/Subjects/Makefile b/info/Subjects/Makefile index 032035e5..4e8ac236 100644 --- a/info/Subjects/Makefile +++ b/info/Subjects/Makefile @@ -33,7 +33,7 @@ INFOOBJS = $(INFOSRCS:.t=) HTMLOBJS = $(INFOSRCS:.t=.) -include MakeSrcs +-include MakeSrcs .SUFFIXES: .t diff --git a/src/client/Makefile b/src/client/Makefile index dae6bb1b..407d8738 100644 --- a/src/client/Makefile +++ b/src/client/Makefile @@ -95,5 +95,5 @@ ntinstall: copy emp_client.exe $(NTINSTDIR)\bin include ../make.rules -include Makedepend +-include Makedepend diff --git a/src/doconfig/Makefile b/src/doconfig/Makefile index d08ca625..7e394858 100644 --- a/src/doconfig/Makefile +++ b/src/doconfig/Makefile @@ -70,4 +70,4 @@ clean: -(del *.pdb) include ../make.rules -include Makedepend +-include Makedepend diff --git a/src/lib/as/Makefile b/src/lib/as/Makefile index ff73f225..cb4975f4 100644 --- a/src/lib/as/Makefile +++ b/src/lib/as/Makefile @@ -59,4 +59,4 @@ clean: -(del /q $(NTOBJS)) include ../../make.rules -include Makedepend +-include Makedepend diff --git a/src/lib/commands/Makefile b/src/lib/commands/Makefile index 5586b894..1391bdcd 100644 --- a/src/lib/commands/Makefile +++ b/src/lib/commands/Makefile @@ -95,4 +95,4 @@ clean: -(del /q $(NTOBJS)) include ../../make.rules -include Makedepend +-include Makedepend diff --git a/src/lib/common/Makefile b/src/lib/common/Makefile index 785b9f0f..c61f1878 100644 --- a/src/lib/common/Makefile +++ b/src/lib/common/Makefile @@ -64,4 +64,4 @@ clean: -(del /q $(NTOBJS)) include ../../make.rules -include Makedepend +-include Makedepend diff --git a/src/lib/empthread/Makefile b/src/lib/empthread/Makefile index 6c3940a3..6f55780a 100644 --- a/src/lib/empthread/Makefile +++ b/src/lib/empthread/Makefile @@ -57,4 +57,4 @@ clean: -(del /q $(NTOBJS)) include ../../make.rules -include Makedepend +-include Makedepend diff --git a/src/lib/gen/Makefile b/src/lib/gen/Makefile index eb18783c..0c581ba4 100644 --- a/src/lib/gen/Makefile +++ b/src/lib/gen/Makefile @@ -65,4 +65,4 @@ clean: -(del /q $(NTOBJS)) include ../../make.rules -include Makedepend +-include Makedepend diff --git a/src/lib/global/Makefile b/src/lib/global/Makefile index a886e838..2a196127 100644 --- a/src/lib/global/Makefile +++ b/src/lib/global/Makefile @@ -61,4 +61,4 @@ clean: -(del /q $(NTOBJS)) include ../../make.rules -include Makedepend +-include Makedepend diff --git a/src/lib/lwp/Makefile b/src/lib/lwp/Makefile index baa60e1c..f184dc66 100644 --- a/src/lib/lwp/Makefile +++ b/src/lib/lwp/Makefile @@ -61,4 +61,4 @@ clean: -(rm -f $(OBJS) $(AIXOBJS) $(MIPSOBJS)) include ../../make.rules -include Makedepend +-include Makedepend diff --git a/src/lib/player/Makefile b/src/lib/player/Makefile index 95bd786a..79b3f2ec 100644 --- a/src/lib/player/Makefile +++ b/src/lib/player/Makefile @@ -59,4 +59,4 @@ clean: -(del /q $(NTOBJS)) include ../../make.rules -include Makedepend +-include Makedepend diff --git a/src/lib/subs/Makefile b/src/lib/subs/Makefile index 828b8439..044f063d 100644 --- a/src/lib/subs/Makefile +++ b/src/lib/subs/Makefile @@ -73,4 +73,4 @@ clean: -(del /q $(NTOBJS)) include ../../make.rules -include Makedepend +-include Makedepend diff --git a/src/lib/update/Makefile b/src/lib/update/Makefile index 54b86cd2..e6941f2b 100644 --- a/src/lib/update/Makefile +++ b/src/lib/update/Makefile @@ -64,4 +64,4 @@ clean: -(del /q $(NTOBJS)) include ../../make.rules -include Makedepend +-include Makedepend diff --git a/src/server/Makefile b/src/server/Makefile index a3d048cc..d8480c89 100644 --- a/src/server/Makefile +++ b/src/server/Makefile @@ -115,4 +115,4 @@ ntinstall: -(copy emp_server.exe $(NTINSTDIR)\bin) include ../make.rules -include Makedepend +-include Makedepend diff --git a/src/util/Makefile b/src/util/Makefile index e1ecccb9..6678e1d4 100644 --- a/src/util/Makefile +++ b/src/util/Makefile @@ -124,4 +124,4 @@ ntinstall: -(copy pconfig.exe $(NTINSTDIR)\bin) include ../make.rules -include Makedepend +-include Makedepend