Minor changes.

[egate.git] / fml / Makefile

diff --git a/fml/Makefile b/fml/Makefile
index e3b2f93..08a4b6b 100644 (file)
--- a/fml/Makefile
+++ b/fml/Makefile
@@ -1,13 +1,13 @@
 # FML interpreter. Europagate, 1995
 #
-# $Id: Makefile,v 1.9 1995/02/22 08:50:48 adam Exp $
+# $Id: Makefile,v 1.15 1995/04/17 09:32:08 adam Exp $
 
 SHELL=/bin/sh
-INCLUDE=-I../include -I.
+INCLUDE=-I../include -I. $(REGEXINC)
 TPROG1=fmltest
-CFLAGS=-g -Wall -pedantic 
+#CFLAGS=-g -Wall -pedantic
 CPP=$(CC) -E
-DEFS=$(INCLUDE)
+DEFS=$(INCLUDE) -DUSE_GNU_REGEX=1
 LIB=../lib/fml.a 
 PO = fmltoken.o fmlmem.o fml.o fmlsym.o fmlrel.o fmlarit.o fmllist.o \
 fmlcall.o fmlcalls.o fmlmarc.o fmlstr.o
@@ -15,7 +15,7 @@ fmlcall.o fmlcalls.o fmlmarc.o fmlstr.o
 all: $(LIB) $(TPROG1) $(TPROG2)
 
 $(TPROG1): $(TPROG1).o $(LIB) 
-       $(CC) $(CFLAGS) -o $(TPROG1) $(TPROG1).o $(LIB) ../lib/util.a
+       $(CC) $(CFLAGS) -o $(TPROG1) $(TPROG1).o $(LIB) ../lib/util.a $(REGEXOBJ)
 
 $(LIB): $(PO)
        rm -f $(LIB)
@@ -31,14 +31,14 @@ clean:
 depend: depend2
 
 depend1:
-       mv Makefile Makefile.tmp
-       sed '/^#Depend/q' <Makefile.tmp >Makefile
-       $(CPP) $(INCLUDE) -M *.c >>Makefile
-       -rm Makefile.tmp
+       sed '/^#Depend/q' <Makefile >Makefile.tmp
+       $(CPP) $(DEFS) -M *.c >>Makefile.tmp
+       mv -f Makefile.tmp Makefile
 
 depend2:
-       $(CPP) $(INCLUDE) -M *.c >.depend       
+       $(CPP) $(DEFS) -M *.c >.depend  
 
+#GNU make style depend
 ifeq (.depend,$(wildcard .depend))
 include .depend
 endif