httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-apr/apr/threadproc/unix Makefile.in
Date Thu, 13 May 1999 13:06:53 GMT
rbb         99/05/13 06:06:53

  Modified:    apr      configure.in
               apr/test Makefile.in testfile.c
               apr/threadproc/unix Makefile.in
  Log:
  Final commit to have everything in apr use autoconf.
  
  Revision  Changes    Path
  1.8       +1 -1      apache-apr/apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/configure.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- configure.in	1999/05/12 20:32:01	1.7
  +++ configure.in	1999/05/13 13:06:51	1.8
  @@ -131,4 +131,4 @@
   AC_SUBST(RANLIB)
   AC_SUBST(PLATFORM)
   AC_OUTPUT(Makefile lib/Makefile file_io/unix/Makefile network_io/unix/Makefile
  -threadproc/unix/Makefile locks/unix/Makefile misc/unix/Makefile)
  +threadproc/unix/Makefile locks/unix/Makefile misc/unix/Makefile test/Makefile)
  
  
  
  1.2       +40 -11    apache-apr/apr/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	1999/05/12 20:32:12	1.1
  +++ Makefile.in	1999/05/13 13:06:51	1.2
  @@ -3,26 +3,41 @@
   #INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
   #LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
   
  -CC=@CC@
  -RANLIB=@RANLIB@
  -CFLAGS=@PLATFORM@ @CFLAGS@ @OPTIM@
  -LDLIBS=@LDLIBS@
  -LDFLAGS=@LDFLAGS@ $(LDLIBS)
  +CC=gcc
  +RANLIB=ranlib
  +CFLAGS=-DLINUX=20 -g -O2 
  +LDLIBS= -ldl -lm -L../network_io -lnetwork -L../threadproc -lthreadproc -L../file_io -lfile
-L../misc -lmisc -L../lib -lapr
  +LDFLAGS= $(LDLIBS)
   INCDIR=../../include
   INCDIR1=../../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) 
   
  -OBJS= testfile \
  -	 testproc \
  -	 testnet \
  +TARGETS= testfile \
  +	testproc \
  +	testsock
  +
  +OBJS= testfile.o \
  +	 testproc.o \
  +	 testsock.o
   
   .c.o:
  -	$(CC) $(CFLAGS) -c $(INCLUDES) $<
  +	$(CC) -c $(CFLAGS) $(INCLUDES) $<
   
  -all: $(OBJS) 
  +all: $(TARGETS) 
   
  +testfile: testfile.o
  +	$(CC) $(CFLAGS) testfile.o -o testfile $(LDFLAGS) 
  +
  +testproc: testproc.o
  +	$(CC) $(CFLAGS) testproc.o -o testproc $(LDFLAGS)
  +
  +testsock: testsock.o client.o server.o 
  +	$(CC) $(CFLAGS) testsock.o -o testsock  $(LDFLAGS)
  +	$(CC) $(CFLAGS) server.o -o server $(LDFLAGS) 
  +	$(CC) $(CFLAGS) client.o -o client $(LDFLAGS)
  +
   clean:
  -	$(RM) -f *.o *.a *.so
  +	$(RM) -f *.o *.a *.so $(TARGETS)
   
   distclean: clean
   	-$(RM) -f Makefile
  @@ -44,3 +59,17 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  +ab_apr.o: ab_apr.c $(INCDIR)/apr_network_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h
  +client.o: client.c $(INCDIR)/apr_network_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h
  +server.o: server.c $(INCDIR)/apr_network_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h
  +testfile.o: testfile.c $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h
  +testproc.o: testproc.c $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr_errno.h
  +testsock.o: testsock.c $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr_errno.h
  
  
  
  1.16      +2 -2      apache-apr/apr/test/testfile.c
  
  Index: testfile.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/testfile.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- testfile.c	1999/05/12 19:15:28	1.15
  +++ testfile.c	1999/05/13 13:06:51	1.16
  @@ -176,7 +176,7 @@
       testdirs(context); 
       test_filedel(context);
    
  -    return 1;
  +    exit(1);
   }
   
   int test_filedel(ap_context_t *context)
  @@ -198,7 +198,7 @@
       }
   
       thefile = ap_open(context, "testdel", APR_READ, APR_UREAD | APR_UWRITE | APR_GREAD);
  -    if (thefile == NULL) {
  +    if (thefile != NULL) {
           return APR_FAILURE;
       }
     
  
  
  
  1.2       +1 -0      apache-apr/apr/threadproc/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/threadproc/unix/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	1999/05/12 20:32:13	1.1
  +++ Makefile.in	1999/05/13 13:06:52	1.2
  @@ -19,6 +19,7 @@
   	thread.o \
   	threadcancel.o \
   	threadpriv.o \
  +	signals.o
   
   .c.o:
   	$(CC) $(CFLAGS) -c $(INCLUDES) $<
  
  
  

Mime
View raw message