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/build MakeEtags build.mk build2.mk buildexports.sh fastgen.sh rules.mk
Date Mon, 04 Dec 2000 18:56:21 GMT
rbb         00/12/04 10:56:19

  Modified:    .        configure.in
               build    MakeEtags build.mk build2.mk buildexports.sh
                        fastgen.sh rules.mk
  Log:
  Get buildconf working in the new repository.  Nothing builds, but we can
  at least configure everything.
  
  Revision  Changes    Path
  1.94      +1 -1      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- configure.in	2000/11/29 10:25:05	1.93
  +++ configure.in	2000/12/04 18:56:08	1.94
  @@ -134,7 +134,7 @@
   fi
   
   dnl reading config stubs
  -esyscmd(./helpers/config-stubs .)
  +esyscmd(./build/config-stubs .)
   
   INCLUDES="$INCLUDES -I\$(top_srcdir)/os/\$(OS_DIR)"
   EXTRA_LIBS="$EXTRA_LIBS $LIBS"
  
  
  
  1.3       +1 -1      httpd-2.0/build/MakeEtags
  
  Index: MakeEtags
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/MakeEtags,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MakeEtags	2000/10/16 06:04:32	1.2
  +++ MakeEtags	2000/12/04 18:56:10	1.3
  @@ -2,7 +2,7 @@
   
   # This file illustrates how to generate a useful TAGS file via etags
   # for emacs.  This should be invoked from the src directory i.e.:
  -#   > helpers/MakeEtags
  +#   > build/MakeEtags
   # and will create a TAGS file in the src directory.
   
   # This script falls under the Apache License.
  
  
  
  1.13      +3 -3      httpd-2.0/build/build.mk
  
  Index: build.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/build.mk,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.mk	2000/12/04 15:08:02	1.12
  +++ build.mk	2000/12/04 18:56:11	1.13
  @@ -61,7 +61,7 @@
   STAMP = buildmk.stamp
   
   all: $(STAMP) generated_lists
  -	@if [ ! -d lib/apr ]; then \
  +	@if [ ! -d srclib/apr ]; then \
   	    echo "APR not found."; \
   	    echo "Please check-out a working version of APR, the anonymous"; \
   	    echo "CVS root is :pserver:anoncvs@www.apache.org:/home/cvspublic"; \
  @@ -70,13 +70,13 @@
   	@$(MAKE) AMFLAGS=$(AMFLAGS) -s -f build/build2.mk
   
   generated_lists:
  -	@libpath=`helpers/PrintPath libtoolize`; \
  +	@libpath=`build/PrintPath libtoolize`; \
   	if [ "x$$libpath" = "x" ]; then \
   		echo "libtoolize not found in path"; \
   		exit 1; \
   	fi; 
   	@echo config_m4_files = `find . -name config.m4` > $@
  -	@n=`helpers/PrintPath libtoolize`; echo libtool_prefix = `dirname $$n`/.. >> $@
  +	@n=`build/PrintPath libtoolize`; echo libtool_prefix = `dirname $$n`/.. >> $@
   
   $(STAMP): build/buildcheck.sh
   	@build/buildcheck.sh && touch $(STAMP)
  
  
  
  1.20      +13 -13    httpd-2.0/build/build2.mk
  
  Index: build2.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/build2.mk,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build2.mk	2000/12/01 07:32:11	1.19
  +++ build2.mk	2000/12/04 18:56:11	1.20
  @@ -61,10 +61,10 @@
   LT_TARGETS = ltconfig ltmain.sh config.guess config.sub
   
   config_h_in = include/ap_config_auto.h.in
  -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
  +apr_private.h_in = srclib/apr/include/apr_private.h.in
  +apr_configure = srclib/apr/configure
  +mm_configure = srclib/apr/shmem/unix/mm/configure
  +pcre_configure = srclib/pcre/configure
   
   APACHE_TARGETS = $(TOUCH_FILES) $(LT_TARGETS) configure $(config_h_in)
   
  @@ -83,12 +83,12 @@
   
   libtool_m4 = $(libtool_prefix)/share/aclocal/libtool.m4
   
  -aclocal.m4: acinclude.m4 lib/apr/apr_common.m4 lib/apr/hints.m4 $(libtool_m4)
  +aclocal.m4: acinclude.m4 srclib/apr/apr_common.m4 srclib/apr/hints.m4 $(libtool_m4)
   	@echo rebuilding $@
   	@cat acinclude.m4 $(libtool_m4) > $@
   
   export_lists:
  -	@build/buildexports.sh main/exports.c lib/apr/apr.exports
  +	@build/buildexports.sh server/exports.c srclib/apr/apr.exports
   
   $(LT_TARGETS):
   	libtoolize $(AMFLAGS) --force
  @@ -112,19 +112,19 @@
   	### to preserve autoconf's exit across the grep?
   	-autoconf 2>&1 | grep -v $(cross_compile_warning)
   
  -$(apr_private.h_in): $(apr_configure) lib/apr/acconfig.h
  +$(apr_private.h_in): $(apr_configure) srclib/apr/acconfig.h
   	@echo rebuilding $@
   	@rm -f $@
  -	(cd lib/apr && autoheader)
  +	(cd srclib/apr && autoheader)
   
  -$(apr_configure): lib/apr/aclocal.m4 lib/apr/configure.in lib/apr/apr_common.m4 lib/apr/hints.m4
  +$(apr_configure): srclib/apr/aclocal.m4 srclib/apr/configure.in srclib/apr/apr_common.m4
srclib/apr/hints.m4
   	@echo rebuilding $@
  -	(cd lib/apr && ./buildconf)
  +	(cd srclib/apr && ./buildconf)
   
  -$(pcre_configure): lib/pcre/configure.in
  +$(pcre_configure): srclib/pcre/configure.in
   	@echo rebuilding $@
  -	(cd lib/pcre && autoconf)
  +	(cd srclib/pcre && autoconf)
   
   $(mm_configure): $(mm_configure).in
   	@echo rebuilding $@
  -	(cd lib/apr/shmem/unix/mm && autoconf)
  +	(cd srclib/apr/shmem/unix/mm && autoconf)
  
  
  
  1.6       +1 -1      httpd-2.0/build/buildexports.sh
  
  Index: buildexports.sh
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/buildexports.sh,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- buildexports.sh	2000/12/01 07:32:11	1.5
  +++ buildexports.sh	2000/12/04 18:56:11	1.6
  @@ -9,7 +9,7 @@
   echo " */"
   echo ""
    
  -cd lib/apr/include 
  +cd srclib/apr/include 
   for file in *.h
   do
       echo "#include \"$file\""
  
  
  
  1.11      +1 -1      httpd-2.0/build/fastgen.sh
  
  Index: fastgen.sh
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/fastgen.sh,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- fastgen.sh	2000/09/22 17:07:46	1.10
  +++ fastgen.sh	2000/12/04 18:56:12	1.11
  @@ -70,7 +70,7 @@
   if test "$mkdir_p" = "yes"; then
     mkdir_p="mkdir -p"
   else
  -  mkdir_p="$top_srcdir/helpers/mkdir.sh"
  +  mkdir_p="$top_srcdir/build/mkdir.sh"
   fi
   
   if test "$bsd_makefile" = "yes"; then
  
  
  
  1.30      +2 -2      httpd-2.0/build/rules.mk
  
  Index: rules.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/rules.mk,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- rules.mk	2000/11/27 22:32:50	1.29
  +++ rules.mk	2000/12/04 18:56:14	1.30
  @@ -78,8 +78,8 @@
   # Helper programs
   
   SH_LIBTOOL = $(SHELL) $(top_builddir)/shlibtool --silent
  -MKINSTALLDIRS = $(abs_srcdir)/helpers/mkdir.sh
  -INSTALL = $(abs_srcdir)/helpers/install.sh -c
  +MKINSTALLDIRS = $(abs_srcdir)/build/mkdir.sh
  +INSTALL = $(abs_srcdir)/build/install.sh -c
   INSTALL_DATA = $(INSTALL) -m 644
   INSTALL_PROGRAM = $(INSTALL) -m 755
   
  
  
  

Mime
View raw message