$FreeBSD$ --- src/Makefile.orig 2010-02-12 13:38:01.000000000 -0800 +++ src/Makefile 2010-02-20 08:54:47.000000000 -0800 @@ -16,16 +16,15 @@ # along with this program. If not, see . # HOST= DARWIN -DEFINES=-D$(HOST) #-DNETWORK_EXTENSIONS #-DDUMP_FUNCS -DEBUG= -O -g +DEFINES=-D$(HOST) $(EXTRA_DEFINES) #-DNETWORK_EXTENSIONS #-DDUMP_FUNCS CCFLAGS=$(DEFINES) $(DEBUG) CFLAGS= -I. -Icomp -Ilex -Ied -Iparser -Ikfun $(CCFLAGS) LDFLAGS= LIBS= LINTFLAGS=-abcehpruz -CC= gcc +CC?= gcc LD= $(CC) -DMAKE= make +DMAKE= $(MAKE) YACC= yacc BIN= ../bin @@ -36,6 +35,8 @@ COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o sdata.o data.o \ interpret.o config.o +all: a.out comp/a.out + a.out: $(OBJ) always cd comp; $(DMAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' 'YACC=$(YACC)' dgd cd lex; $(DMAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd @@ -53,10 +54,15 @@ @rm -f a.out $(BIN)/driver: a.out + -mkdir $(BIN) -mv $(BIN)/driver $(BIN)/driver.old cp a.out $(BIN)/driver -install: $(BIN)/driver +$(BIN)/precomp: comp/a.out + -mv $(BIN)/precomp $(BIN)/precomp.old + cp comp/a.out $(BIN)/precomp + +install: $(BIN)/driver $(BIN)/precomp lint: lint $(LINTFLAGS) $(CFLAGS) $(SRC) @@ -82,7 +88,8 @@ comp/a.out: cd comp; $(DMAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' \ - 'YACC=$(YACC)' 'LIBS=$(LIBS)' a.out + 'LDFLAGS=$(LDFLAGS)' 'YACC=$(YACC)' 'LIBS=$(LIBS)' \ + a.out clean: rm -f a.out $(OBJ) comp.sub lex.sub ed.sub