Justtechjobs.com Find a programming school near you






Online Campus Both


php4-beta | 199912

[PHP4BETA] cvs: /php4/build rules_pear.mk From: Sascha Schumann (sascha <email protected>)
Date: 12/30/99

sas Thu Dec 30 19:18:39 1999 EDT

  Modified files:
    /php4/build rules_pear.mk
  Log:
  Synchronize with rules.mk
  
  
Index: php4/build/rules_pear.mk
diff -u php4/build/rules_pear.mk:1.1 php4/build/rules_pear.mk:1.2
--- php4/build/rules_pear.mk:1.1 Wed Dec 29 21:58:32 1999
+++ php4/build/rules_pear.mk Thu Dec 30 19:18:08 1999
@@ -21,17 +21,15 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 ##############################################################################
-# $Id: rules_pear.mk,v 1.1 1999/12/30 02:58:32 sas Exp $
+# $Id: rules_pear.mk,v 1.2 1999/12/31 00:18:08 sas Exp $
 #
 
 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 @@
 .l.c:
         $(LEX) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@
 
-
 #################################
 # Simplified Makefile
 
@@ -81,25 +78,41 @@
 
 #################################
 
-#all: all-recursive $(targets)
+#all: all-recursive
+install: install-recursive
 
-depend-recursive clean-recursive all-recursive install-recursive:
-  <email protected>=`echo $@|sed s/-recursive//`; \
- if test '$(NO_RECURSION)' != "$$target"; then \
+distclean-recursive depend-recursive clean-recursive all-recursive install-recursive:
+  <email protected>=`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:
          <email protected> -d modules && \
@@ -111,4 +124,6 @@
 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 

-- 
PHP 4.0 Beta Mailing List <http://www.php.net/version4/>
To unsubscribe, e-mail: php4beta-unsubscribe <email protected>
For additional commands, e-mail: php4beta-help <email protected>
To contact the list administrators, e-mail: php4beta-admin <email protected>