X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=Makefile.frag;h=92a8d5410035efcec6fdabeedf78e69ba312d683;hp=91499f6459c5ad24268a05cca2479fd65cc4ba54;hb=ef4e043826e92afd32000b7d945cdf86a6e9a223;hpb=c9384515a81cb64d345b299908b2852f51bb8e6e

diff --git a/Makefile.frag b/Makefile.frag
index 91499f6..92a8d54 100644
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -1,10 +1,14 @@
 
-# provide headers in builddir, so they do not end up in /usr/include/ext/psi/src
+# provide headers in builddir, so they do not end up in a "src" subdirectory
 
 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)/calc:
+	mkdir -p $@
+$(PHP_PSI_BUILDDIR)/calc/%.h: $(PHP_PSI_SRCDIR)/src/calc/%.h | $(PHP_PSI_BUILDDIR)/calc
+	@cat >$@ <$<
 $(PHP_PSI_BUILDDIR)/types:
 	mkdir -p $@
 $(PHP_PSI_BUILDDIR)/types/%.h: $(PHP_PSI_SRCDIR)/src/types/%.h | $(PHP_PSI_BUILDDIR)/types
@@ -18,25 +22,26 @@ $(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
+$(PHP_PSI_SRCDIR)/src/parser_scan.re: $(PHP_PSI_SRCDIR)/src/parser_proc.h
 	touch $@
-$(PHP_PSI_SRCDIR)/src/parser.c: $(PHP_PSI_SRCDIR)/src/parser.re
+$(PHP_PSI_SRCDIR)/src/parser_scan.c: $(PHP_PSI_SRCDIR)/src/parser_scan.re
 	# 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_PSI_SRCDIR)/src/calc/%.h: $(PHP_PSI_SRCDIR)/scripts/gen_calc_%.php $(PHP_PSI_SRCDIR)/scripts/_include.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/unary.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_GENERATED)
-	$(CC) -MM -MG -MF $@ -MT $(patsubst $(PHP_PSI_SRCDIR)/%,$(PHP_PSI_BUILDDIR)/%,$(@:.dep=.lo)) \
+	@echo Generating $@ ...
+	@$(CC) -MM -MG -MF $@ -MT $(patsubst $(PHP_PSI_SRCDIR)/%,$(PHP_PSI_BUILDDIR)/%,$(@:.dep=.lo)) \
 		$(CPPFLAGS) $(DEFS) $(INCLUDES) $< \
 			|| touch $@
 
@@ -70,19 +75,6 @@ psi-clean: psi-clean-objects
 psi-clean-generated:
 	-rm -f $(PHP_PSI_GENERATED)
 
-.PHONY: psi-clean-aux
-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
-
 .PHONY: psi-clean-depend
 psi-clean-depend:
 	-rm -f $(PHP_PSI_DEPEND)
@@ -93,8 +85,23 @@ psi-clean: psi-clean-depend
 psi-watch:
 	-while inotifywait -q -e modify -r $(PHP_PSI_SRCDIR); do $(MAKE); done
 
+.PHONY: psi-paranoid-backups
+psi-paranoid-backups:
+	@-if test -z "$(REPO)"; then \
+		echo; \
+		echo "Usage: make psi-paranoid-backups REPO=<repo to push to>"; \
+		echo; \
+	else \
+		echo "Watching $(PHP_PSI_SRCDIR) for changes to flush and push to $(REPO) ..."; \
+		while inotifywait -q -e modify -r $(PHP_PSI_SRCDIR); do \
+			git ci -am flush; \
+			git push $(REPO); \
+		done; \
+	fi
+
 install-headers: psi-build-headers
-clean: psi-clean-headers psi-clean-aux
+clean: psi-clean-headers
 ifneq ($(PSI_DEPS),)
 clean: psi-clean-depend
 endif
+