httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sas...@locus.apache.org
Subject cvs commit: apache-2.0/src/os Makefile.in config.m4
Date Sun, 30 Apr 2000 18:27:19 GMT
sascha      00/04/30 11:27:19

  Modified:    src      CHANGES Makefile.in configure.in
               src/build rules.mk
               src/main Makefile.in
               src/os   Makefile.in config.m4
  Log:
  Add VPATH support to Apache:
  
    os/$(OS_DIR) is now equivalent to the old $(OS_DIR)
  
    Necessary include paths are added only in VPATH mode.
  
    Dependencies are stored in the build directory now.
    They contain paths which depend on the current build,
    and therefore they are not general.
  
    Fixed two dependencies in main/Makefile.in.
  
  Revision  Changes    Path
  1.95      +3 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -u -r1.94 -r1.95
  --- CHANGES	2000/04/30 17:43:39	1.94
  +++ CHANGES	2000/04/30 18:27:16	1.95
  @@ -1,4 +1,7 @@
   Changes with Apache 2.0a4-dev
  +  *) Add VPATH support to UNIX build system of Apache and APR.
  +     [Sascha Schumann]
  +
     *) Fix ap_tokenize_to_argv to respect the const arguments that are
        passed to it.
        [Ryan Bloom]
  
  
  
  1.16      +1 -1      apache-2.0/src/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Makefile.in,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -u -r1.15 -r1.16
  --- Makefile.in	2000/04/30 15:51:37	1.15
  +++ Makefile.in	2000/04/30 18:27:17	1.16
  @@ -8,7 +8,7 @@
     $(BUILTIN_LIBS) \
     $(MPM_LIB) \
     main/libmain.la \
  -  $(OS_DIR)/libos.la \
  +  os/$(OS_DIR)/libos.la \
     ap/libap.la \
     lib/apr/$(LIBPRE)apr.a \
     $(REGEX_LIB)
  
  
  
  1.39      +21 -5     apache-2.0/src/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/configure.in,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -u -r1.38 -r1.39
  --- configure.in	2000/04/30 00:06:00	1.38
  +++ configure.in	2000/04/30 18:27:17	1.39
  @@ -16,9 +16,17 @@
   test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
   test "$prefix" = "NONE" && prefix='/usr/local'
   
  -dnl Needed for APACHE_MODULE() to work
  -cwd=`pwd`
  +dnl Absolute source/build directory
  +abs_srcdir=`(cd $srcdir && pwd)`
  +abs_builddir=`pwd`
   
  +dnl If the source dir is not equal to the build dir, 
  +dnl then we are running in VPATH mode.
  +
  +if test "$abs_builddir" != "$abs_srcdir"; then
  +  USE_VPATH=1
  +fi
  +
   dnl ## Run configure for packages Apache uses
   AC_CONFIG_SUBDIRS(lib/apr)
   
  @@ -133,12 +141,14 @@
   APACHE_ENABLE_SHARED
   
   INCLUDES="-I\$(top_srcdir)/include -I\$(top_srcdir)/lib/apr/include"
  -APACHE_SUBST(INCLUDES)
  +if test -n "$USE_VPATH"; then
  +  INCLUDES="$INCLUDES -I\$(top_builddir)/include -I\$(top_builddir)/lib/apr/include"
  +fi
   
   dnl reading config stubs
   esyscmd(./helpers/config-stubs .)
   
  -INCLUDES="$INCLUDES -I\$(top_srcdir)/\$(OS_DIR)"
  +INCLUDES="$INCLUDES -I\$(top_srcdir)/os/\$(OS_DIR)"
   EXTRA_LIBS="$EXTRA_LIBS $LIBS"
   EXTRA_LDFLAGS="$LDFLAGS"
   LIBS=""
  @@ -147,6 +157,7 @@
   APACHE_SUBST(EXTRA_CFLAGS)
   APACHE_SUBST(EXTRA_LDFLAGS)
   APACHE_SUBST(EXTRA_LIBS)
  +APACHE_SUBST(INCLUDES)
   APACHE_SUBST(REGEX_DIR)
   APACHE_SUBST(REGEX_LIB)
   APACHE_SUBST(MPM_LIB)
  @@ -172,7 +183,12 @@
               modules/Makefile os/Makefile support/Makefile)
   
   APACHE_FAST_GENERATE
  -	
  +
  +dnl There needs to be a .deps file in the top build directory.
  +dnl All others are created dynamically by rules.mk.
  +
  +touch .deps
  +
   dnl ## Build modules.c
   rm -f $srcdir/modules.c
   echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk > $srcdir/modules.c
  
  
  
  1.14      +4 -3      apache-2.0/src/build/rules.mk
  
  Index: rules.mk
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/rules.mk,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -u -r1.13 -r1.14
  --- rules.mk	2000/04/30 00:06:01	1.13
  +++ rules.mk	2000/04/30 18:27:17	1.14
  @@ -71,7 +71,7 @@
   APACHE_SH_COMPILE = $(SHLIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES)
$(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< && touch $@
   SHLINK = $(SHLIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@
   
  -DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(top_builddir)
  +DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir)
   
   .SUFFIXES:
   .SUFFIXES: .S .c .lo .o .s .y .l .slo
  @@ -131,7 +131,8 @@
   distclean-p depend-p clean-p:
   
   depend: depend-recursive
  -	test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) $(EXTRA_INCLUDES)
*.c > .deps
  +	gcc -MM $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c > $(builddir)/.deps
  +#	test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) $(EXTRA_INCLUDES)
*.c > .deps
   
   clean: clean-recursive clean-x
   
  @@ -143,7 +144,7 @@
   	rm -f config.cache config.log config.status config_vars.mk libtool \
   	stamp-h Makefile shlibtool .deps $(DISTCLEANFILES)
   
  -include $(srcdir)/.deps
  +include $(builddir)/.deps
   
   .PHONY: all-recursive clean-recursive install-recursive \
   $(install_targets) install all clean depend depend-recursive shared \
  
  
  
  1.7       +2 -2      apache-2.0/src/main/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- Makefile.in	2000/04/30 00:06:02	1.6
  +++ Makefile.in	2000/04/30 18:27:18	1.7
  @@ -25,5 +25,5 @@
   test_char.h: gen_test_char
   	./gen_test_char > test_char.h
   
  -util_uri.c: uri_delims.h
  -util.c: test_char.h
  +$(srcdir)/util_uri.c: uri_delims.h
  +$(srcdir)/util.c: test_char.h
  
  
  
  1.6       +1 -1      apache-2.0/src/os/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/Makefile.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -u -r1.5 -r1.6
  --- Makefile.in	2000/04/30 15:49:32	1.5
  +++ Makefile.in	2000/04/30 18:27:18	1.6
  @@ -1,4 +1,4 @@
   
  -SUBDIRS = $(top_builddir)/$(OS_DIR)
  +SUBDIRS = $(OS_DIR)
   
   include $(top_srcdir)/build/rules.mk
  
  
  
  1.8       +5 -6      apache-2.0/src/os/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/config.m4,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -u -r1.7 -r1.8
  --- config.m4	2000/04/14 14:32:20	1.7
  +++ config.m4	2000/04/30 18:27:18	1.8
  @@ -7,22 +7,21 @@
   case "$PLATFORM" in
   *beos*)
     OS="beos"
  -  OS_DIR=os/$OS
  +  OS_DIR=$OS
     ;;
   *pc-os2_emx*)
     LIBPRE=""
     OS="os2"
  -  OS_DIR=os/$OS
  +  OS_DIR=$OS
     ;;
   bs2000*)
     OS="unix"
  -  OS_DIR=os/bs2000  # only the OS_DIR is platform specific.
  +  OS_DIR=bs2000  # only the OS_DIR is platform specific.
     ;;
   *)
     OS="unix"
  -  OS_DIR=os/$OS;;
  +  OS_DIR=$OS;;
   esac
   
  -
   AC_MSG_RESULT($OS)
  -APACHE_FAST_OUTPUT($OS_DIR/Makefile)
  +APACHE_FAST_OUTPUT(os/$OS_DIR/Makefile)
  
  
  

Mime
View raw message