Makefile: optional deps

diff --git a/.gitignore b/.gitignore
index aa984d7ea3db2ceae5e227651e168f27d1817c01..b8e7d88967507efde7cbe4df1b58e74ca6797e99 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@ php_psi_unions.h
 /token.h
 /types.h
 /types/
+*.d

diff --git a/Makefile.frag b/Makefile.frag
index e904edfccb1ef8b631a5a2c7883d4f0e2deb6887..65e5ed7751993fdbe4d12d2ad660e5350d57dfc0 100644 (file)
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -61,15 +61,25 @@ $(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 = $(PHP_PSI_SOURCES:.c=.d)
 
-$(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)
 
+psi-clean: psi-clean-depend
+
+%.d: %.c
+       $(CC) -MM -MG -MF $@ -MT $(patsubst $(PHP_PSI_SRCDIR)/%,$(PHP_PSI_BUILDDIR)/%,$(@:.d=.lo)) \
+               $(CPPFLAGS) $(DEFS) $(INCLUDES) $< \
+                       || touch $@
+
+DEPS = 
+ifneq  ($(DEPS),)
 -include $(PHP_PSI_DEPEND)
+endif
+
+
+# -- deps

diff --git a/src/calc.h b/src/calc.h
index d8f9e18261803dba0e977688c9a14dd20cb44f7b..8e1ea6b01612821b90db5892a9b71f3215d4716f 100644 (file)
--- a/src/calc.h
+++ b/src/calc.h
@@ -27,7 +27,7 @@
 #define PSI_CALC_H
 
 #include "token.h"
-#include "impl_val.h"
+#include "types/impl_val.h"
 
 #define PRIfval "f"
 #define PRIdval "lf"

diff --git a/src/marshal.h b/src/marshal.h
index 6fe15c67f3606899a658d1f899ce40d9d7ae5da8..8067fb3f0f5914081a7d3e6b79e9dd0c57cdcec3 100644 (file)
--- a/src/marshal.h
+++ b/src/marshal.h
@@ -26,7 +26,7 @@
 #ifndef PSI_MARSHAL_H
 #define PSI_MARSHAL_H
 
-#include "impl_val.h"
+#include "types/impl_val.h"
 #include "Zend/zend_types.h"
 
 struct psi_let_exp;

diff --git a/src/types/impl_def_val.h b/src/types/impl_def_val.h
index d483d8ec4f3b21f8123e0c7970655f230ac16397..b5530bcca2d4bb2bdfaa25cdb02f0a96ff7136e3 100644 (file)
--- a/src/types/impl_def_val.h
+++ b/src/types/impl_def_val.h
@@ -27,7 +27,7 @@
 #define PSI_TYPES_IMPL_DEF_VAL_H
 
 #include "token.h"
-#include "impl_val.h"
+#include "types/impl_val.h"
 
 struct psi_data;
 struct psi_impl_type;