travis: update

[m6w6/ext-psi] / Makefile.frag

diff --git a/Makefile.frag b/Makefile.frag
index 59f2b0609eee4a2921ffa8181c2a11dc6eb846e4..92a8d5410035efcec6fdabeedf78e69ba312d683 100644 (file)
--- 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
@@ -81,12 +85,6 @@ psi-clean: psi-clean-depend
 psi-watch:
        -while inotifywait -q -e modify -r $(PHP_PSI_SRCDIR); do $(MAKE); done
 
-install-headers: psi-build-headers
-clean: psi-clean-headers
-ifneq ($(PSI_DEPS),)
-clean: psi-clean-depend
-endif
-
 .PHONY: psi-paranoid-backups
 psi-paranoid-backups:
        @-if test -z "$(REPO)"; then \
@@ -101,3 +99,9 @@ psi-paranoid-backups:
                done; \
        fi
 
+install-headers: psi-build-headers
+clean: psi-clean-headers
+ifneq ($(PSI_DEPS),)
+clean: psi-clean-depend
+endif
+