From: Michael Wallner <mike@php.net>
Date: Wed, 30 Sep 2015 13:05:59 +0000 (+0200)
Subject: Merge branch 'v1.0.x'
X-Git-Tag: release-2.0.0RC1~3
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-propro;a=commitdiff_plain;h=55c3639a82f5e3dad0bb2e913e55ba929c624e34;hp=6bb2f2584faf986f1b0b764f69e760b69163f48c

Merge branch 'v1.0.x'
---

diff --git a/.gitignore b/.gitignore
index 39fd0d8..a11c9e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ run-tests.php
 .libs/
 /php_propro_api.h
 /Doxyfile.bak
+!/Makefile.frag
diff --git a/Makefile.frag b/Makefile.frag
new file mode 100644
index 0000000..292b0d4
--- /dev/null
+++ b/Makefile.frag
@@ -0,0 +1,16 @@
+# provide headers in builddir, so they do not end up in /usr/include/ext/propro/src
+
+PHP_PROPRO_HEADERS := $(addprefix $(PHP_PROPRO_BUILDDIR)/,$(PHP_PROPRO_HEADERS))
+
+$(PHP_PROPRO_BUILDDIR)/%.h: $(PHP_PROPRO_SRCDIR)/src/%.h
+	@cat >$@ <$<
+
+all: propro-build-headers
+clean: propro-clean-headers
+
+.PHONY: propro-build-headers
+propro-build-headers: $(PHP_PROPRO_HEADERS)
+
+.PHONY: propro-clean-headers
+propro-clean-headers:
+	-rm -f $(PHP_PROPRO_HEADERS)
diff --git a/package.xml b/package.xml
index 2ed8460..48adba4 100644
--- a/package.xml
+++ b/package.xml
@@ -42,11 +42,12 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <file role="doc" name="README.md"/>
    <file role="doc" name="THANKS"/>
    <file role="doc" name="TODO"/>
+   <file role="doc" name="Doxyfile" />
    <file role="src" name="config.m4"/>
    <file role="src" name="config0.m4"/>
-   <file role="src" name="config.w32" />
-   <file role="doc" name="Doxyfile" />
-   <file role="src" name="php_propro.h" />
+   <file role="src" name="config.w32"/>
+   <file role="src" name="Makefile.frag"/>
+   <file role="src" name="php_propro.h"/>
    <dir name="src">
     <file role="src" name="php_propro_api.h"/>
     <file role="src" name="php_propro_api.c"/>