cvs: php4 /build rules_common.mk /sapi/cgi cgi_main.c

thies Fri May 18 07:40:02 2001 EDT Modified files: /php4/build rules_common.mk /php4/sapi/cgi cgi_main.c Log: revert parts of last commit - stupid me! Index: php4/build/rules_common.mk diff -u php4/build/rules_common.mk:1.7 php4/build/rules_common.mk:1.8 --- php4/build/rules_common.mk:1.7 Fri May 18 07:32:05 2001 +++ php4/build/rules_common.mk Fri May 18 07:40:02 2001 @@ -14,7 +14,7 @@ # | Authors: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: rules_common.mk,v 1.7 2001/05/18 14:32:05 thies Exp $ +# $Id: rules_common.mk,v 1.8 2001/05/18 14:40:02 thies Exp $ # include $(top_builddir)/config_vars.mk @@ -23,10 +23,10 @@ COMPILE = $(CC) $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) CXX_COMPILE = $(CXX) $(COMMON_FLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) -SHARED_COMPILE = $(SHARED_LIBTOOL) --silent --mode=compile $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) -prefer-pic $(EXTRA_CFLAGS) -c $< && touch $@ -CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --silent --mode=compile $(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) -prefer-pic $(EXTRA_CXXFLAGS) -c $< && touch $@ +SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) -prefer-pic $(EXTRA_CFLAGS) -c $< && touch $@ +CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) -prefer-pic $(EXTRA_CXXFLAGS) -c $< && touch $@ -LINK = $(LIBTOOL) --silent --mode=link $(COMPILE) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LDFLAGS) -o $@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p INSTALL = $(top_srcdir)/build/shtool install -c @@ -42,36 +42,28 @@ .SUFFIXES: .slo .c $(CXX_SUFFIX) .lo .o .s .y .l .c.o: - @echo Compiling $< - @$(COMPILE) -c $< + $(COMPILE) -c $< $(CXX_SUFFIX).o: - @echo Compiling $< - @$(CXX_COMPILE) -c $< + $(CXX_COMPILE) -c $< .s.o: - @echo Compiling $< - @$(COMPILE) -c $< + $(COMPILE) -c $< .c.lo: - @echo Compiling $< - @$(PHP_COMPILE) + $(PHP_COMPILE) $(CXX_SUFFIX).lo: - @echo Compiling $< - @$(CXX_PHP_COMPILE) + $(CXX_PHP_COMPILE) .s.lo: - @echo Compiling $< - @$(PHP_COMPILE) + $(PHP_COMPILE) .c.slo: - @echo Compiling $< - @$(SHARED_COMPILE) + $(SHARED_COMPILE) $(CXX_SUFFIX).slo: - @echo Compiling $< - @$(CXX_SHARED_COMPILE) + $(CXX_SHARED_COMPILE) .y.c: $(YACC) $(YFLAGS) $< && mv y.tab.c $*.c Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.108 php4/sapi/cgi/cgi_main.c:1.109 --- php4/sapi/cgi/cgi_main.c:1.108 Fri May 18 07:32:05 2001 +++ php4/sapi/cgi/cgi_main.c Fri May 18 07:40:02 2001 @@ -749,7 +749,6 @@ } php_request_shutdown((void *) 0); - php_module_shutdown(); STR_FREE(SG(request_info).path_translated); @@ -760,6 +759,7 @@ #ifdef ZTS tsrm_shutdown(); #endif + return exit_status; }