From: Ryan Bloom <rbb@apache.org>
Date: Tue, 5 Dec 2000 00:36:09 +0000 (+0000)
Subject: Get base Apache to build properly.  This doesn't solve the problem of
X-Git-Tag: APACHE_2_0_ALPHA_9~104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1e313ee47e1c9b0d5e37e556186eb69fa4163f5;p=apache

Get base Apache to build properly.  This doesn't solve the problem of
not having apr-util, but we should be getting to the link stage now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87190 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.cvsignore b/.cvsignore
index 1e493134b1..07ec98e1fc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,3 +6,10 @@ aclocal.m4
 .deps
 generated_lists
 buildmk.stamp
+config.log
+Makefile
+libtool
+config.status
+modules.c
+config.cache
+config_vars.mk
diff --git a/build/rules.mk b/build/rules.mk
index 5cfaee85aa..9e88336b37 100644
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -83,7 +83,7 @@ INSTALL = $(abs_srcdir)/build/install.sh -c
 INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_PROGRAM = $(INSTALL) -m 755
 
-DEFS = -I. -I$(srcdir) -I$(top_srcdir)/modules/mpm/$(MPM_NAME)
+DEFS = -I. -I$(srcdir) -I$(top_srcdir)/server/mpm/$(MPM_NAME)
 
 # Suffixes
 
diff --git a/configure.in b/configure.in
index cd8fac10c9..6e9b76fecb 100644
--- a/configure.in
+++ b/configure.in
@@ -209,10 +209,10 @@ else
 		[byte order is unknown due to cross-compilation])
 fi
 
-APACHE_FAST_OUTPUT(Makefile modules/Makefile) 
+APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) 
 APACHE_FAST_OUTPUT(os/beos/Makefile os/os2/Makefile)
 APACHE_FAST_OUTPUT(os/unix/Makefile server/Makefile)
-APACHE_FAST_OUTPUT(support/Makefile test/Makefile)
+APACHE_FAST_OUTPUT(support/Makefile test/Makefile srclib/pcre/Makefile)
 for i in $AP_LIB_DIRS; do
   APACHE_FAST_OUTPUT(srclib/$i/Makefile)
 done
diff --git a/server/Makefile.in b/server/Makefile.in
index b9ee283a06..f28a11b140 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -4,10 +4,9 @@ CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h
 LTLIBRARY_NAME    = libmain.la
 LTLIBRARY_SOURCES = \
     uri_delims.h test_char.h \
-	http_config.c http_core.c http_log.c http_main.c \
-	http_protocol.c http_request.c http_vhost.c util.c util_date.c \
+	config.c log.c main.c vhost.c util.c util_date.c \
 	util_script.c util_uri.c util_md5.c util_cfgtree.c util_ebcdic.c \
-	rfc1413.c http_connection.c listen.c \
+	rfc1413.c connection.c listen.c \
         mpm_common.c util_charset.c util_debug.c util_xml.c \
 	util_filter.c exports.c
 
diff --git a/srclib/Makefile.in b/srclib/Makefile.in
index a3ef7c0cbe..1e58b2679c 100644
--- a/srclib/Makefile.in
+++ b/srclib/Makefile.in
@@ -1,4 +1,4 @@
 
-SUBDIRS = apr pcre aputil $(AP_LIB_DIRS)
+SUBDIRS = apr pcre $(AP_LIB_DIRS)
 
 include $(top_srcdir)/build/rules.mk
diff --git a/support/Makefile.in b/support/Makefile.in
index 879f10517e..1160f73b70 100644
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -3,8 +3,7 @@ PROGRAMS = htpasswd htdigest rotatelogs logresolve ab
 targets  = $(PROGRAMS)
 
 PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
-PROGRAM_DEPENDENCIES = ../ap/libap.la \
-	../lib/apr/$(LIBPRE)apr.a
+PROGRAM_DEPENDENCIES = ../srclib/apr/$(LIBPRE)apr.a
 
 include $(top_srcdir)/build/rules.mk