Skip to content

Commit

Permalink
Fix out of sources tree (#117)
Browse files Browse the repository at this point in the history
  • Loading branch information
remicollet authored Oct 23, 2024
1 parent d71d990 commit ca53fa4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
11 changes: 6 additions & 5 deletions Makefile.frag
Original file line number Diff line number Diff line change
@@ -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))
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ca53fa4

Please sign in to comment.