httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: httpd-2.0/support Makefile.in
Date Tue, 05 Dec 2000 00:36:11 GMT
rbb         00/12/04 16:36:10

  Modified:    .        .cvsignore configure.in
               build    rules.mk
               server   Makefile.in
               srclib   Makefile.in
               support  Makefile.in
  Log:
  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.
  
  Revision  Changes    Path
  1.2       +7 -0      httpd-2.0/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .cvsignore	2000/12/04 18:57:24	1.1
  +++ .cvsignore	2000/12/05 00:36:02	1.2
  @@ -6,3 +6,10 @@
   .deps
   generated_lists
   buildmk.stamp
  +config.log
  +Makefile
  +libtool
  +config.status
  +modules.c
  +config.cache
  +config_vars.mk
  
  
  
  1.97      +2 -2      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- configure.in	2000/12/04 22:33:38	1.96
  +++ configure.in	2000/12/05 00:36:03	1.97
  @@ -209,10 +209,10 @@
   		[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
  
  
  
  1.31      +1 -1      httpd-2.0/build/rules.mk
  
  Index: rules.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/rules.mk,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- rules.mk	2000/12/04 18:56:14	1.30
  +++ rules.mk	2000/12/05 00:36:05	1.31
  @@ -83,7 +83,7 @@
   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
   
  
  
  
  1.24      +2 -3      httpd-2.0/server/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Makefile.in	2000/12/04 06:36:16	1.23
  +++ Makefile.in	2000/12/05 00:36:06	1.24
  @@ -4,10 +4,9 @@
   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
   
  
  
  
  1.7       +1 -1      httpd-2.0/srclib/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/srclib/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.in	2000/11/26 15:33:04	1.6
  +++ Makefile.in	2000/12/05 00:36:07	1.7
  @@ -1,4 +1,4 @@
   
  -SUBDIRS = apr pcre aputil $(AP_LIB_DIRS)
  +SUBDIRS = apr pcre $(AP_LIB_DIRS)
   
   include $(top_srcdir)/build/rules.mk
  
  
  
  1.4       +1 -2      httpd-2.0/support/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in	2000/05/16 00:44:47	1.3
  +++ Makefile.in	2000/12/05 00:36:09	1.4
  @@ -3,8 +3,7 @@
   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
   
  
  
  

Mime
View raw message