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 02:45:51 GMT
rbb         00/12/04 18:45:50

  Modified:    .        Makefile.in configure.in
               server   Makefile.in
               support  Makefile.in
  Log:
  Apache builds again, although the test directory doesn't.  I will work on
  the test directory soon.  The server does NOT currently run, but it does
  build cleanly.
  
  Revision  Changes    Path
  1.37      +2 -2      httpd-2.0/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.in,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- Makefile.in	2000/12/04 22:33:35	1.36
  +++ Makefile.in	2000/12/05 02:45:46	1.37
  @@ -2,12 +2,12 @@
   SUBDIRS = modules os server srclib support test
   
   PROGRAM_NAME         = $(progname)
  -PROGRAM_SOURCES      = modules.c buildmark.c
  +PROGRAM_SOURCES      = modules.c
   PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
   PROGRAM_DEPENDENCIES = \
     $(BUILTIN_LIBS) \
     $(MPM_LIB) \
  -  main/libmain.la \
  +  server/libmain.la \
     os/$(OS_DIR)/libos.la \
     $(AP_LIBS)
   
  
  
  
  1.99      +2 -2      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.98
  retrieving revision 1.99
  diff -u -r1.98 -r1.99
  --- configure.in	2000/12/05 01:22:03	1.98
  +++ configure.in	2000/12/05 02:45:46	1.99
  @@ -175,7 +175,7 @@
   
   dnl AP_LIB_DIRS specifies the additional libs from srclib/ that we need
   dnl AP_LIBS specifies the actual libraries. note we have some required libs.
  -AP_LIBS="srclib/pcre/libpcre.la srclib/apr-util/.libs/libaprutil.la"
  +AP_LIBS="srclib/pcre/libpcre.la srclib/apr-util/libaprutil.la"
   
   if test "$apache_need_sdbm" = "yes"; then
     AP_LIB_DIRS="$AP_LIB_DIRS sdbm"
  @@ -210,7 +210,7 @@
   fi
   
   APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) 
  -APACHE_FAST_OUTPUT(os/beos/Makefile os/os2/Makefile)
  +APACHE_FAST_OUTPUT(os/beos/Makefile os/os2/Makefile os/Makefile)
   APACHE_FAST_OUTPUT(os/unix/Makefile server/Makefile)
   APACHE_FAST_OUTPUT(support/Makefile test/Makefile srclib/pcre/Makefile)
   for i in $AP_LIB_DIRS; do
  
  
  
  1.25      +3 -1      httpd-2.0/server/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Makefile.in	2000/12/05 00:36:06	1.24
  +++ Makefile.in	2000/12/05 02:45:49	1.25
  @@ -1,6 +1,8 @@
   
   CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h
   
  +SUBDIRS = mpm
  +
   LTLIBRARY_NAME    = libmain.la
   LTLIBRARY_SOURCES = \
       uri_delims.h test_char.h \
  @@ -8,7 +10,7 @@
   	util_script.c util_uri.c util_md5.c util_cfgtree.c util_ebcdic.c \
   	rfc1413.c connection.c listen.c \
           mpm_common.c util_charset.c util_debug.c util_xml.c \
  -	util_filter.c exports.c
  +	util_filter.c exports.c buildmark.c
   
   include $(top_srcdir)/build/ltlib.mk
   
  
  
  
  1.6       +2 -2      httpd-2.0/support/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.in	2000/12/05 01:22:05	1.5
  +++ Makefile.in	2000/12/05 02:45:50	1.6
  @@ -3,8 +3,8 @@
   targets  = $(PROGRAMS)
   
   PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
  -PROGRAM_DEPENDENCIES = ../srclib/apr/$(LIBPRE)apr.a \
  -	../srclib/apr-util/.libs/libaprutil.a
  +PROGRAM_DEPENDENCIES = \
  +	../srclib/apr-util/libaprutil.la ../srclib/apr/$(LIBPRE)apr.a
   
   include $(top_srcdir)/build/rules.mk
   
  
  
  

Mime
View raw message