update lemon

[m6w6/ext-psi] / Makefile.frag

diff --git a/Makefile.frag b/Makefile.frag
index e904edfccb1ef8b631a5a2c7883d4f0e2deb6887..c31b9d971f092e2f711cb5bd35d65e26c4d8d9a2 100644 (file)
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -19,7 +19,6 @@ 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:
@@ -36,10 +35,10 @@ 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"
+       curl -sSo $@ "http://www.sqlite.org/src/raw/tool/lempar.c?name=db1bdb4821f2d8fbd76e577cf3ab18642c8d08d1"
 
 lemon.c:
-       curl -sSo $@ "http://www.sqlite.org/src/raw/tool/lemon.c?name=799e73e19a33b8dd7767a7fa34618ed2a9c2397d"
+       curl -sSo $@ "http://www.sqlite.org/src/raw/tool/lemon.c?name=5ccba178a8e8a4b21e1c9232944d23973da38ad7"
 
 ./lemon: lemon.c | lempar.c
        $(CC) -o $@ $<
@@ -61,15 +60,26 @@ $(PHP_PSI_SRCDIR)/src/parser.c: $(PHP_PSI_SRCDIR)/src/parser.re
 $(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
 
-PHP_PSI_DEPEND = $(PHP_PSI_BUILDDIR)/Makefile.deps
+# -- deps
 
-depend: psi-depend
-.PHONY: psi-depend
-psi-depend: $(PHP_PSI_DEPEND)
+PHP_PSI_DEPEND = $(patsubst $(PHP_PSI_SRCDIR)/%,$(PHP_PSI_BUILDDIR)/%,$(PHP_PSI_SOURCES:.c=.dep))
 
-$(PHP_PSI_DEPEND): $(PHP_PSI_SOURCES)
-       $(CC) -MM -MG $(CPPFLAGS) $(DEFS) $(INCLUDES) $^ \
-               | $(SED) -e 's/^\(.*\).o: /\1.lo: /' \
-               > $@
+.PHONY: psi-clean-depend
+psi-clean-depend:
+       -rm -f $(PHP_PSI_DEPEND) $(PHP_PSI_BUILDDIR)/php_psi.dep
 
+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) $< \
+                       || touch $@
+
+DEPS = 
+ifneq  ($(DEPS),)
 -include $(PHP_PSI_DEPEND)
+-include $(PHP_PSI_BUILDDIR)/php_psi.dep
+endif
+
+
+# -- deps