Two stage makefile include.

seanmorris · Jun 24, 2024 · 81da326 · 81da326
1 parent 16d4dcd
commit 81da326
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -241,6 +241,9 @@ ${PHP_ASSET_PATH}/${PRELOAD_NAME}.data: .cache/preload-collected
 	cp -Lprf packages/php-wasm/${PRELOAD_NAME}.data ${PHP_ASSET_PATH}/
 endif
 
+-include packages/php-cgi-wasm/pre.mak
+-include $(addsuffix /pre.mak,$(shell npm ls -p))
+
 -include packages/php-cgi-wasm/static.mak
 -include $(addsuffix /static.mak,$(shell npm ls -p))
 

diff --git a/packages/php-cgi-wasm/static.mak b/packages/php-cgi-wasm/static.mak
@@ -1,17 +1,5 @@
 #!/usr/bin/env make
 
-ifdef PHP_BUILDER_DIR
-PHP_CGI_DIST_DIR:=${PHP_BUILDER_DIR}/${PHP_CGI_DIST_DIR}
-PHP_CGI_ASSET_PATH:=${PHP_BUILDER_DIR}/${PHP_CGI_ASSET_PATH}
-endif
-PHP_CGI_DIST_DIR?=${ENV_DIR}/packages/php-cgi-wasm
-PHP_CGI_ASSET_PATH?=${PHP_CGI_DIST_DIR}
-
-ifneq (${SHARED_ASSET_PATHS},${PHP_CGI_ASSET_PATH})
-SHARED_ASSET_PATHS+= ${PHP_CGI_ASSET_PATH}
-endif
-
-.SECONDEXPANSION:
 ${ENV_DIR}/${PHP_CGI_ASSET_PATH}/${PRELOAD_NAME}.data: .cache/preload-collected
 	- $(if $${PRELOAD_ASSETS},cp -Lprf third_party/php${PHP_VERSION}-src/sapi/cgi/${PRELOAD_NAME}.data ${PHP_CGI_DIST_DIR})
 	- $(if $${PRELOAD_ASSETS},cp -Lprf ${PHP_CGI_DIST_DIR}/${PRELOAD_NAME}.data ${ENV_DIR}/${PHP_CGI_ASSET_PATH}/)