Minor tidy up

This commit is contained in:
Adam David 1994-10-19 15:31:19 +00:00
parent 44e2ed9b7b
commit d50ac316fc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=246
2 changed files with 17 additions and 20 deletions

View file

@ -1,7 +1,7 @@
*** Makefile.old Sat Jul 16 13:28:40 1994 *** Makefile.old Sat Jul 16 13:28:40 1994
--- Makefile Thu Aug 25 10:20:32 1994 --- Makefile Thu Aug 25 10:20:32 1994
*************** ***************
*** 1,13 **** *** 1,14 ****
# #
# Makefile for DGD, Dworkin's Game Driver # Makefile for DGD, Dworkin's Game Driver
# #
@ -12,10 +12,11 @@
CFLAGS= -I. -Icomp -Ilex -Ied -Ikfun $(CCFLAGS) CFLAGS= -I. -Icomp -Ilex -Ied -Ikfun $(CCFLAGS)
! LDFLAGS= ! LDFLAGS=
! LIBS= ! LIBS=
CC= gcc ! CC= gcc
LD= $(CC) LD= $(CC)
DMAKE= make DMAKE= make
--- 1,15 ---- BIN= ../bin
--- 1,16 ----
# #
# Makefile for DGD, Dworkin's Game Driver # Makefile for DGD, Dworkin's Game Driver
# #
@ -28,20 +29,27 @@
! LDFLAGS= -s ! LDFLAGS= -s
! #LDFLAGS= ! #LDFLAGS=
! LIBS= -lcrypt ! LIBS= -lcrypt
CC= gcc ! CC= cc
LD= $(CC) LD= $(CC)
DMAKE= make DMAKE= make
BIN= ../bin
*************** ***************
*** 20,25 **** *** 20,26 ****
--- 22,29 ----
COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o data.o \ COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o data.o \
interpret.o config.o interpret.o config.o
+ all: a.out ! a.out: $(OBJ) always
+
a.out: $(OBJ)
cd comp; $(MAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd cd comp; $(MAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
cd lex; $(MAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd cd lex; $(MAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
cd ed; $(MAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
--- 20,26 ----
COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o data.o \
interpret.o config.o
! a.out all: $(OBJ) always
cd comp; $(MAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
cd lex; $(MAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
cd ed; $(MAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
*************** ***************
*** 50,56 **** *** 50,56 ****

View file

@ -1,14 +1,3 @@
#!/bin/sh #!/bin/sh
# #
if [ $# -ne 3 ]; then
echo "This script should only be run by the Makefile."
exit 1
fi
# First arg is top level ports directory, second is current directory,
# third is the directory containing the dist.
#
PDIR=$1
CDIR=$2
WDIR=$3