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.
This commit is contained in:
parent
efe12a6137
commit
89c4f834ff
17 changed files with 22 additions and 74 deletions
59
Makefile
59
Makefile
|
@ -328,6 +328,7 @@ ntbinaries:
|
||||||
|
|
||||||
genlibs:
|
genlibs:
|
||||||
@echo 'building generic libraries'
|
@echo 'building generic libraries'
|
||||||
|
-mkdir lib
|
||||||
(cd src/lib/as; $(MAKE) $(GENMASTER))
|
(cd src/lib/as; $(MAKE) $(GENMASTER))
|
||||||
(cd src/lib/commands; $(MAKE) $(GENMASTER))
|
(cd src/lib/commands; $(MAKE) $(GENMASTER))
|
||||||
(cd src/lib/common; $(MAKE) $(GENMASTER))
|
(cd src/lib/common; $(MAKE) $(GENMASTER))
|
||||||
|
@ -440,20 +441,8 @@ realclean:
|
||||||
(rm -rf data/*)
|
(rm -rf data/*)
|
||||||
-(rm -rf $(EMPDIR)/data/*)
|
-(rm -rf $(EMPDIR)/data/*)
|
||||||
-(rm -rf $(EMPDIR)/bin/*)
|
-(rm -rf $(EMPDIR)/bin/*)
|
||||||
(cd src/lib/as ; echo "# Empty" > Makedepend)
|
rm -rf lib info.nr info.html
|
||||||
(cd src/lib/commands ; echo "# Empty" > Makedepend)
|
rm -f include/gamesdef.h src/client/ipglob.c src/make.src
|
||||||
(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)
|
|
||||||
|
|
||||||
ntrealclean:
|
ntrealclean:
|
||||||
$(MAKE) ntclean
|
$(MAKE) ntclean
|
||||||
|
@ -463,48 +452,6 @@ ntrealclean:
|
||||||
cd data
|
cd data
|
||||||
-(del /Q *.*)
|
-(del /Q *.*)
|
||||||
cd ..
|
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
|
cd $(EMPDIR)\data
|
||||||
-(del /Q *.*)
|
-(del /Q *.*)
|
||||||
-(rmdir tel)
|
-(rmdir tel)
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
# projects/authors will amend these files as needed.
|
# projects/authors will amend these files as needed.
|
||||||
#
|
#
|
||||||
all:
|
all:
|
||||||
|
-mkdir ../info.nr
|
||||||
@echo "Making automated Subjects."
|
@echo "Making automated Subjects."
|
||||||
@echo "If this fails, you may not have perl5 installed."
|
@echo "If this fails, you may not have perl5 installed."
|
||||||
-perl info.pl
|
-perl info.pl
|
||||||
|
@ -37,6 +38,7 @@ all:
|
||||||
@echo Done making info files.
|
@echo Done making info files.
|
||||||
|
|
||||||
html:
|
html:
|
||||||
|
-mkdir ../info.html
|
||||||
@echo "Making automated Subjects."
|
@echo "Making automated Subjects."
|
||||||
@echo "If this fails, you may not have perl5 installed."
|
@echo "If this fails, you may not have perl5 installed."
|
||||||
-perl info.pl
|
-perl info.pl
|
||||||
|
@ -50,4 +52,3 @@ html:
|
||||||
(cp ls2html.pl ../info.html)
|
(cp ls2html.pl ../info.html)
|
||||||
-(cd ../info.html ; ls -CF *.html | perl ls2html.pl > all.html)
|
-(cd ../info.html ; ls -CF *.html | perl ls2html.pl > all.html)
|
||||||
@echo Done making HTML info files.
|
@echo Done making HTML info files.
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ INFOOBJS = $(INFOSRCS:.t=)
|
||||||
|
|
||||||
HTMLOBJS = $(INFOSRCS:.t=.)
|
HTMLOBJS = $(INFOSRCS:.t=.)
|
||||||
|
|
||||||
include MakeSrcs
|
-include MakeSrcs
|
||||||
|
|
||||||
.SUFFIXES: .t
|
.SUFFIXES: .t
|
||||||
|
|
||||||
|
|
|
@ -95,5 +95,5 @@ ntinstall:
|
||||||
copy emp_client.exe $(NTINSTDIR)\bin
|
copy emp_client.exe $(NTINSTDIR)\bin
|
||||||
|
|
||||||
include ../make.rules
|
include ../make.rules
|
||||||
include Makedepend
|
-include Makedepend
|
||||||
|
|
||||||
|
|
|
@ -70,4 +70,4 @@ clean:
|
||||||
-(del *.pdb)
|
-(del *.pdb)
|
||||||
|
|
||||||
include ../make.rules
|
include ../make.rules
|
||||||
include Makedepend
|
-include Makedepend
|
||||||
|
|
|
@ -59,4 +59,4 @@ clean:
|
||||||
-(del /q $(NTOBJS))
|
-(del /q $(NTOBJS))
|
||||||
|
|
||||||
include ../../make.rules
|
include ../../make.rules
|
||||||
include Makedepend
|
-include Makedepend
|
||||||
|
|
|
@ -95,4 +95,4 @@ clean:
|
||||||
-(del /q $(NTOBJS))
|
-(del /q $(NTOBJS))
|
||||||
|
|
||||||
include ../../make.rules
|
include ../../make.rules
|
||||||
include Makedepend
|
-include Makedepend
|
||||||
|
|
|
@ -64,4 +64,4 @@ clean:
|
||||||
-(del /q $(NTOBJS))
|
-(del /q $(NTOBJS))
|
||||||
|
|
||||||
include ../../make.rules
|
include ../../make.rules
|
||||||
include Makedepend
|
-include Makedepend
|
||||||
|
|
|
@ -57,4 +57,4 @@ clean:
|
||||||
-(del /q $(NTOBJS))
|
-(del /q $(NTOBJS))
|
||||||
|
|
||||||
include ../../make.rules
|
include ../../make.rules
|
||||||
include Makedepend
|
-include Makedepend
|
||||||
|
|
|
@ -65,4 +65,4 @@ clean:
|
||||||
-(del /q $(NTOBJS))
|
-(del /q $(NTOBJS))
|
||||||
|
|
||||||
include ../../make.rules
|
include ../../make.rules
|
||||||
include Makedepend
|
-include Makedepend
|
||||||
|
|
|
@ -61,4 +61,4 @@ clean:
|
||||||
-(del /q $(NTOBJS))
|
-(del /q $(NTOBJS))
|
||||||
|
|
||||||
include ../../make.rules
|
include ../../make.rules
|
||||||
include Makedepend
|
-include Makedepend
|
||||||
|
|
|
@ -61,4 +61,4 @@ clean:
|
||||||
-(rm -f $(OBJS) $(AIXOBJS) $(MIPSOBJS))
|
-(rm -f $(OBJS) $(AIXOBJS) $(MIPSOBJS))
|
||||||
|
|
||||||
include ../../make.rules
|
include ../../make.rules
|
||||||
include Makedepend
|
-include Makedepend
|
||||||
|
|
|
@ -59,4 +59,4 @@ clean:
|
||||||
-(del /q $(NTOBJS))
|
-(del /q $(NTOBJS))
|
||||||
|
|
||||||
include ../../make.rules
|
include ../../make.rules
|
||||||
include Makedepend
|
-include Makedepend
|
||||||
|
|
|
@ -73,4 +73,4 @@ clean:
|
||||||
-(del /q $(NTOBJS))
|
-(del /q $(NTOBJS))
|
||||||
|
|
||||||
include ../../make.rules
|
include ../../make.rules
|
||||||
include Makedepend
|
-include Makedepend
|
||||||
|
|
|
@ -64,4 +64,4 @@ clean:
|
||||||
-(del /q $(NTOBJS))
|
-(del /q $(NTOBJS))
|
||||||
|
|
||||||
include ../../make.rules
|
include ../../make.rules
|
||||||
include Makedepend
|
-include Makedepend
|
||||||
|
|
|
@ -115,4 +115,4 @@ ntinstall:
|
||||||
-(copy emp_server.exe $(NTINSTDIR)\bin)
|
-(copy emp_server.exe $(NTINSTDIR)\bin)
|
||||||
|
|
||||||
include ../make.rules
|
include ../make.rules
|
||||||
include Makedepend
|
-include Makedepend
|
||||||
|
|
|
@ -124,4 +124,4 @@ ntinstall:
|
||||||
-(copy pconfig.exe $(NTINSTDIR)\bin)
|
-(copy pconfig.exe $(NTINSTDIR)\bin)
|
||||||
|
|
||||||
include ../make.rules
|
include ../make.rules
|
||||||
include Makedepend
|
-include Makedepend
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue