X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=Makefile.frag;h=502b1e21d8d9bb5309e71508c64a3160fe604f7b;hp=78a3a337baf1dd76870f382348160d8a857e5997;hb=8168488e3adc2b6e9517b3706c865e5a0e33ba77;hpb=21e56bfe786b2490cc02ba8b6b8275547171b048

diff --git a/Makefile.frag b/Makefile.frag
index 78a3a33..502b1e2 100644
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -1,4 +1,4 @@
-# provide headers in builddir, so they do not end up in /usr/include/ext/psi/src
+git# 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))
@@ -33,16 +33,36 @@ $(PHP_PSI_SRCDIR)/src/parser_proc.c: $(PHP_PSI_SRCDIR)/src/parser_proc.y $(LEMON
 $(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/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) $< >$@
+
+$(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),)
@@ -50,10 +70,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)
 
@@ -61,6 +77,7 @@ 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-objects
@@ -75,8 +92,15 @@ 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
 
@@ -86,3 +110,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