jbboehr
diff --git a/‎.gitattributes
+4-3 b/‎.gitattributes
+4-3
diff --git a/‎config.m4
+17-15 b/‎config.m4
+17-15
diff --git a/‎package.xml
+17-17 b/‎package.xml
+17-17
diff --git a/‎compiler.c ‎src/compiler.c b/‎compiler.c ‎src/compiler.c
diff --git a/‎exceptions.c ‎src/exceptions.c b/‎exceptions.c ‎src/exceptions.c
diff --git a/‎impl.c ‎src/impl.c b/‎impl.c ‎src/impl.c
diff --git a/‎opcode.c ‎src/opcode.c b/‎opcode.c ‎src/opcode.c
diff --git a/‎options.c ‎src/options.c b/‎options.c ‎src/options.c
diff --git a/‎parser.c ‎src/parser.c b/‎parser.c ‎src/parser.c
diff --git a/‎php_handlebars.c ‎src/php_handlebars.c b/‎php_handlebars.c ‎src/php_handlebars.c
diff --git a/‎program.c ‎src/program.c b/‎program.c ‎src/program.c
diff --git a/‎registry.c ‎src/registry.c b/‎registry.c ‎src/registry.c
diff --git a/‎safe_string.c ‎src/safe_string.c b/‎safe_string.c ‎src/safe_string.c
diff --git a/‎token.c ‎src/token.c b/‎token.c ‎src/token.c
diff --git a/‎tokenizer.c ‎src/tokenizer.c b/‎tokenizer.c ‎src/tokenizer.c
diff --git a/‎utils.c ‎src/utils.c b/‎utils.c ‎src/utils.c
diff --git a/‎value.c ‎src/value.c b/‎value.c ‎src/value.c
diff --git a/‎vm.c ‎src/vm.c b/‎vm.c ‎src/vm.c
diff --git a/‎vendor/README.md
+7 b/‎vendor/README.md
+7
diff --git a/‎xxh3.h ‎vendor/xxh3.h b/‎xxh3.h ‎vendor/xxh3.h
diff --git a/‎xxhash.h ‎vendor/xxhash.h b/‎xxhash.h ‎vendor/xxhash.h
@@ -4,8 +4,9 @@
 .gitmodules         export-ignore
 .travis.yml         export-ignore
 spec                export-ignore
-m4/*                linguist-generated=true linguist-vendored=true
+m4/**               linguist-generated=true linguist-vendored=true
+vendor/**           linguist-generated=true linguist-vendored=true
 xxh3.h              linguist-generated=true linguist-vendored=true
 xxhash.h            linguist-generated=true linguist-vendored=true
-tests/handlebars    linguist-generated=true
-tests/mustache      linguist-generated=true
+tests/handlebars/** linguist-generated=true
+tests/mustache/**   linguist-generated=true
@@ -111,22 +111,24 @@ if test "$PHP_HANDLEBARS" != "no"; then
 
     # extension
     PHP_HANDLEBARS_ADD_SOURCES([
-        php_handlebars.c
-        impl.c
-        compiler.c
-        exceptions.c
-        opcode.c
-        options.c
-        parser.c
-        program.c
-        registry.c
-        safe_string.c
-        token.c
-        tokenizer.c
-        utils.c
-        vm.c
-        value.c
+        src/php_handlebars.c
+        src/impl.c
+        src/compiler.c
+        src/exceptions.c
+        src/opcode.c
+        src/options.c
+        src/parser.c
+        src/program.c
+        src/registry.c
+        src/safe_string.c
+        src/token.c
+        src/tokenizer.c
+        src/utils.c
+        src/vm.c
+        src/value.c
     ])
+    PHP_ADD_BUILD_DIR(src)
+    PHP_ADD_INCLUDE([vendor])
     PHP_INSTALL_HEADERS([ext/handlebars], [php_handlebars.h])
     PHP_NEW_EXTENSION(handlebars, $PHP_HANDLEBARS_SOURCES, $ext_shared)
     if test "$PHP_HANDLEBARS_PSR" != "no"; then
 
@@ -31,24 +31,24 @@
    <file name="LICENSE.md" role="doc" />
    <file name="README.md" role="doc" />
    <file name="config.m4" role="src" />
-   <file name="compiler.c" role="src" />
-   <file name="exceptions.c" role="src" />
-   <file name="impl.c" role="src" />
-   <file name="opcode.c" role="src" />
-   <file name="options.c" role="src" />
-   <file name="parser.c" role="src" />
-   <file name="php_handlebars.c" role="src" />
    <file name="php_handlebars.h" role="src" />
-   <file name="program.c" role="src" />
-   <file name="registry.c" role="src" />
-   <file name="safe_string.c" role="src" />
-   <file name="token.c" role="src" />
-   <file name="tokenizer.c" role="src" />
-   <file name="utils.c" role="src" />
-   <file name="value.c" role="src" />
-   <file name="vm.c" role="src" />
-   <file name="xxh3.h" role="src" />
-   <file name="xxhash.h" role="src" />
+   <file name="src/compiler.c" role="src" />
+   <file name="src/exceptions.c" role="src" />
+   <file name="src/impl.c" role="src" />
+   <file name="src/opcode.c" role="src" />
+   <file name="src/options.c" role="src" />
+   <file name="src/parser.c" role="src" />
+   <file name="src/php_handlebars.c" role="src" />
+   <file name="src/program.c" role="src" />
+   <file name="src/registry.c" role="src" />
+   <file name="src/safe_string.c" role="src" />
+   <file name="src/token.c" role="src" />
+   <file name="src/tokenizer.c" role="src" />
+   <file name="src/utils.c" role="src" />
+   <file name="src/value.c" role="src" />
+   <file name="src/vm.c" role="src" />
+   <file name="vendor/xxh3.h" role="src" />
+   <file name="vendor/xxhash.h" role="src" />
    <file name="examples/benchmarks.php" role="doc" />
    <file name="examples/benchmarks.sh" role="doc" />
    <file name="examples/block-expressions.php" role="doc" />