httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/support Makefile.tmpl
Date Fri, 10 Sep 1999 16:07:02 GMT
rse         99/09/10 09:07:01

  Modified:    src      Configure Makefile.tmpl
               src/lib/apr Makefile.in
               src/support Makefile.tmpl
  Added:       src/lib/apr .cvsignore
               src/lib/apr/include .cvsignore
               src/lib/apr/lib .cvsignore
  Log:
  Let's integrate APR better into the source tree, because it's more than boring
  if one cannot even compile the beast easily (sorry Ryan that I do not agree
  with you here - I think that this is important and has to be done early or
  people will not work with the stuff)...
  
  Revision  Changes    Path
  1.4       +17 -2     apache-2.0/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Configure,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Configure	1999/08/31 05:31:58	1.3
  +++ Configure	1999/09/10 16:06:53	1.4
  @@ -844,8 +844,7 @@
   ##
   echo >>Makefile.config "OSDIR=\$(SRCDIR)/$OSDIR"
   echo >>Makefile.config "INCDIR=\$(SRCDIR)/include"
  -echo >>Makefile.config "APRINCDIR=\$(SRCDIR)/lib/apr/include"
  -echo >>Makefile.config "INCLUDES0=-I\$(OSDIR) -I\$(INCDIR) -I\$(APRINCDIR) -I\$(SRCDIR)/modules/mpm/$MPM_METHOD"
  +echo >>Makefile.config "INCLUDES0=-I\$(OSDIR) -I\$(INCDIR) -I\$(SRCDIR)/modules/mpm/$MPM_METHOD"
   echo >>Makefile.config "SHELL=$SHELL"
   
   ####################################################################
  @@ -1727,6 +1726,20 @@
   SUBDIRS="$SUBDIRS"
   
   ####################################################################
  +## Add in the APR library.
  +##
  +if [ -d ./lib/apr ]; then
  +    echo " + configuring Apache Portable Runtime (APR)"
  +    (cd lib/apr && CC="$CC" CFLAGS="$EXTRA_CFLAGS" ./configure >/dev/null)
  +    APRLIB=""
  +    for lib in apr file network lock misc sig threadproc time; do
  +         APRLIB="$APRLIB \$(SRCDIR)/lib/apr/libs/lib${lib}.a"
  +    done
  +    CFLAGS="$CFLAGS -I\$(SRCDIR)/lib/apr/include"
  +    APLIBDIRS="apr $APLIBDIRS"
  +fi
  +
  +####################################################################
   ## Add in the Expat library if needed/wanted.
   ##
   if [ -d ./lib/expat-lite/ ]; then
  @@ -1997,6 +2010,7 @@
   echo "LDFLAGS1=$LDFLAGS" >>Makefile.config
   echo "MFLAGS_STATIC=$MFLAGS_STATIC" >>Makefile.config
   echo "REGLIB=$REGLIB" >>Makefile.config
  +echo "APRLIB=$APRLIB" >>Makefile.config
   echo "EXPATLIB=$EXPATLIB" >>Makefile.config
   echo "RANLIB=$RANLIB" >>Makefile.config
   
  @@ -2247,6 +2261,7 @@
   ##
   
   for dir in $APLIBDIRS ; do
  +	test ! -f lib/$dir/Makefile.tmpl && continue
   	echo Creating Makefile in lib/$dir
   	./helpers/mfhead lib/$dir $file > lib/$dir/Makefile
   	$CAT Makefile.config lib/$dir/Makefile.tmpl |\
  
  
  
  1.6       +1 -1      apache-2.0/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Makefile.tmpl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.tmpl	1999/09/10 14:34:39	1.5
  +++ Makefile.tmpl	1999/09/10 16:06:53	1.6
  @@ -33,7 +33,7 @@
   target_static: subdirs modules.o
   	$(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c
   	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
  -	      -o $(TARGET) buildmark.o $(OBJS) $(REGLIB) $(EXPATLIB) $(LIBS)
  +	      -o $(TARGET) buildmark.o $(OBJS) $(REGLIB) $(EXPATLIB) $(APRLIB) $(LIBS)
   
   target_compile_only: subdirs modules.o
   	$(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c
  
  
  
  1.8       +11 -11    apache-2.0/src/lib/apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.in	1999/09/10 14:00:42	1.7
  +++ Makefile.in	1999/09/10 16:06:57	1.8
  @@ -7,6 +7,7 @@
   # Macros for compilation commands
   #
   @SET_MAKE@
  +MFLAGS_STATIC=
   RM=@RM@
   CC=@CC@
   CFLAGS=@CFLAGS@ @OPTIM@
  @@ -39,10 +40,9 @@
   # building the entire package.
   #
   all: Makefile $(MODULES) subdirs
  -	rm -Rf libs
  -	mkdir libs
  +	@rm -Rf libs
  +	@mkdir libs
   	@for i in $(SUBDIRS); do cp $$i/*.a libs ; done;
  -	@echo APR built.
   
   clean: subdirs_clean
   	$(RM) -f *.o *.a *.so
  @@ -54,27 +54,27 @@
   
   subdirs:
   	@for i in $(SUBDIRS); do \
  -	    echo "===> $$i"; \
  +	    echo "===> $(SDP)lib/apr/$$i"; \
   	    ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' \
   		CC='$(CC)' AUX_CFLAGS='$(AUX_CFLAGS)' RANLIB='$(RANLIB)' ) \
   		|| exit 1; \
  -	    echo "<=== $$i"; \
  +	    echo "<=== $(SDP)lib/apr/$$i"; \
   	done;
   
   subdirs_depend:
   	@for i in $(SUBDIRS); do \
  -	    echo "===> $$i"; \
  -	    ( cd $$i && $(MAKE) depend ) \
  +	    echo "===> $(SDP)lib/apr/$$i"; \
  +	    ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' depend ) \
   		|| exit 1; \
  -	    echo "<=== $$i"; \
  +	    echo "<=== $(SDP)lib/apr/$$i"; \
   	done;
   
   subdirs_clean:
   	@for i in $(SUBDIRS); do \
  -	    echo "===> $$i"; \
  -	    ( cd $$i && $(MAKE) clean ) \
  +	    echo "===> $(SDP)lib/apr/$$i"; \
  +	    ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' clean ) \
   		|| exit 1; \
  -	    echo "<=== $$i"; \
  +	    echo "<=== $(SDP)lib/apr/$$i"; \
   	done;
   
   # DO NOT REMOVE
  
  
  
  1.1                  apache-2.0/src/lib/apr/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  Makefile
  config.cache
  config.log
  config.status
  libs
  
  
  
  1.1                  apache-2.0/src/lib/apr/include/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  apr_config.h
  
  
  
  1.1                  apache-2.0/src/lib/apr/lib/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  Makefile
  
  
  
  1.2       +1 -1      apache-2.0/src/support/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.tmpl	1999/08/24 06:45:52	1.1
  +++ Makefile.tmpl	1999/09/10 16:07:00	1.2
  @@ -1,6 +1,6 @@
   
   CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  -LIBS=-lap -los $(EXTRA_LIBS) $(LIBS1)
  +LIBS=-lap -los $(APRLIB) $(EXTRA_LIBS) $(LIBS1)
   INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
   LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) -L$(OSDIR) -L$(SRCDIR)/ap
   
  
  
  

Mime
View raw message