rbb 99/07/01 10:48:18
Modified:apr Makefile.in configure.in
Added: apr/shmem/unix Makefile.in shmem.c
include apr_shmem.h
Log:
First pass at shared memory for Unix.
Revision ChangesPath
1.12 +2 -2 apache-apr/apr/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/apache-apr/apr/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 1999/06/30 19:45:30 1.11
+++ Makefile.in 1999/07/01 17:48:11 1.12
@@ -22,9 +22,9 @@
#
# Macros for target determination
#
-MODULES=lib file_io network_io threadproc locks misc time
+MODULES=lib file_io network_io threadproc locks misc time shmem
SUBDIRS=lib file_io/@OSDIR@ network_io/@OSDIR@ threadproc/@OSDIR@ \
-locks/@OSDIR@ misc/@OSDIR@ time/@OSDIR@ signal/@OSDIR@
+locks/@OSDIR@ misc/@OSDIR@ time/@OSDIR@ signal/@OSDIR@ shmem/@OSDIR@
#
# Rules for turning inputs into outputs
1.24 +2 -1 apache-apr/apr/configure.in
Index: configure.in
===
RCS file: /home/cvs/apache-apr/apr/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- configure.in 1999/06/30 19:45:31 1.23
+++ configure.in 1999/07/01 17:48:12 1.24
@@ -179,4 +179,5 @@
AC_OUTPUT(Makefile lib/Makefile file_io/$OSDIR/Makefile
network_io/$OSDIR/Makefile threadproc/$OSDIR/Makefile
locks/$OSDIR/Makefile misc/$OSDIR/Makefile
- time/$OSDIR/Makefile signal/$OSDIR/Makefile test/Makefile)
+ time/$OSDIR/Makefile signal/$OSDIR/Makefile shmem/$OSDIR/Makefile
+ test/Makefile)
1.1 apache-apr/apr/shmem/unix/Makefile.in
Index: Makefile.in
===
#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
#LIBS=$(EXTRA_LIBS) $(LIBS1)
#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LDLIBS)
INCDIR=../../include
INCDIR1=../../../include
INCLUDES=-I$(INCDIR) -I$(INCDIR1) -Imm -I.
LIB=../libshmem.a
OBJS=shmem.o \
.c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $<
all: $(LIB)
clean:
$(RM) -f *.o *.a *.so
distclean: clean
-$(RM) -f Makefile
$(OBJS): Makefile
$(LIB): $(OBJS)
$(RM) -f $@
$(AR) cr $@ $(OBJS)
$(RANLIB) $@
#
# We really don't expect end users to use this rule. It works only with
# gcc, and rebuilds Makefile.tmpl. 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
# DO NOT REMOVE
1.1 apache-apr/apr/shmem/unix/shmem.c
Index: shmem.c
===
/*
* Copyright (c) 1999 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. All advertising materials mentioning features or use of this
*software must display the following acknowledgment:
*"This product includes software developed by the Apache Group
*for use in the Apache HTTP server project (http://www.apache.org/)."
*
* 4. The names "Apache Server" and "Apache Group" must not be used to
*endorse or promote products derived from this software without
*prior written permission. For written permission, please contact
*[EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
*nor may "Apache" appear in their names without prior written
*permission of the Apache Group.
*
* 6. Redistributions of any form whatsoever must retain the following
*acknow
