diff options
| -rw-r--r-- | build/rules_pear.mk | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/build/rules_pear.mk b/build/rules_pear.mk index 72fab825aa..c500ce4146 100644 --- a/build/rules_pear.mk +++ b/build/rules_pear.mk @@ -26,12 +26,10 @@ include $(DEPTH)/config_vars.mk -INCLUDES += $(EXTRA_INCLUDES) -CFLAGS += $(EXTRA_CFLAGS) -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -f -p INSTALL = $(top_srcdir)/build/shtool install -c INSTALL_DATA = $(INSTALL) -m 644 @@ -72,7 +70,6 @@ top_builddir = $(DEPTH) .l.c: $(LEX) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@ - ################################# # Simplified Makefile @@ -81,25 +78,41 @@ install: shared install-modules ################################# -#all: all-recursive $(targets) +#all: all-recursive +install: install-recursive -depend-recursive clean-recursive all-recursive install-recursive: - @target=`echo $@|sed s/-recursive//`; \ - if test '$(NO_RECURSION)' != "$$target"; then \ +distclean-recursive depend-recursive clean-recursive all-recursive install-recursive: + @otarget=`echo $@|sed s/-recursive//`; \ + if test '$(NO_RECURSION)' != "$$otarget"; then \ list='$(SUBDIRS)'; for i in $$list; do \ + target="$$otarget"; \ echo "Making $$target in $$i"; \ - test "$$i" = "." || (cd $$i && $(MAKE) $$target) || exit 1; \ + if test "$$i" = "."; then \ + ok=yes; \ + target="$$target-p"; \ + fi; \ + (cd $$i && $(MAKE) $$target) || exit 1; \ done; \ + test "$otarget" = "all" && test -z '$(targets)' && ok=yes; \ + test "$ok" = "yes" || $(MAKE) "$$otarget-p" || exit 1; \ fi; +all-p: $(targets) +install-p: $(targets) $(install_targets) +distclean-p depend-p clean-p: + depend: depend-recursive - test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) *.c > .deps + test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) *.c > .deps + +clean: clean-recursive clean-x -clean: clean-recursive +clean-x: rm -f $(targets) *.lo *.la *.o $(CLEANFILES) rm -rf .libs -#install: install-recursive $(targets) $(install_targets) +distclean: distclean-recursive clean-x + rm -f config.cache config.log config.status config_vars.mk libtool \ + php_config.h stamp-h Makefile build-defs.h php4.spec libphp4.module install-modules: @test -d modules && \ @@ -111,4 +124,6 @@ install-modules: include $(srcdir)/.deps .PHONY: all-recursive clean-recursive install-recursive \ -$(install_targets) install all clean depend depend-recursive shared +$(install_targets) install all clean depend depend-recursive shared \ +distclean-recursive distclean clean-x all-p install-p distclean-p \ +depend-p clean-p |