cvs: php4 / Makefile.in configure.in php4dll.dsp php4dllts.dsp /build/ rules.mk rules_pear.mk /core/ Makefile.in

sas Sun Jun 11 11:16:38 2000 EDT Added files: /php4/core Makefile.in Modified files: /php4 Makefile.in configure.in php4dll.dsp php4dllts.dsp /php4/build rules.mk rules_pear.mk Log: Prepare move of the top-level source files to the core directory. Index: php4/Makefile.in diff -u php4/Makefile.in:1.93 php4/Makefile.in:1.94 --- php4/Makefile.in:1.93 Fri Jun 9 10:19:26 2000 +++ php4/Makefile.in Sun Jun 11 11:16:37 2000 @@ -1,19 +1,14 @@ ZEND_DIR = $(srcdir)/Zend -SUBDIRS = Zend ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR) +SUBDIRS = Zend core ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR) LTLIBRARY_NAME = libphp4.la +LTLIBRARY_SOURCES = stub.c -LTLIBRARY_SOURCES = \ - main.c internal_functions.c snprintf.c php_sprintf.c \ - configuration-parser.c configuration-scanner.c \ - safe_mode.c fopen-wrappers.c php_realpath.c alloca.c \ - php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ - strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c php_virtual_cwd.c - LTLIBRARY_DEPENDENCIES = \ Zend/libZend.la \ sapi/$(PHP_SAPI)/libsapi.la \ + core/libcore.la \ $(REGEX_LIB) \ $(EXT_LTLIBS) \ $(TSRM_LIB) @@ -57,14 +52,5 @@ install-su: install-modules (cd pear && $(MAKE) install) - -configuration-parser.h configuration-parser.c: $(srcdir)/configuration-parser.y - $(YACC) -p cfg -v -d $< -o configuration-parser.c - -configuration-scanner.c: $(srcdir)/configuration-scanner.l - $(LEX) -Pcfg -o$@ -i $< - -internal_functions.c: internal_functions.c.in config.status - CONFIG_FILES= CONFIG_HEADERS= ./config.status .NOEXPORT: Index: php4/configure.in diff -u php4/configure.in:1.144 php4/configure.in:1.145 --- php4/configure.in:1.144 Sun Jun 11 03:38:37 2000 +++ php4/configure.in Sun Jun 11 11:16:37 2000 @@ -1,11 +1,11 @@ -dnl ## $Id: configure.in,v 1.144 2000/06/11 10:38:37 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.145 2000/06/11 18:16:37 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) -AC_INIT(main.c) +AC_INIT(README.CVS-RULES) -PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile) +PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile core/Makefile) if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then AC_MSG_ERROR(--with-shared-apache is not supported. Please refer to the documentation for using APXS) @@ -629,7 +629,7 @@ fi if test "$abs_srcdir" != "$abs_builddir"; then - INCLUDES="$INCLUDES -I\$(top_srcdir)/Zend" + INCLUDES="$INCLUDES -I\$(top_srcdir)/core -I\$(top_srcdir)/Zend" if test "$PHP_THREAD_SAFETY" = "yes"; then INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM" fi @@ -827,15 +827,15 @@ if true; then # Hacking while airborne considered harmful. # - echo "creating internal_functions.c" + echo "creating core/internal_functions.c" extensions=\grep '^s.@EXT_STATIC@' \$0|sed -e 's/^.*@% *//' -e 's/%.*$//'\ - mv -f internal_functions.c internal_functions.c.old 2>/dev/null - sh $srcdir/genif.sh $srcdir/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" \$extensions > internal_functions.c - if cmp internal_functions.c.old internal_functions.c > /dev/null 2>&1; then - echo "internal_functions.c is unchanged" - mv internal_functions.c.old internal_functions.c + mv -f core/internal_functions.c core/internal_functions.c.old 2>/dev/null + sh $srcdir/genif.sh $srcdir/core/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" \$extensions > core/internal_functions.c + if cmp core/internal_functions.c.old core/internal_functions.c > /dev/null 2>&1; then + echo "core/internal_functions.c is unchanged" + mv core/internal_functions.c.old core/internal_functions.c else - rm -f internal_functions.c.old + rm -f core/internal_functions.c.old fi if test -n "$PHP_APXS_BROKEN"; then Index: php4/php4dll.dsp diff -u php4/php4dll.dsp:1.44 php4/php4dll.dsp:1.45 --- php4/php4dll.dsp:1.44 Wed Jun 7 11:10:21 2000 +++ php4/php4dll.dsp Sun Jun 11 11:16:37 2000 @@ -140,7 +140,7 @@ # End Source File # Begin Source File -SOURCE=.\internal_functions_win32.c +SOURCE=.\core\internal_functions_win32.c !IF "$(CFG)" == "php4dll - Win32 Debug" @@ -159,11 +159,11 @@ # End Source File # Begin Source File -SOURCE=.\main.c +SOURCE=.\core\main.c # End Source File # Begin Source File -SOURCE=.\mergesort.c +SOURCE=.\core\mergesort.c # End Source File # Begin Source File @@ -171,27 +171,27 @@ # End Source File # Begin Source File -SOURCE=.\php_content_types.c +SOURCE=.\core\php_content_types.c # End Source File # Begin Source File -SOURCE=.\php_ini.c +SOURCE=.\core\php_ini.c # End Source File # Begin Source File -SOURCE=.\php_realpath.c +SOURCE=.\core\php_realpath.c # End Source File # Begin Source File -SOURCE=.\php_ticks.c +SOURCE=.\core\php_ticks.c # End Source File # Begin Source File -SOURCE=.\php_variables.c +SOURCE=.\core\php_variables.c # End Source File # Begin Source File -SOURCE=.\php_virtual_cwd.c +SOURCE=.\core\php_virtual_cwd.c # End Source File # Begin Source File @@ -199,27 +199,27 @@ # End Source File # Begin Source File -SOURCE=.\reentrancy.c +SOURCE=.\core\reentrancy.c # End Source File # Begin Source File -SOURCE=.\rfc1867.c +SOURCE=.\core\rfc1867.c # End Source File # Begin Source File -SOURCE=.\safe_mode.c +SOURCE=.\core\safe_mode.c # End Source File # Begin Source File -SOURCE=.\SAPI.c +SOURCE=.\core\SAPI.c # End Source File # Begin Source File -SOURCE=.\strlcat.c +SOURCE=.\core\strlcat.c # End Source File # Begin Source File -SOURCE=.\strlcpy.c +SOURCE=.\core\strlcpy.c # End Source File # End Group # Begin Group "Header Files" @@ -227,7 +227,7 @@ # PROP Default_Filter "" # Begin Source File -SOURCE=.\config.w32.h +SOURCE=.\core\config.w32.h # End Source File # Begin Source File @@ -243,59 +243,59 @@ # End Source File # Begin Source File -SOURCE=.\getopt.h +SOURCE=.\core\getopt.h # End Source File # Begin Source File -SOURCE=.\internal_functions_registry.h +SOURCE=.\core\internal_functions_registry.h # End Source File # Begin Source File -SOURCE=.\logos.h +SOURCE=.\core\logos.h # End Source File # Begin Source File -SOURCE=.\main.h +SOURCE=.\core\main.h # End Source File # Begin Source File -SOURCE=.\output.h +SOURCE=.\core\output.h # End Source File # Begin Source File -SOURCE=.\php.h +SOURCE=.\core\php.h # End Source File # Begin Source File -SOURCE=.\php3_compat.h +SOURCE=.\core\php3_compat.h # End Source File # Begin Source File -SOURCE=.\php_content_types.h +SOURCE=.\core\php_content_types.h # End Source File # Begin Source File -SOURCE=.\php_globals.h +SOURCE=.\core\php_globals.h # End Source File # Begin Source File -SOURCE=.\php_ini.h +SOURCE=.\core\php_ini.h # End Source File # Begin Source File -SOURCE=.\php_realpath.h +SOURCE=.\core\php_realpath.h # End Source File # Begin Source File -SOURCE=.\php_ticks.h +SOURCE=.\core\php_ticks.h # End Source File # Begin Source File -SOURCE=.\php_variables.h +SOURCE=.\core\php_variables.h # End Source File # Begin Source File -SOURCE=.\php_virtual_cwd.h +SOURCE=.\core\php_virtual_cwd.h # End Source File # Begin Source File @@ -303,19 +303,19 @@ # End Source File # Begin Source File -SOURCE=.\rfc1867.h +SOURCE=.\core\rfc1867.h # End Source File # Begin Source File -SOURCE=.\safe_mode.h +SOURCE=.\core\safe_mode.h # End Source File # Begin Source File -SOURCE=.\SAPI.h +SOURCE=.\core\SAPI.h # End Source File # Begin Source File -SOURCE=.\win95nt.h +SOURCE=.\core\win95nt.h # End Source File # End Group # End Group Index: php4/php4dllts.dsp diff -u php4/php4dllts.dsp:1.71 php4/php4dllts.dsp:1.72 --- php4/php4dllts.dsp:1.71 Wed Jun 7 11:10:21 2000 +++ php4/php4dllts.dsp Sun Jun 11 11:16:37 2000 @@ -140,40 +140,40 @@ # End Source File # Begin Source File -SOURCE=.\internal_functions_win32.c +SOURCE=.\core\internal_functions_win32.c # ADD CPP /I "ext\xml\expat\xmltok" /I "ext\xml\expat\xmlparse" # End Source File # Begin Source File -SOURCE=.\main.c +SOURCE=.\core\main.c # End Source File # Begin Source File -SOURCE=.\mergesort.c +SOURCE=.\core\mergesort.c # End Source File # Begin Source File -SOURCE=.\php_content_types.c +SOURCE=.\core\php_content_types.c # End Source File # Begin Source File -SOURCE=.\php_ini.c +SOURCE=.\core\php_ini.c # End Source File # Begin Source File -SOURCE=.\php_realpath.c +SOURCE=.\core\php_realpath.c # End Source File # Begin Source File -SOURCE=.\php_ticks.c +SOURCE=.\core\php_ticks.c # End Source File # Begin Source File -SOURCE=.\php_variables.c +SOURCE=.\core\php_variables.c # End Source File # Begin Source File -SOURCE=.\php_virtual_cwd.c +SOURCE=.\core\php_virtual_cwd.c # End Source File # Begin Source File @@ -181,27 +181,27 @@ # End Source File # Begin Source File -SOURCE=.\reentrancy.c +SOURCE=.\core\reentrancy.c # End Source File # Begin Source File -SOURCE=.\rfc1867.c +SOURCE=.\core\rfc1867.c # End Source File # Begin Source File -SOURCE=.\safe_mode.c +SOURCE=.\core\safe_mode.c # End Source File # Begin Source File -SOURCE=.\SAPI.c +SOURCE=.\core\SAPI.c # End Source File # Begin Source File -SOURCE=.\strlcat.c +SOURCE=.\core\strlcat.c # End Source File # Begin Source File -SOURCE=.\strlcpy.c +SOURCE=.\core\strlcpy.c # End Source File # End Group # Begin Group "Header Files" @@ -209,7 +209,7 @@ # PROP Default_Filter "" # Begin Source File -SOURCE=.\config.w32.h +SOURCE=.\core\config.w32.h # End Source File # Begin Source File @@ -225,63 +225,63 @@ # End Source File # Begin Source File -SOURCE=.\getopt.h +SOURCE=.\core\getopt.h # End Source File # Begin Source File -SOURCE=.\internal_functions_registry.h +SOURCE=.\core\internal_functions_registry.h # End Source File # Begin Source File -SOURCE=.\logos.h +SOURCE=.\core\logos.h # End Source File # Begin Source File -SOURCE=.\main.h +SOURCE=.\core\main.h # End Source File # Begin Source File -SOURCE=.\output.h +SOURCE=.\core\output.h # End Source File # Begin Source File -SOURCE=.\php.h +SOURCE=.\core\php.h # End Source File # Begin Source File -SOURCE=.\php3_compat.h +SOURCE=.\core\php3_compat.h # End Source File # Begin Source File -SOURCE=.\php_compat.h +SOURCE=.\core\php_compat.h # End Source File # Begin Source File -SOURCE=.\php_content_types.h +SOURCE=.\core\php_content_types.h # End Source File # Begin Source File -SOURCE=.\php_globals.h +SOURCE=.\core\php_globals.h # End Source File # Begin Source File -SOURCE=.\php_ini.h +SOURCE=.\core\php_ini.h # End Source File # Begin Source File -SOURCE=.\php_realpath.h +SOURCE=.\core\php_realpath.h # End Source File # Begin Source File -SOURCE=.\php_regex.h +SOURCE=.\core\php_regex.h # End Source File # Begin Source File -SOURCE=.\php_variables.h +SOURCE=.\core\php_variables.h # End Source File # Begin Source File -SOURCE=.\php_virtual_cwd.h +SOURCE=.\core\php_virtual_cwd.h # End Source File # Begin Source File @@ -289,19 +289,19 @@ # End Source File # Begin Source File -SOURCE=.\rfc1867.h +SOURCE=.\core\rfc1867.h # End Source File # Begin Source File -SOURCE=.\safe_mode.h +SOURCE=.\core\safe_mode.h # End Source File # Begin Source File -SOURCE=.\SAPI.h +SOURCE=.\core\SAPI.h # End Source File # Begin Source File -SOURCE=.\win95nt.h +SOURCE=.\core\win95nt.h # End Source File # End Group # End Group @@ -808,10 +808,6 @@ # Begin Source File SOURCE=.\ext\xml\expat\xmltok\asciitab.h -# End Source File -# Begin Source File - -SOURCE=.\hashtable.h # End Source File # Begin Source File Index: php4/build/rules.mk diff -u php4/build/rules.mk:1.16 php4/build/rules.mk:1.17 --- php4/build/rules.mk:1.16 Mon Jun 5 17:01:29 2000 +++ php4/build/rules.mk Sun Jun 11 11:16:37 2000 @@ -21,7 +21,7 @@ # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ############################################################################## -# $Id: rules.mk,v 1.16 2000/06/06 00:01:29 neotron Exp $ +# $Id: rules.mk,v 1.17 2000/06/11 18:16:37 sas Exp $ # include $(top_builddir)/config_vars.mk @@ -34,7 +34,7 @@ INSTALL = $(top_srcdir)/build/shtool install -c INSTALL_DATA = $(INSTALL) -m 644 SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< && touch $@ -DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(top_builddir) +DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/core moduledir = $(EXTENSION_DIR) Index: php4/build/rules_pear.mk diff -u php4/build/rules_pear.mk:1.7 php4/build/rules_pear.mk:1.8 --- php4/build/rules_pear.mk:1.7 Thu May 4 10:50:32 2000 +++ php4/build/rules_pear.mk Sun Jun 11 11:16:37 2000 @@ -21,7 +21,7 @@ # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ############################################################################## -# $Id: rules_pear.mk,v 1.7 2000/05/04 17:50:32 sas Exp $ +# $Id: rules_pear.mk,v 1.8 2000/06/11 18:16:37 sas Exp $ # include $(top_builddir)/config_vars.mk @@ -34,7 +34,7 @@ INSTALL = $(top_srcdir)/build/shtool install -c INSTALL_DATA = $(INSTALL) -m 644 SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< && touch $@ -DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(top_builddir) +DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/core moduledir = $(EXTENSION_DIR) Index: php4/core/Makefile.in +++ php4/core/Makefile.in LTLIBRARY_NAME = libcore.la LTLIBRARY_SOURCES = \ main.c internal_functions.c snprintf.c php_sprintf.c \ configuration-parser.c configuration-scanner.c \ safe_mode.c fopen-wrappers.c php_realpath.c alloca.c \ php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c php_virtual_cwd.c include $(top_srcdir)/build/ltlib.mk configuration-parser.h configuration-parser.c: $(srcdir)/configuration-parser.y $(YACC) -p cfg -v -d $< -o configuration-parser.c configuration-scanner.c: $(srcdir)/configuration-scanner.l $(LEX) -Pcfg -o$@ -i $< internal_functions.c: internal_functions.c.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_FILES= CONFIG_HEADERS= ./config.status