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/lib/apr/dso/beos Makefile.in
Date Wed, 15 Nov 2000 12:22:14 GMT
trawick     00/11/15 04:22:14

  Modified:    src/lib/apr/locks/beos Makefile.in
               src/lib/apr/network_io/beos Makefile.in
               src/lib/apr/threadproc/beos Makefile.in
               src/lib/apr/dso/beos Makefile.in
  Log:
  BeOS changes to the way dependencies are built in APR makefiles
  
  Revision  Changes    Path
  1.9       +2 -28     apache-2.0/src/lib/apr/locks/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in	2000/11/09 06:25:28	1.8
  +++ Makefile.in	2000/11/15 12:22:13	1.9
  @@ -1,8 +1,3 @@
  -#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  -#LIBS=$(EXTRA_LIBS) $(LIBS1)
  -#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
  -#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  -
   CC=@CC@
   RANLIB=@RANLIB@
   CFLAGS=@CFLAGS@ @OPTIM@
  @@ -10,6 +5,7 @@
   LDFLAGS=@LDFLAGS@ $(LIBS)
   INCDIR=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
  +MKDEP=../../helpers/mkdep.sh
   
   LIB=liblock.a
   
  @@ -34,29 +30,7 @@
   	$(AR) cr $@ $(OBJS)
   	$(RANLIB) $@
   
  -#
  -# We really don't expect end users to use this rule.  It works only with
  -# gcc, and rebuilds Makefile.in.  You have to re-run configure after
  -# using it.
  -#
   depend:
  -	cp Makefile.in Makefile.in.bak \
  -	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
  -	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
  -	           -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
  -		> Makefile.in \
  -	    && rm Makefile.new
  +	$(MKDEP) $(INCLUDES) $(CFLAGS) *.c
   
   # DO NOT REMOVE
  -crossproc.o: crossproc.c ../../include/apr_lock.h \
  - ../../include/apr_general.h ../../include/apr_private.h \
  - ../../include/apr_errno.h ../../include/apr_lib.h \
  - ../../include/apr_file_io.h locks.h
  -intraproc.o: intraproc.c ../../include/apr_lock.h \
  - ../../include/apr_general.h ../../include/apr_private.h \
  - ../../include/apr_errno.h locks.h ../../include/apr_file_io.h \
  - ../../include/apr_lib.h
  -locks.o: locks.c ../../include/apr_lock.h ../../include/apr_general.h \
  - ../../include/apr_private.h ../../include/apr_errno.h locks.h \
  - ../../include/apr_file_io.h
  
  
  
  1.13      +2 -59     apache-2.0/src/lib/apr/network_io/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/Makefile.in,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Makefile.in	2000/05/30 18:43:06	1.12
  +++ Makefile.in	2000/11/15 12:22:13	1.13
  @@ -1,8 +1,3 @@
  -#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  -#LIBS=$(EXTRA_LIBS) $(LIBS1)
  -#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
  -#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  -
   CC=@CC@
   RANLIB=@RANLIB@
   CFLAGS=@CFLAGS@ @OPTIM@
  @@ -10,6 +5,7 @@
   LDFLAGS=@LDFLAGS@ $(LIBS)
   INCDIR=../../include -I../../file_io/unix
   INCLUDES=-I$(INCDIR) -I.
  +MKDEP=../../helpers/mkdep.sh
   
   LIB=libnetwork.a
   
  @@ -37,60 +33,7 @@
   	$(AR) cr $@ $(OBJS)
   	$(RANLIB) $@
   
  -#
  -# We really don't expect end users to use this rule.  It works only with
  -# gcc, and rebuilds Makefile.in.  You have to re-run configure after
  -# using it.
  -#
   depend:
  -	cp Makefile.in Makefile.in.bak \
  -	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
  -	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
  -	           -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
  -		> Makefile.in \
  -	    && rm Makefile.new
  +	$(MKDEP) $(INCLUDES) $(CFLAGS) *.c
   
   # DO NOT REMOVE
  -inet_aton.o: inet_aton.c networkio.h ../../include/apr_network_io.h \
  - ../../include/apr_general.h ../../include/apr.h \
  - ../../include/apr_errno.h ../../include/apr_file_io.h \
  - ../../include/apr_time.h ../../include/apr_portable.h \
  - ../../include/apr_thread_proc.h ../../include/apr_lock.h \
  - ../../include/apr_lib.h ../../file_io/unix/fileio.h \
  - ../../include/apr_private.h
  -poll.o: poll.c networkio.h ../../include/apr_network_io.h \
  - ../../include/apr_general.h ../../include/apr.h \
  - ../../include/apr_errno.h ../../include/apr_file_io.h \
  - ../../include/apr_time.h ../../include/apr_portable.h \
  - ../../include/apr_thread_proc.h ../../include/apr_lock.h \
  - ../../include/apr_lib.h ../../file_io/unix/fileio.h \
  - ../../include/apr_private.h
  -sendrecv.o: sendrecv.c networkio.h ../../include/apr_network_io.h \
  - ../../include/apr_general.h ../../include/apr.h \
  - ../../include/apr_errno.h ../../include/apr_file_io.h \
  - ../../include/apr_time.h ../../include/apr_portable.h \
  - ../../include/apr_thread_proc.h ../../include/apr_lock.h \
  - ../../include/apr_lib.h ../../file_io/unix/fileio.h \
  - ../../include/apr_private.h
  -sockaddr.o: sockaddr.c networkio.h ../../include/apr_network_io.h \
  - ../../include/apr_general.h ../../include/apr.h \
  - ../../include/apr_errno.h ../../include/apr_file_io.h \
  - ../../include/apr_time.h ../../include/apr_portable.h \
  - ../../include/apr_thread_proc.h ../../include/apr_lock.h \
  - ../../include/apr_lib.h ../../file_io/unix/fileio.h \
  - ../../include/apr_private.h
  -sockets.o: sockets.c networkio.h ../../include/apr_network_io.h \
  - ../../include/apr_general.h ../../include/apr.h \
  - ../../include/apr_errno.h ../../include/apr_file_io.h \
  - ../../include/apr_time.h ../../include/apr_portable.h \
  - ../../include/apr_thread_proc.h ../../include/apr_lock.h \
  - ../../include/apr_lib.h ../../file_io/unix/fileio.h \
  - ../../include/apr_private.h
  -sockopt.o: sockopt.c networkio.h ../../include/apr_network_io.h \
  - ../../include/apr_general.h ../../include/apr.h \
  - ../../include/apr_errno.h ../../include/apr_file_io.h \
  - ../../include/apr_time.h ../../include/apr_portable.h \
  - ../../include/apr_thread_proc.h ../../include/apr_lock.h \
  - ../../include/apr_lib.h ../../file_io/unix/fileio.h \
  - ../../include/apr_private.h
  
  
  
  1.15      +2 -53     apache-2.0/src/lib/apr/threadproc/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/Makefile.in,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Makefile.in	2000/11/09 06:47:52	1.14
  +++ Makefile.in	2000/11/15 12:22:13	1.15
  @@ -1,8 +1,3 @@
  -#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  -#LIBS=$(EXTRA_LIBS) $(LIBS1)
  -#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
  -#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  -
   CC=@CC@
   RANLIB=@RANLIB@
   CFLAGS=@CFLAGS@ @OPTIM@
  @@ -10,6 +5,7 @@
   LDFLAGS=@LDFLAGS@ $(LIBS)
   INCDIR=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
  +MKDEP=../../helpers/mkdep.sh
   
   LIB=libthreadproc.a
   
  @@ -40,54 +36,7 @@
   	$(AR) cr $@ $(OBJS)
   	$(RANLIB) $@
   
  -#
  -# We really don't expect end users to use this rule.  It works only with
  -# gcc, and rebuilds Makefile.in.  You have to re-run configure after
  -# using it.
  -#
   depend:
  -	cp Makefile.in Makefile.in.bak \
  -	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
  -	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
  -	           -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
  -		> Makefile.in \
  -	    && rm Makefile.new
  +	$(MKDEP) $(INCLUDES) $(CFLAGS) *.c
   
   # DO NOT REMOVE
  -apr_proc_stub.o: apr_proc_stub.c
  -proc.o: proc.c threadproc.h $(INCDIR)/apr_thread_proc.h \
  - $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  - $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  - $(INCDIR)/apr_time.h ../../file_io/unix/fileio.h \
  - $(INCDIR)/apr_private.h $(INCDIR)/apr_lib.h \
  - $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
  - $(INCDIR)/apr_lock.h
  -procsup.o: procsup.c threadproc.h $(INCDIR)/apr_thread_proc.h \
  - $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  - $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  - $(INCDIR)/apr_time.h ../../file_io/unix/fileio.h \
  - $(INCDIR)/apr_private.h $(INCDIR)/apr_lib.h \
  - $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
  - $(INCDIR)/apr_lock.h
  -signals.o: signals.c threadproc.h $(INCDIR)/apr_thread_proc.h \
  - $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  - $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  - $(INCDIR)/apr_time.h ../../file_io/unix/fileio.h \
  - $(INCDIR)/apr_private.h $(INCDIR)/apr_lib.h \
  - $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
  - $(INCDIR)/apr_lock.h
  -thread.o: thread.c threadproc.h $(INCDIR)/apr_thread_proc.h \
  - $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  - $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  - $(INCDIR)/apr_time.h ../../file_io/unix/fileio.h \
  - $(INCDIR)/apr_private.h $(INCDIR)/apr_lib.h \
  - $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
  - $(INCDIR)/apr_lock.h
  -threadpriv.o: threadpriv.c threadproc.h \
  - $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
  - $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  - $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
  - ../../file_io/unix/fileio.h $(INCDIR)/apr_private.h \
  - $(INCDIR)/apr_lib.h $(INCDIR)/apr_portable.h \
  - $(INCDIR)/apr_network_io.h $(INCDIR)/apr_lock.h
  
  
  
  1.7       +2 -27     apache-2.0/src/lib/apr/dso/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/beos/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.in	2000/11/09 06:08:35	1.6
  +++ Makefile.in	2000/11/15 12:22:14	1.7
  @@ -1,8 +1,3 @@
  -#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  -#LIBS=$(EXTRA_LIBS) $(LIBS1)
  -#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
  -#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  -
   CC=@CC@
   RANLIB=@RANLIB@
   CFLAGS=@CFLAGS@ @OPTIM@
  @@ -10,6 +5,7 @@
   LDFLAGS=@LDFLAGS@ $(LIBS)
   INCDIR=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
  +MKDEP=../../helpers/mkdep.sh
   
   LIB=libdso.a
   
  @@ -32,28 +28,7 @@
   	$(AR) cr $@ $(OBJS)
   	$(RANLIB) $@
   
  -#
  -# We really don't expect end users to use this rule.  It works only with
  -# gcc, and rebuilds Makefile.in.  You have to re-run configure after
  -# using it.
  -#
   depend:
  -	cp Makefile.in Makefile.in.bak \
  -	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
  -	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
  -	           -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
  -		> Makefile.in \
  -	    && rm Makefile.new
  +	$(MKDEP) $(INCLUDES) $(CFLAGS) *.c
   
   # DO NOT REMOVE
  -getopt.o: getopt.c misc.h ../../include/apr_private.h \
  - ../../include/apr_general.h ../../include/apr.h \
  - ../../include/apr_errno.h ../../include/apr_pools.h \
  - ../../include/apr_lib.h ../../include/apr_file_io.h \
  - ../../include/apr_getopt.h
  -start.o: start.c misc.h ../../include/apr_private.h \
  - ../../include/apr_general.h ../../include/apr.h \
  - ../../include/apr_errno.h ../../include/apr_pools.h \
  - ../../include/apr_lib.h ../../include/apr_file_io.h \
  - ../../include/apr_getopt.h
  
  
  

Mime
View raw message