From ca53fa4933a3e3fc63c5d971d8869d7fb7e0414f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 23 Oct 2024 18:55:52 +0200 Subject: [PATCH] Fix out of sources tree (#117) --- Makefile.frag | 11 ++++++----- config.m4 | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile.frag b/Makefile.frag index 266c3d6..a3c93c8 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -1,7 +1,7 @@ INT_DIR=$(builddir)/build/install CMAKE_BUILD_DIR=$(builddir)/cmake_build -GENERATE_STUBS=$(shell expr `php --version | head -1 | cut -f 2 -d' '` \>= 7.1) +GENERATE_STUBS=$(shell expr `$(PHP_EXECUTABLE) --version | head -1 | cut -f 2 -d' '` \>= 7.1) CMAKE = cmake3 ifeq (, $(shell which cmake3)) @@ -58,17 +58,18 @@ extension: $(builddir)/ext/awscrt.lo # Force the crt object target to depend on the CRT static library $(builddir)/ext/awscrt.lo: $(builddir)/ext/awscrt.c -$(builddir)/ext/awscrt.c: $(CMAKE_BUILD_DIR)/aws-crt-ffi-static/libaws-crt-ffi.a $(builddir)/ext/api.h $(builddir)/ext/awscrt_arginfo.h +$(builddir)/ext/awscrt.c: $(CMAKE_BUILD_DIR)/aws-crt-ffi-static/libaws-crt-ffi.a $(srcdir)/ext/api.h $(srcdir)/ext/awscrt_arginfo.h -$(builddir)/ext/awscrt_arginfo.h: $(srcdir)/ext/awscrt.stub.php $(srcdir)/gen_stub.php +$(srcdir)/ext/awscrt_arginfo.h: $(srcdir)/ext/awscrt.stub.php $(srcdir)/gen_stub.php ifeq ($(GENERATE_STUBS),1) # generate awscrt_arginfo.h - mkdir -p $(builddir)/ext && php $(srcdir)/gen_stub.php --minimal-arginfo $(srcdir)/ext/awscrt.stub.php + $(PHP_EXECUTABLE) $(srcdir)/gen_stub.php --minimal-arginfo $(srcdir)/ext/awscrt.stub.php endif # transform/install api.h from FFI lib $(srcdir)/ext/api.h: $(srcdir)/crt/aws-crt-ffi/src/api.h - php $(srcdir)/gen_api.php $(srcdir)/crt/aws-crt-ffi/src/api.h > $(srcdir)/ext/api.h + # generate api.h + $(PHP_EXECUTABLE) $(srcdir)/gen_api.php $(srcdir)/crt/aws-crt-ffi/src/api.h > $(srcdir)/ext/api.h # install api.h to ext/ as well $(builddir)/ext/api.h : $(srcdir)/ext/api.h diff --git a/config.m4 b/config.m4 index 2a257c3..2b4a40b 100644 --- a/config.m4 +++ b/config.m4 @@ -26,5 +26,6 @@ if test "$PHP_AWSCRT" != "no"; then # Sources for the PHP extension itself AWSCRT_SOURCES=ext/awscrt.c PHP_NEW_EXTENSION(awscrt, $AWSCRT_SOURCES, $ext_shared) + PHP_ADD_BUILD_DIR($ext_builddir/ext) PHP_ADD_MAKEFILE_FRAGMENT fi