Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions Makefile.global
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,32 @@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
INSTALL = $(top_srcdir)/build/shtool install -c
INSTALL_DATA = $(INSTALL) -m 644

DEFAULT_VERBOSITY = 0
V_GEN = $(v_GEN_$(V))
v_GEN_ = $(v_GEN_$(DEFAULT_VERBOSITY))
v_GEN_0 = @echo " GEN " $@;
v_GEN_1 =

V_CC = $(v_CC_$(V))
v_CC_ = $(v_CC_$(DEFAULT_VERBOSITY))
v_CC_0 = @echo " CC " $@;
v_CC_1 =

V_CXX = $(v_CXX_$(V))
v_CXX_ = $(v_CXX_$(DEFAULT_VERBOSITY))
v_CXX_0 = @echo " CXX " $@;
v_CXX_1 =

V_CCLD = $(v_CCLD_$(V))
v_CCLD_ = $(v_CCLD_$(DEFAULT_VERBOSITY))
v_CCLD_0 = @echo " CCLD " $@;
v_CCLD_1 =

V_CXXLD = $(v_CXXLD_$(V))
v_CXXLD_ = $(v_CXXLD_$(DEFAULT_VERBOSITY))
v_CXXLD_0 = @echo " CXXLD " $@;
v_CXXLD_1 =

DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)

Expand Down
14 changes: 7 additions & 7 deletions acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -806,10 +806,10 @@ dnl
dnl PHP_BUILD_PROGRAM
dnl
AC_DEFUN([PHP_BUILD_PROGRAM],[
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_pre='$(V_CC)$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
php_cxx_pre='$(V_CXX)$(LIBTOOL) --mode=compile $(CXX)'
php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
php_cxx_post=
php_lo=lo
Expand All @@ -819,10 +819,10 @@ AC_DEFUN([PHP_BUILD_PROGRAM],[
no) pic_setting='-prefer-non-pic';;
esac

shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
shared_c_pre='$(V_CC)$(LIBTOOL) --mode=compile $(CC)'
shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
shared_c_post=
shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
shared_cxx_pre='$(V_CXX)$(LIBTOOL) --mode=compile $(CXX)'
shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
shared_cxx_post=
shared_lo=lo
Expand All @@ -840,15 +840,15 @@ AC_DEFUN([PHP_SHARED_MODULE],[
case $host_alias in
*aix*[)]
suffix=so
link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$3'/$1.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) && mv -f '$3'/.libs/$1.so '$3'/$1.so'
link_cmd='ifelse($4,,[$(V_CCLD)],[$(V_CXXLD)])$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$3'/$1.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) && mv -f '$3'/.libs/$1.so '$3'/$1.so'
;;
*netware*[)]
suffix=nlm
link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) ifelse($1, php7lib, , -L$(top_builddir)/netware -lphp7lib) $(translit(ifelse($1, php7lib, $1, m4_substr($1, 3)),a-z_-,A-Z__)_SHARED_LIBADD)'
link_cmd='ifelse($4,,[$(V_CCLD)],[$(V_CXXLD)])$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) ifelse($1, php7lib, , -L$(top_builddir)/netware -lphp7lib) $(translit(ifelse($1, php7lib, $1, m4_substr($1, 3)),a-z_-,A-Z__)_SHARED_LIBADD)'
;;
*[)]
suffix=la
link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
link_cmd='ifelse($4,,[$(V_CCLD)],[$(V_CXXLD)])$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion sapi/cgi/Makefile.frag
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cgi: $(SAPI_CGI_PATH)

$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS)
$(BUILD_CGI)
$(V_GEN)$(BUILD_CGI)

install-cgi: $(SAPI_CGI_PATH)
@echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/"
Expand Down
2 changes: 1 addition & 1 deletion sapi/cli/Makefile.frag
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cli: $(SAPI_CLI_PATH)

$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
$(BUILD_CLI)
$(V_GEN)$(BUILD_CLI)

install-cli: $(SAPI_CLI_PATH)
@echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/"
Expand Down
4 changes: 2 additions & 2 deletions sapi/phpdbg/Makefile.frag
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ phpdbg: $(BUILD_BINARY)
phpdbg-shared: $(BUILD_SHARED)

$(BUILD_SHARED): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
$(BUILD_PHPDBG_SHARED)
$(V_GEN)$(BUILD_PHPDBG_SHARED)

$(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
$(BUILD_PHPDBG)
$(V_GEN)$(BUILD_PHPDBG)

%.c: %.y
%.c: %.l
Expand Down