X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=Makefile.frag;h=9e33c50200569b245559f7a3621568fb6d81994b;hp=e904edfccb1ef8b631a5a2c7883d4f0e2deb6887;hb=52ed5940ed0ab3cafd36fbded2e83c92563e7b2b;hpb=3b0b651ea1b555d8d023e45b43e5eb93b23d00a1

diff --git a/Makefile.frag b/Makefile.frag
index e904edf..9e33c50 100644
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -2,6 +2,7 @@
 
 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,38 +11,13 @@ $(PHP_PSI_BUILDDIR)/types/%.h: $(PHP_PSI_SRCDIR)/src/types/%.h | $(PHP_PSI_BUILD
 $(PHP_PSI_BUILDDIR)/%.h: $(PHP_PSI_SRCDIR)/src/%.h
 	@cat >$@ <$<
 
-install-headers: psi-build-headers
-clean: psi-clean
-
-.PHONY: psi-build-headers
-psi-build-headers: $(PHP_PSI_HEADERS)
-
-.PHONY: psi-clean-headers
-psi-clean-headers:
-	-rm -f $(PHP_PSI_HEADERS)
-	-rmdir $(PHP_PSI_BUILDDIR)/types
-
-.PHONY: psi-clean-sources
-psi-clean-sources:
-	-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
-
-.PHONY: psi-clean-aux
-psi-clean-aux:
-	-rm -f lempar.c lemon.c lemon
+$(PHP_PSI_BUILDDIR)/lempar.c:
+	curl -sSo $@ "http://www.sqlite.org/src/raw/tool/lempar.c?name=db1bdb4821f2d8fbd76e577cf3ab18642c8d08d1"
 
-.PHONY: psi-clean
-psi-clean: psi-clean-headers psi-clean-sources psi-clean-aux
-
-
-lempar.c:
-	curl -sSo $@ "http://www.sqlite.org/src/raw/tool/lempar.c?name=3ec1463a034b37d87d782be5f6b8b10a3b1ecbe7"
+$(PHP_PSI_BUILDDIR)/lemon.c:
+	curl -sSo $@ "http://www.sqlite.org/src/raw/tool/lemon.c?name=5ccba178a8e8a4b21e1c9232944d23973da38ad7"
 
-lemon.c:
-	curl -sSo $@ "http://www.sqlite.org/src/raw/tool/lemon.c?name=799e73e19a33b8dd7767a7fa34618ed2a9c2397d"
-
-./lemon: lemon.c | lempar.c
+$(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
@@ -51,25 +27,80 @@ $(PHP_PSI_SRCDIR)/src/parser_proc.y: $(PHP_PSI_SRCDIR)/src/parser_def.h $(PHP_PS
 	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) $<
+	# trickery needed for relative #line directives
+	cd $(PHP_PSI_SRCDIR) && $(LEMON_PATH)$(LEMON) $(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)/%,%,$<)
+
+$(PHP_PSI_SRCDIR)/src/calc/basic.h: $(PHP_PSI_SRCDIR)/scripts/gen_calc_basic.php
+	$(PHP_EXECUTABLE) $< >$@
+$(PHP_PSI_SRCDIR)/src/calc/bin.h: $(PHP_PSI_SRCDIR)/scripts/gen_calc_bin.php
+	$(PHP_EXECUTABLE) $< >$@
+$(PHP_PSI_SRCDIR)/src/calc/bool.h: $(PHP_PSI_SRCDIR)/scripts/gen_calc_bool.php
+	$(PHP_EXECUTABLE) $< >$@
+$(PHP_PSI_SRCDIR)/src/calc/cast.h: $(PHP_PSI_SRCDIR)/scripts/gen_calc_cast.php
+	$(PHP_EXECUTABLE) $< >$@
+$(PHP_PSI_SRCDIR)/src/calc/cmp.h: $(PHP_PSI_SRCDIR)/scripts/gen_calc_cmp.php
+	$(PHP_EXECUTABLE) $< >$@
+$(PHP_PSI_SRCDIR)/src/calc/oper.h: $(PHP_PSI_SRCDIR)/scripts/gen_calc_oper.php
+	$(PHP_EXECUTABLE) $< >$@
+
+.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
+	$(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),)
+-include $(PHP_PSI_DEPEND)
+endif
+endif
 
-$(PHP_PSI_SRCDIR)/src/types/decl.c: $(PHP_PSI_SRCDIR)/php_psi_macros.h $(PHP_PSI_SRCDIR)/php_psi_redirs.h
-$(PHP_PSI_SRCDIR)/src/context.c: $(PHP_PSI_SRCDIR)/php_psi_consts.h $(PHP_PSI_SRCDIR)/php_psi_decls.h $(PHP_PSI_SRCDIR)/php_psi_fn_decls.h $(PHP_PSI_SRCDIR)/php_psi_structs.h $(PHP_PSI_SRCDIR)/php_psi_types.h $(PHP_PSI_SRCDIR)/php_psi_unions.h $(PHP_PSI_SRCDIR)/php_psi_va_decls.h
+install-headers: psi-build-headers
+.PHONY: psi-clean
+clean: psi-clean
 
-PHP_PSI_DEPEND = $(PHP_PSI_BUILDDIR)/Makefile.deps
+.PHONY: psi-build-headers
+psi-build-headers: $(PHP_PSI_HEADERS)
 
-depend: psi-depend
-.PHONY: psi-depend
-psi-depend: $(PHP_PSI_DEPEND)
+.PHONY: psi-clean-headers
+psi-clean-headers:
+	-rm -f $(PHP_PSI_HEADERS)
 
-$(PHP_PSI_DEPEND): $(PHP_PSI_SOURCES)
-	$(CC) -MM -MG $(CPPFLAGS) $(DEFS) $(INCLUDES) $^ \
-		| $(SED) -e 's/^\(.*\).o: /\1.lo: /' \
-		> $@
+psi-clean: psi-clean-headers
+
+.PHONY: psi-clean-objects
+psi-clean-objects:
+	-rm -f $(PHP_PSI_BUILDDIR)/src/*o
+	-rm -f $(PHP_PSI_BUILDDIR)/src/types/*o
+
+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: psi-clean-aux
+
+.PHONY: psi-clean-depend
+psi-clean-depend:
+	-rm -f $(PHP_PSI_DEPEND)
+
+psi-clean: psi-clean-depend
 
--include $(PHP_PSI_DEPEND)