X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=idl%2FMakefile;h=6534ffe3677185790d468845b3e90d7648f39fcf;hp=ccc4bf6eac32902d83ca6059593cdb49f2f95cae;hb=9e0411db099e71409f0ee8a8f464aa34ac65c778;hpb=ca787916893fd2124a4dd72d326e3435fad5b9c8

diff --git a/idl/Makefile b/idl/Makefile
index ccc4bf6..6534ffe 100644
--- a/idl/Makefile
+++ b/idl/Makefile
@@ -1,16 +1,14 @@
 CFLAGS += -g -D$(shell uname | tr a-z A-Z)
-SOURCES := parser.c lexer.c validator.c compiler.c main.c
-HEADERS := $(addsuffix .[ch], $(basename $(SOURCES)))
+SOURCES := parser_proc.c parser.c validator.c compiler.c main.c
 
 GENERATED_FILES := $(addsuffix .h, $(basename $(SOURCES)))
 
 .PHONY: all
-all: headers main
-
-.PHONY: headers
-headers: makeheaders $(SOURCES)
-	./makeheaders $(HEADERS) types.h
+all: main
 
+##
+# The lemon parser generator
+##
 GENERATED_FILES += lempar.c
 lempar.c:
 	curl -sSo $@ "http://www.sqlite.org/src/raw/tool/lempar.c?name=3617143ddb9b176c3605defe6a9c798793280120"
@@ -22,30 +20,26 @@ lemon.c:
 GENERATED_FILES += lemon
 lemon: lemon.c | lempar.c
 
-GENERATED_FILES += makeheaders.c
-makeheaders.c:
-	curl -sSo makeheaders.c "https://www.fossil-scm.org/xfer/raw/src/makeheaders.c?name=c42268ec69aae42b8dd10471fd73377d789873ca"
-#http://www.hwaci.com/sw/mkhdr/makeheaders.c
-
-GENERATED_FILES += makeheaders
-makeheaders: makeheaders.c
-
+##
+# Main test program
+##
 GENERATED_FILES += main
 main: $(SOURCES)
 
-GENERATED_FILES += parser.c
-parser.c: parser.y lemon
-	./lemon -c -m $<
+##
+# Parser proc
+##
+GENERATED_FILES += parser_proc.c
+parser_proc.c: parser_proc.y lemon
+	./lemon -c $<
 
-GENERATED_FILES += lexer.c
-lexer.c: lexer.re
+##
+# Parser with lexer
+##
+GENERATED_FILES += parser.c
+parser.c: parser.re
 	re2c -o $@ $<
 
-%.h: headers
-
-%.c: %.h
-	touch $@
-
 .PHONY: clean
 clean:
 	-echo rm -f $(GENERATED_FILES)