X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=Makefile.frag;h=5ca422e257b0096458bf4aaaee061172a8500e69;hp=2d05638a4fafa3c79e30c71288dd52d1ff5056cb;hb=8d1d1243a8a42b0046ac670808913b3bb06c994b;hpb=008e30ad1d9e27cd0d5ff8c537f0cd6670294613

diff --git a/Makefile.frag b/Makefile.frag
index 2d05638..5ca422e 100644
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -1,7 +1,9 @@
+
 # provide headers in builddir, so they do not end up in /usr/include/ext/psi/src
 
 PHP_PSI_HEADERS := $(addprefix $(PHP_PSI_BUILDDIR)/,$(PHP_PSI_HEADERS))
 PHP_PSI_SOURCES := $(addprefix $(PHP_PSI_SRCDIR)/,$(PHP_PSI_SOURCES))
+PHP_PSI_GENERATED:=$(addprefix $(PHP_PSI_SRCDIR)/,$(PHP_PSI_GENERATED))
 
 $(PHP_PSI_BUILDDIR)/types:
 	mkdir -p $@
@@ -10,37 +12,35 @@ $(PHP_PSI_BUILDDIR)/types/%.h: $(PHP_PSI_SRCDIR)/src/types/%.h | $(PHP_PSI_BUILD
 $(PHP_PSI_BUILDDIR)/%.h: $(PHP_PSI_SRCDIR)/src/%.h
 	@cat >$@ <$<
 
-$(PHP_PSI_BUILDDIR)/lempar.c:
-	curl -sSo $@ "http://www.sqlite.org/src/raw/tool/lempar.c?name=db1bdb4821f2d8fbd76e577cf3ab18642c8d08d1"
-
-$(PHP_PSI_BUILDDIR)/lemon.c:
-	curl -sSo $@ "http://www.sqlite.org/src/raw/tool/lemon.c?name=5ccba178a8e8a4b21e1c9232944d23973da38ad7"
-
-$(PHP_PSI_BUILDDIR)/lemon: $(PHP_PSI_BUILDDIR)/lemon.c | $(PHP_PSI_BUILDDIR)/lempar.c
-	$(CC) -o $@ $<
-
 $(PHP_PSI_SRCDIR)/src/parser_proc.h: $(PHP_PSI_SRCDIR)/src/parser_proc.c
 
-$(PHP_PSI_SRCDIR)/src/parser_proc.inc:
-$(PHP_PSI_SRCDIR)/src/parser_proc.y: $(PHP_PSI_SRCDIR)/src/parser_def.h $(PHP_PSI_SRCDIR)/src/parser_proc.inc
-	cat $(PHP_PSI_SRCDIR)/src/parser_proc.inc >$@
-	$(CPP) -P -DGENERATE $< >>$@
-$(PHP_PSI_SRCDIR)/src/parser_proc.c: $(PHP_PSI_SRCDIR)/src/parser_proc.y $(LEMON)
-	$(LEMON) $<
+$(PHP_PSI_SRCDIR)/src/parser_proc.c: $(PHP_PSI_SRCDIR)/src/parser_proc_grammar.y
+	# trickery needed for relative #line directives
+	cd $(PHP_PSI_SRCDIR) && bison -Wall -v -d -o $(patsubst $(PHP_PSI_SRCDIR)/%,%,$@) $(patsubst $(PHP_PSI_SRCDIR)/%,%,$<)
 
 $(PHP_PSI_SRCDIR)/src/parser.re: $(PHP_PSI_SRCDIR)/src/parser_proc.h
 	touch $@
 $(PHP_PSI_SRCDIR)/src/parser.c: $(PHP_PSI_SRCDIR)/src/parser.re
-	$(RE2C) -o $@ $<
+	# trickery needed for relative #line directives
+	cd $(PHP_PSI_SRCDIR) && $(RE2C) -o $(patsubst $(PHP_PSI_SRCDIR)/%,%,$@) $(patsubst $(PHP_PSI_SRCDIR)/%,%,$<)
+
+$(PHP_PSI_SRCDIR)/src/calc/%.h: $(PHP_PSI_SRCDIR)/scripts/gen_calc_%.php
+	$(PHP_EXECUTABLE) $< >$@
+
+$(PHP_PSI_SRCDIR)/src/calc.h: | $(PHP_PSI_SRCDIR)/src/calc/basic.h $(PHP_PSI_SRCDIR)/src/calc/bin.h $(PHP_PSI_SRCDIR)/src/calc/bool.h $(PHP_PSI_SRCDIR)/src/calc/cast.h $(PHP_PSI_SRCDIR)/src/calc/cmp.h $(PHP_PSI_SRCDIR)/src/calc/oper.h
+
+.PHONY: psi-generated
+psi-generated: $(PHP_PSI_GENERATED)
 
 PHP_PSI_DEPEND = $(patsubst $(PHP_PSI_SRCDIR)/%,$(PHP_PSI_BUILDDIR)/%,$(PHP_PSI_SOURCES:.c=.dep))
 
-$(PHP_PSI_BUILDDIR)/%.dep: $(PHP_PSI_SRCDIR)/%.c
+$(PHP_PSI_BUILDDIR)/%.dep: $(PHP_PSI_SRCDIR)/%.c | $(PHP_PSI_GENERATED)
 	$(CC) -MM -MG -MF $@ -MT $(patsubst $(PHP_PSI_SRCDIR)/%,$(PHP_PSI_BUILDDIR)/%,$(@:.dep=.lo)) \
 		$(CPPFLAGS) $(DEFS) $(INCLUDES) $< \
 			|| touch $@
 
 php_psi_stdinc.h:
+php_psi_posix.h:
 
 ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
 ifneq ($(PSI_DEPS),)
@@ -48,10 +48,6 @@ ifneq ($(PSI_DEPS),)
 endif
 endif
 
-install-headers: psi-build-headers
-.PHONY: psi-clean
-clean: psi-clean
-
 .PHONY: psi-build-headers
 psi-build-headers: $(PHP_PSI_HEADERS)
 
@@ -59,19 +55,30 @@ psi-build-headers: $(PHP_PSI_HEADERS)
 psi-clean-headers:
 	-rm -f $(PHP_PSI_HEADERS)
 
+.PHONY: psi-clean
 psi-clean: psi-clean-headers
 
-.PHONY: psi-clean-sources
-psi-clean-sources:
+.PHONY: psi-clean-objects
+psi-clean-objects:
 	-rm -f $(PHP_PSI_BUILDDIR)/src/*o
 	-rm -f $(PHP_PSI_BUILDDIR)/src/types/*o
-	-rm -f $(PHP_PSI_SRCDIR)/src/parser.c $(PHP_PSI_SRCDIR)/src/parser_proc.c $(PHP_PSI_SRCDIR)/src/parser_proc.y
 
-psi-clean: psi-clean-sources
+psi-clean: psi-clean-objects
+
+.PHONY: psi-clean-generated
+psi-clean-generated:
+	-rm -f $(PHP_PSI_GENERATED)
 
 .PHONY: psi-clean-aux
-psi-clean-aux:
-	-rm -f $(PHP_PSI_BUILDDIR)/lempar.c $(PHP_PSI_BUILDDIR)/lemon.c $(PHP_PSI_BUILDDIR)/lemon
+psi-clean-aux: psi-clean-aux-bin psi-clean-aux-src
+
+.PHONY: psi-clean-aux-src
+psi-clean-aux-src:
+	-rm -f $(PHP_PSI_BUILDDIR)/lempar.c $(PHP_PSI_BUILDDIR)/lemon.c
+
+.PHONY: psi-clean-aux-bin
+psi-clean-aux-bin:
+	-rm -f $(PHP_PSI_BUILDDIR)/lemon
 
 psi-clean: psi-clean-aux
 
@@ -81,3 +88,8 @@ psi-clean-depend:
 
 psi-clean: psi-clean-depend
 
+install-headers: psi-build-headers
+clean: psi-clean-headers psi-clean-aux
+ifneq ($(PSI_DEPS),)
+clean: psi-clean-depend
+endif