httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src Makefile.in
Date Thu, 11 May 2000 21:56:55 GMT
trawick     00/05/11 14:56:53

  Modified:    src/build build2.mk
               src      Makefile.in
  Log:
  src/build/build2.mk: build PCRE's configure script if needed (when you
                       run buildconf, for example)
  src/Makefile.in    : re-order libpcreposix.la and libpcre.la to make
                       OS/390's binder happy (now the libraries are listed
                       in order of dependencies)
  
  Revision  Changes    Path
  1.12      +8 -1      apache-2.0/src/build/build2.mk
  
  Index: build2.mk
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/build2.mk,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build2.mk	2000/04/27 11:30:35	1.11
  +++ build2.mk	2000/05/11 21:56:48	1.12
  @@ -64,13 +64,16 @@
   apr_private.h_in = lib/apr/include/apr_private.h.in
   apr_configure = lib/apr/configure
   mm_configure = lib/apr/shmem/unix/mm/configure
  +pcre_configure = lib/pcre/configure
   
   APACHE_TARGETS = $(TOUCH_FILES) $(LT_TARGETS) configure $(config_h_in)
   
   APR_TARGETS = $(apr_configure) $(apr_private.h_in) $(mm_configure)
   
  -targets = .deps aclocal.m4 $(APACHE_TARGETS) $(APR_TARGETS)
  +PCRE_TARGETS = $(pcre_configure)
   
  +targets = .deps aclocal.m4 $(APACHE_TARGETS) $(APR_TARGETS) $(PCRE_TARGETS)
  +
   all: $(targets)
   
   .deps:
  @@ -112,3 +115,7 @@
   $(mm_configure): lib/apr/shmem/unix/mm/configure.in
   	@echo rebuilding $@
   	(cd lib/apr/shmem/unix/mm && autoconf)
  +
  +$(pcre_configure): lib/pcre/configure.in
  +	@echo rebuilding $@
  +	(cd lib/pcre && autoconf)
  
  
  
  1.20      +2 -2      apache-2.0/src/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Makefile.in,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Makefile.in	2000/05/05 23:17:52	1.19
  +++ Makefile.in	2000/05/11 21:56:51	1.20
  @@ -11,8 +11,8 @@
     os/$(OS_DIR)/libos.la \
     ap/libap.la \
     lib/apr/$(LIBPRE)apr.a \
  -  lib/pcre/libpcre.la \
  -  lib/pcre/libpcreposix.la
  +  lib/pcre/libpcreposix.la \
  +  lib/pcre/libpcre.la
   
   PROGRAMS        = $(PROGRAM_NAME)
   targets         = $(PROGRAMS)
  
  
  

Mime
View raw message