rbb 99/05/12 13:32:14
Modified: apr Makefile.in configure.in
Added: apr/file_io/unix Makefile.in
apr/locks/unix Makefile.in
apr/misc/unix Makefile.in
apr/network_io/unix Makefile.in
apr/test Makefile.in
apr/threadproc/unix Makefile.in
Removed: apr/file_io/unix Makefile
apr/locks/unix Makefile
apr/misc/unix Makefile
apr/network_io/unix Makefile
apr/test Makefile
apr/threadproc/unix Makefile
Log:
Remove all Unix Makefiles, and add in autoconf Makefiles. This means all of
apr is officially using autoconf.
Revision Changes Path
1.4 +2 -2 apache-apr/apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 1999/05/10 20:11:38 1.3
+++ Makefile.in 1999/05/12 20:32:00 1.4
@@ -21,8 +21,8 @@
#
# Macros for target determination
#
-MODULES=lib
-SUBDIRS=lib
+MODULES=lib file_io network_io threadproc locks misc
+SUBDIRS=lib file_io/unix network_io/unix threadproc/unix locks/unix misc/unix
#
# Rules for turning inputs into outputs
1.7 +2 -1 apache-apr/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure.in 1999/05/10 20:11:38 1.6
+++ configure.in 1999/05/12 20:32:01 1.7
@@ -130,4 +130,5 @@
AC_SUBST(OPTIM)
AC_SUBST(RANLIB)
AC_SUBST(PLATFORM)
-AC_OUTPUT(Makefile lib/Makefile)
+AC_OUTPUT(Makefile lib/Makefile file_io/unix/Makefile
network_io/unix/Makefile
+threadproc/unix/Makefile locks/unix/Makefile misc/unix/Makefile)
1.1 apache-apr/apr/file_io/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]@ @CFLAGS@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LDLIBS)
INCDIR=../../include
INCDIR1=../../../include
INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
LIB=../libfile.a
OBJS=dir.o \
fileacc.o \
filedup.o \
filestat.o \
open.o \
pipe.o \
readwrite.o \
seek.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
dir.o: dir.c ../../../include/apr_file_io.h fileio.h \
../../../include/apr_errno.h ../../../include/apr_general.h
fileacc.o: fileacc.c ../../../include/apr_file_io.h fileio.h \
../../../include/apr_errno.h ../../../include/apr_general.h
filedup.o: filedup.c ../../../include/apr_file_io.h fileio.h \
../../../include/apr_errno.h ../../../include/apr_general.h
filestat.o: filestat.c ../../../include/apr_file_io.h fileio.h \
../../../include/apr_errno.h ../../../include/apr_general.h
open.o: open.c ../../../include/apr_file_io.h fileio.h \
../../../include/apr_errno.h ../../../include/apr_general.h \
../../include/apr_lib.h ../../include/apr_config.h \
../../include/hsregex.h
pipe.o: pipe.c ../../../include/apr_file_io.h fileio.h \
../../../include/apr_errno.h ../../../include/apr_general.h
readwrite.o: readwrite.c ../../../include/apr_file_io.h fileio.h \
../../../include/apr_errno.h ../../../include/apr_general.h
seek.o: seek.c ../../../include/apr_file_io.h fileio.h \
../../../include/apr_errno.h ../../../include/apr_general.h
1.1 apache-apr/apr/locks/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]@ @CFLAGS@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LDLIBS)
INCDIR=../../include
INCDIR1=../../../include
INCDIR2=../../file_io/unix
INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
LIB=../liblock.a
OBJS=locks.o \
crossproc.o \
intraproc.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
crossproc.o: crossproc.c ../../../include/apr_lock.h \
../../../include/apr_general.h ../../../include/apr_errno.h locks.h \
../../../include/apr_file_io.h ../../file_io/unix/fileio.h
intraproc.o: intraproc.c ../../../include/apr_lock.h \
../../../include/apr_general.h ../../../include/apr_errno.h locks.h \
../../../include/apr_file_io.h ../../file_io/unix/fileio.h
locks.o: locks.c ../../../include/apr_lock.h \
../../../include/apr_general.h ../../../include/apr_errno.h locks.h \
../../../include/apr_file_io.h ../../file_io/unix/fileio.h
1.1 apache-apr/apr/misc/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]@ @CFLAGS@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LDLIBS)
INCDIR=../../include
INCDIR1=../../../include
INCDIR2=../../file_io/unix
INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
LIB=../libmisc.a
OBJS=start.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
start.o: start.c ../../../include/apr_general.h \
../../../include/apr_errno.h ../../include/apr_pools.h \
../../include/apr_lib.h ../../include/apr_config.h \
../../include/hsregex.h
1.1 apache-apr/apr/network_io/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]@ @CFLAGS@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LDLIBS)
INCDIR=../../include
INCDIR1=../../../include
INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
LIB=../libnetwork.a
OBJS=poll.o \
sendrecv.o \
sockets.o \
sockopt.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
poll.o: poll.c ../../../include/apr_network_io.h \
../../../include/apr_general.h ../../../include/apr_errno.h \
networkio.h
sendrecv.o: sendrecv.c ../../../include/apr_errno.h \
../../../include/apr_general.h ../../../include/apr_network_io.h \
networkio.h
sockets.o: sockets.c ../../../include/apr_network_io.h \
../../../include/apr_general.h ../../../include/apr_errno.h \
networkio.h $(INCDIR)/apr_lib.h $(INCDIR)/apr_config.h \
$(INCDIR)/hsregex.h
sockopt.o: sockopt.c ../../../include/apr_network_io.h \
../../../include/apr_general.h ../../../include/apr_errno.h \
networkio.h
1.1 apache-apr/apr/test/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]@ @CFLAGS@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LDLIBS)
INCDIR=../../include
INCDIR1=../../../include
INCLUDES=-I$(INCDIR) -I$(INCDIR1)
OBJS= testfile \
testproc \
testnet \
.c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $<
all: $(OBJS)
clean:
$(RM) -f *.o *.a *.so
distclean: clean
-$(RM) -f Makefile
$(OBJS): Makefile
#
# 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/threadproc/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]@ @CFLAGS@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LDLIBS)
INCDIR=../../include
INCDIR1=../../../include
INCDIR2=../../file_io/unix
INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
LIB=../libthreadproc.a
OBJS=proc.o \
thread.o \
threadcancel.o \
threadpriv.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
proc.o: proc.c threadproc.h ../../../include/apr_thread_proc.h \
../../../include/apr_file_io.h ../../../include/apr_general.h \
../../../include/apr_errno.h ../../file_io/unix/fileio.h
signals.o: signals.c threadproc.h ../../../include/apr_thread_proc.h \
../../../include/apr_file_io.h ../../../include/apr_general.h \
../../../include/apr_errno.h ../../file_io/unix/fileio.h
thread.o: thread.c threadproc.h ../../../include/apr_thread_proc.h \
../../../include/apr_file_io.h ../../../include/apr_general.h \
../../../include/apr_errno.h
threadcancel.o: threadcancel.c threadproc.h \
../../../include/apr_thread_proc.h ../../../include/apr_file_io.h \
../../../include/apr_general.h ../../../include/apr_errno.h
threadpriv.o: threadpriv.c threadproc.h \
../../../include/apr_thread_proc.h ../../../include/apr_file_io.h \
../../../include/apr_general.h ../../../include/apr_errno.h
