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

diff --git a/Makefile.frag b/Makefile.frag
index 4d3d726..78a3a33 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,37 +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)
-
-.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
-
-.PHONY: psi-clean
-psi-clean: psi-clean-headers psi-clean-sources psi-clean-aux
-
-
-lempar.c:
+$(PHP_PSI_BUILDDIR)/lempar.c:
 	curl -sSo $@ "http://www.sqlite.org/src/raw/tool/lempar.c?name=db1bdb4821f2d8fbd76e577cf3ab18642c8d08d1"
 
-lemon.c:
+$(PHP_PSI_BUILDDIR)/lemon.c:
 	curl -sSo $@ "http://www.sqlite.org/src/raw/tool/lemon.c?name=5ccba178a8e8a4b21e1c9232944d23973da38ad7"
 
-./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
@@ -50,23 +27,16 @@ $(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 $@ $<
 
-# -- deps
-
 PHP_PSI_DEPEND = $(patsubst $(PHP_PSI_SRCDIR)/%,$(PHP_PSI_BUILDDIR)/%,$(PHP_PSI_SOURCES:.c=.dep))
 
-.PHONY: psi-clean-depend
-psi-clean-depend:
-	-rm -f $(PHP_PSI_DEPEND)
-
-psi-clean: psi-clean-depend
-
 $(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) $< \
@@ -80,5 +50,39 @@ 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)
+
+.PHONY: psi-clean-headers
+psi-clean-headers:
+	-rm -f $(PHP_PSI_HEADERS)
+
+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
 
-# -- deps