X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=fml%2FMakefile;h=08a4b6bf88563f56f8c644b4685eef11a1cc6c72;hb=a3501ea5b2dd4a1b1aff2b5ab66e7a028299cdbc;hp=882a2c64721d6fab6e4512e04696586ee351d11d;hpb=8467171ebdb5f018740de8d82149c8ccc53d2815;p=egate.git

diff --git a/fml/Makefile b/fml/Makefile
index 882a2c6..08a4b6b 100644
--- a/fml/Makefile
+++ b/fml/Makefile
@@ -1,13 +1,13 @@
 # FML interpreter. Europagate, 1995
 #
-# $Id: Makefile,v 1.11 1995/02/23 08:32:03 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