Prepare move of the top-level source files to the core directory.

diff --git a/Makefile.in b/Makefile.in
index d220baf00a1b5a0a93b61adae340487b752a729b..70ffccfd3a23fca3677c4e99558c1c65610b4469 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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 = \
-       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_SOURCES = stub.c
 
 LTLIBRARY_DEPENDENCIES = \
                Zend/libZend.la \
                sapi/$(PHP_SAPI)/libsapi.la \
+               core/libcore.la \
                $(REGEX_LIB) \
                $(EXT_LTLIBS) \
                $(TSRM_LIB)
@@ -58,13 +53,4 @@ install-modules:
 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:

diff --git a/build/rules.mk b/build/rules.mk
index adac9d159245ae678faedf9780e529a1a8947cb4..3c5f7dbd77002182be95d60d0ff588b044fb1cd7 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -34,7 +34,7 @@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
 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)
 

diff --git a/build/rules_pear.mk b/build/rules_pear.mk
index b9be848db0416c8cd71eef8612fddb447a15c088..18472b6021c2f324af4f5bdad65a4080309a2c4a 100644 (file)
--- a/build/rules_pear.mk
+++ b/build/rules_pear.mk
@@ -34,7 +34,7 @@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -f -p
 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)
 

diff --git a/configure.in b/configure.in
index 00e2f956c016b3459257ae46a19024d8f74ad8f0..71a40f12bfbd0a97f20a3a54b1a83172635feae1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,9 +3,9 @@ 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 @@ else
 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 @@ FEO
 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

diff --git a/main/Makefile.in b/main/Makefile.in
new file mode 100644 (file)
index 0000000..26e2008
--- /dev/null
+++ b/main/Makefile.in
@@ -0,0 +1,20 @@
+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

diff --git a/php4dll.dsp b/php4dll.dsp
index 7f8b6a679237d3b5d83e217e62c84fb222ae9cbe..04ab52cfa00d5dad21f3996c021beb07d39e3e2c 100644 (file)
--- a/php4dll.dsp
+++ b/php4dll.dsp
@@ -140,7 +140,7 @@ SOURCE=".\fopen-wrappers.c"
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\internal_functions_win32.c\r
+SOURCE=.\core\internal_functions_win32.c\r
 \r
 !IF  "$(CFG)" == "php4dll - Win32 Debug"\r
 \r
@@ -159,11 +159,11 @@ SOURCE=.\internal_functions_win32.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\main.c\r
+SOURCE=.\core\main.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\mergesort.c\r
+SOURCE=.\core\mergesort.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -171,27 +171,27 @@ SOURCE=.\ext\standard\output.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_content_types.c\r
+SOURCE=.\core\php_content_types.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_ini.c\r
+SOURCE=.\core\php_ini.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_realpath.c\r
+SOURCE=.\core\php_realpath.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_ticks.c\r
+SOURCE=.\core\php_ticks.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_variables.c\r
+SOURCE=.\core\php_variables.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_virtual_cwd.c\r
+SOURCE=.\core\php_virtual_cwd.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -199,27 +199,27 @@ SOURCE=.\ext\standard\quot_print.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\reentrancy.c\r
+SOURCE=.\core\reentrancy.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\rfc1867.c\r
+SOURCE=.\core\rfc1867.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\safe_mode.c\r
+SOURCE=.\core\safe_mode.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\SAPI.c\r
+SOURCE=.\core\SAPI.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\strlcat.c\r
+SOURCE=.\core\strlcat.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\strlcpy.c\r
+SOURCE=.\core\strlcpy.c\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
@@ -227,7 +227,7 @@ SOURCE=.\strlcpy.c
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\config.w32.h\r
+SOURCE=.\core\config.w32.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -243,59 +243,59 @@ SOURCE=.\ext\standard\cyr_convert.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\getopt.h\r
+SOURCE=.\core\getopt.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\internal_functions_registry.h\r
+SOURCE=.\core\internal_functions_registry.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\logos.h\r
+SOURCE=.\core\logos.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\main.h\r
+SOURCE=.\core\main.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\output.h\r
+SOURCE=.\core\output.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php.h\r
+SOURCE=.\core\php.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php3_compat.h\r
+SOURCE=.\core\php3_compat.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_content_types.h\r
+SOURCE=.\core\php_content_types.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_globals.h\r
+SOURCE=.\core\php_globals.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_ini.h\r
+SOURCE=.\core\php_ini.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_realpath.h\r
+SOURCE=.\core\php_realpath.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_ticks.h\r
+SOURCE=.\core\php_ticks.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_variables.h\r
+SOURCE=.\core\php_variables.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_virtual_cwd.h\r
+SOURCE=.\core\php_virtual_cwd.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -303,19 +303,19 @@ SOURCE=.\ext\standard\quot_print.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\rfc1867.h\r
+SOURCE=.\core\rfc1867.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\safe_mode.h\r
+SOURCE=.\core\safe_mode.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\SAPI.h\r
+SOURCE=.\core\SAPI.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\win95nt.h\r
+SOURCE=.\core\win95nt.h\r
 # End Source File\r
 # End Group\r
 # End Group\r

diff --git a/php4dllts.dsp b/php4dllts.dsp
index 2d36fe4c9b8e2aa638f6374f11173222aec75524..f4361ac891b60a651b70342303c5f4666961ce50 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -140,40 +140,40 @@ SOURCE=".\fopen-wrappers.c"
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\internal_functions_win32.c\r
+SOURCE=.\core\internal_functions_win32.c\r
 # ADD CPP /I "ext\xml\expat\xmltok" /I "ext\xml\expat\xmlparse"\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\main.c\r
+SOURCE=.\core\main.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\mergesort.c\r
+SOURCE=.\core\mergesort.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_content_types.c\r
+SOURCE=.\core\php_content_types.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_ini.c\r
+SOURCE=.\core\php_ini.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_realpath.c\r
+SOURCE=.\core\php_realpath.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_ticks.c\r
+SOURCE=.\core\php_ticks.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_variables.c\r
+SOURCE=.\core\php_variables.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_virtual_cwd.c\r
+SOURCE=.\core\php_virtual_cwd.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -181,27 +181,27 @@ SOURCE=.\ext\standard\quot_print.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\reentrancy.c\r
+SOURCE=.\core\reentrancy.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\rfc1867.c\r
+SOURCE=.\core\rfc1867.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\safe_mode.c\r
+SOURCE=.\core\safe_mode.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\SAPI.c\r
+SOURCE=.\core\SAPI.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\strlcat.c\r
+SOURCE=.\core\strlcat.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\strlcpy.c\r
+SOURCE=.\core\strlcpy.c\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
@@ -209,7 +209,7 @@ SOURCE=.\strlcpy.c
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\config.w32.h\r
+SOURCE=.\core\config.w32.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -225,63 +225,63 @@ SOURCE=.\ext\standard\cyr_convert.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\getopt.h\r
+SOURCE=.\core\getopt.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\internal_functions_registry.h\r
+SOURCE=.\core\internal_functions_registry.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\logos.h\r
+SOURCE=.\core\logos.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\main.h\r
+SOURCE=.\core\main.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\output.h\r
+SOURCE=.\core\output.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php.h\r
+SOURCE=.\core\php.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php3_compat.h\r
+SOURCE=.\core\php3_compat.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_compat.h\r
+SOURCE=.\core\php_compat.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_content_types.h\r
+SOURCE=.\core\php_content_types.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_globals.h\r
+SOURCE=.\core\php_globals.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_ini.h\r
+SOURCE=.\core\php_ini.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_realpath.h\r
+SOURCE=.\core\php_realpath.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_regex.h\r
+SOURCE=.\core\php_regex.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_variables.h\r
+SOURCE=.\core\php_variables.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_virtual_cwd.h\r
+SOURCE=.\core\php_virtual_cwd.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -289,19 +289,19 @@ SOURCE=.\ext\standard\quot_print.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\rfc1867.h\r
+SOURCE=.\core\rfc1867.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\safe_mode.h\r
+SOURCE=.\core\safe_mode.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\SAPI.h\r
+SOURCE=.\core\SAPI.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\win95nt.h\r
+SOURCE=.\core\win95nt.h\r
 # End Source File\r
 # End Group\r
 # End Group\r
@@ -811,10 +811,6 @@ SOURCE=.\ext\xml\expat\xmltok\asciitab.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\hashtable.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\ext\xml\expat\xmltok\iasciitab.h\r
 # End Source File\r
 # Begin Source File\r