You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@locus.apache.org on 2000/11/15 12:50:13 UTC
cvs commit: apache-2.0/src/lib/apr/user/unix Makefile.in
trawick 00/11/15 03:50:12
Modified: src/lib/apr/dso/os390 Makefile.in
src/lib/apr/dso/unix Makefile.in
src/lib/apr/file_io/unix Makefile.in
src/lib/apr/i18n/unix Makefile.in
src/lib/apr/lib Makefile.in
src/lib/apr/locks/unix Makefile.in
src/lib/apr/misc/unix Makefile.in
src/lib/apr/mmap/unix Makefile.in
src/lib/apr/network_io/unix Makefile.in
src/lib/apr/passwd Makefile.in
src/lib/apr/shmem/unix Makefile.in
src/lib/apr/strings Makefile.in
src/lib/apr/tables Makefile.in
src/lib/apr/test Makefile.in
src/lib/apr/threadproc/unix Makefile.in
src/lib/apr/time/unix Makefile.in
src/lib/apr/user/unix Makefile.in
Log:
This patch removes the dependencies from Makefile.in. Dependencies
will not be checked into CVS, as they are added to Makefile when the
user runs "make depend." The exact mechanism for building
dependencies is moved to a script called mkdep.sh in the APR helpers
directory. Folks are free to make the mechanism more general (i.e.,
work on systems without gcc -MM), but for now it still requires gcc
-MM. The patch also removes some commented out variable definitions
and rules.
BeOS- and OS/2-specific makefiles have not been updated. I'll post a
patch to those or go ahead and commit them later, but David and Brian
will get to test them.
Revision Changes Path
1.3 +5 -31 apache-2.0/src/lib/apr/dso/os390/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/os390/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 2000/11/09 06:08:36 1.2
+++ Makefile.in 2000/11/15 11:49:35 1.3
@@ -1,8 +1,3 @@
-#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
-#LIBS=$(EXTRA_LIBS) $(LIBS1)
-#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
-#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-
RM=@RM@
CC=@CC@
RANLIB=@RANLIB@
@@ -11,6 +6,7 @@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../../include
INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+MKDEP=../../helpers/mkdep.sh
LIB=libdso.a
@@ -24,37 +20,15 @@
clean:
$(RM) -f *.o *.a *.so
-distclean: clean
- -$(RM) -f Makefile
-
-
$(LIB): $(OBJS)
$(RM) -f $@
$(AR) cr $@ $(OBJS)
$(RANLIB) $@
+
+distclean: clean
+ -$(RM) -f Makefile
-#
-# 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
1.13 +2 -22 apache-2.0/src/lib/apr/dso/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/unix/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.in 2000/11/09 06:08:36 1.12
+++ Makefile.in 2000/11/15 11:49:40 1.13
@@ -1,8 +1,3 @@
-#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
-#LIBS=$(EXTRA_LIBS) $(LIBS1)
-#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
-#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-
RM=@RM@
CC=@CC@
AR=@AR@
@@ -12,6 +7,7 @@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../../include
INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+MKDEP=../../helpers/mkdep.sh
LIB=libdso.a
@@ -34,23 +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
-dso.o: dso.c $(INCDIR)/arch/unix/dso.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_dso.h
1.19 +2 -66 apache-2.0/src/lib/apr/file_io/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 2000/11/14 06:40:03 1.18
+++ Makefile.in 2000/11/15 11:49:46 1.19
@@ -1,8 +1,3 @@
-#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
-#LIBS=$(EXTRA_LIBS) $(LIBS1)
-#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
-#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-
RM=@RM@
CC=@CC@
RANLIB=@RANLIB@
@@ -13,8 +8,7 @@
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-#LIB=libfile.a
+MKDEP=../../helpers/mkdep.sh
OBJS=dir.o \
fileacc.o \
@@ -37,65 +31,7 @@
distclean: clean
-$(RM) -f 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.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
-dir.o: dir.c $(INCDIR)/apr_strings.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_tables.h \
- $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h
-fileacc.o: fileacc.c $(INCDIR)/apr_strings.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_tables.h
-filedup.o: filedup.c $(INCDIR)/apr_strings.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_tables.h \
- $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h
-filestat.o: filestat.c $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h
-fullrw.o: fullrw.c $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h
-open.o: open.c $(INCDIR)/apr_strings.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_tables.h \
- $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h
-pipe.o: pipe.c $(INCDIR)/apr_strings.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_tables.h
-readwrite.o: readwrite.c $(INCDIR)/apr_lock.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h
-seek.o: seek.c
1.9 +2 -24 apache-2.0/src/lib/apr/i18n/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/i18n/unix/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 2000/11/09 06:19:12 1.8
+++ Makefile.in 2000/11/15 11:49:51 1.9
@@ -1,4 +1,3 @@
-
RM=@RM@
CC=@CC@
RANLIB=@RANLIB@
@@ -7,6 +6,7 @@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../../include
INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+MKDEP=../../helpers/mkdep.sh
OBJS=xlate.o
@@ -21,29 +21,7 @@
distclean: clean
-$(RM) -f Makefile
-
-#
-# 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
-utf8_ucs2.o: utf8_ucs2.c $(INCDIR)/arch/unix/i18n.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_xlate.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h
-xlate.o: xlate.c $(INCDIR)/apr_private.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_tables.h \
- $(INCDIR)/apr_strings.h $(INCDIR)/apr_xlate.h
1.33 +2 -37 apache-2.0/src/lib/apr/lib/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/Makefile.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Makefile.in 2000/11/09 14:59:20 1.32
+++ Makefile.in 2000/11/15 11:49:51 1.33
@@ -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@
AR=@AR@
@@ -12,8 +7,7 @@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../include
INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch/@OSDIR@
-
-#LIB=@LIBPREFIX@apr.a
+MKDEP=../helpers/mkdep.sh
OBJS=apr_pools.o
@@ -28,36 +22,7 @@
distclean: clean
-$(RM) -f 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.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_pools.o: apr_pools.c $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_portable.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_lock.h \
- $(INCDIR)/apr_dso.h $(INCDIR)/apr_strings.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_tables.h
-apr_signal.o: apr_signal.c $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_tables.h
1.16 +2 -47 apache-2.0/src/lib/apr/locks/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in 2000/11/09 06:25:29 1.15
+++ Makefile.in 2000/11/15 11:49:59 1.16
@@ -1,8 +1,3 @@
-#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
-#LIBS=$(EXTRA_LIBS) $(LIBS1)
-#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
-#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-
RM=@RM@
CC=@CC@
RANLIB=@RANLIB@
@@ -11,8 +6,7 @@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../../include
INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
-
-#LIB=liblock.a
+MKDEP=../../helpers/mkdep.sh
OBJS=locks.o \
crossproc.o \
@@ -29,46 +23,7 @@
distclean: clean
-$(RM) -f 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.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 $(INCDIR)/apr.h \
- $(INCDIR)/apr_strings.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/arch/unix/locks.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_lock.h
-intraproc.o: intraproc.c $(INCDIR)/arch/unix/locks.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_tables.h \
- $(INCDIR)/apr_lock.h
-locks.o: locks.c $(INCDIR)/arch/unix/locks.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_lock.h \
- $(INCDIR)/apr_strings.h $(INCDIR)/apr_portable.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_dso.h
1.26 +2 -77 apache-2.0/src/lib/apr/misc/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/Makefile.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile.in 2000/11/14 06:40:06 1.25
+++ Makefile.in 2000/11/15 11:50:02 1.26
@@ -1,8 +1,3 @@
-#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
-#LIBS=$(EXTRA_LIBS) $(LIBS1)
-#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
-#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-
RM=@RM@
CC=@CC@
RANLIB=@RANLIB@
@@ -13,8 +8,7 @@
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-#LIB=libmisc.a
+MKDEP=../../helpers/mkdep.sh
OBJS=start.o getopt.o otherchild.o errorcodes.o rand.o canonerr.o \
uuid.o getuuid.o
@@ -30,76 +24,7 @@
distclean: clean
-$(RM) -f 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.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: $(OSDIR)/: $$(OSDIR)/:g' \
- -e '1,$$s: $(DEFOSDIR)/: $$(DEFOSDIR)/:g' \
- -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
- > Makefile.in \
- && rm Makefile.new
+ $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
-canonerr.o: canonerr.c $(DEFOSDIR)/misc.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_getopt.h
-errorcodes.o: errorcodes.c $(DEFOSDIR)/misc.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_getopt.h $(INCDIR)/apr_strings.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_tables.h \
- $(INCDIR)/apr_dso.h
-getopt.o: getopt.c $(DEFOSDIR)/misc.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_getopt.h
-getuuid.o: getuuid.c $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_uuid.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_md5.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_tables.h \
- $(INCDIR)/apr_xlate.h
-otherchild.o: otherchild.c $(INCDIR)/apr.h \
- $(DEFOSDIR)/misc.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_getopt.h $(OSDIR)/threadproc.h \
- $(OSDIR)/fileio.h $(INCDIR)/apr_lock.h
-rand.o: rand.c $(DEFOSDIR)/misc.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_getopt.h
-start.o: start.c $(DEFOSDIR)/misc.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_getopt.h \
- $(OSDIR)/locks.h $(INCDIR)/apr_lock.h \
- $(INCDIR)/apr_strings.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_tables.h
-uuid.o: uuid.c $(INCDIR)/apr.h $(INCDIR)/apr_uuid.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_tables.h
1.16 +2 -37 apache-2.0/src/lib/apr/mmap/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in 2000/11/09 07:13:42 1.15
+++ Makefile.in 2000/11/15 11:50:03 1.16
@@ -1,8 +1,3 @@
-#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
-#LIBS=$(EXTRA_LIBS) $(LIBS1)
-#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
-#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-
RM=@RM@
CC=@CC@
RANLIB=@RANLIB@
@@ -11,6 +6,7 @@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../../include
INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+MKDEP=../../helpers/mkdep.sh
LIB=libmmap.a
@@ -27,38 +23,7 @@
distclean: clean
-$(RM) -f 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.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
-common.o: common.c $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_mmap.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_portable.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h
-mmap.o: mmap.c $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_mmap.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_portable.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h \
- $(INCDIR)/arch/unix/fileio.h $(INCDIR)/apr_tables.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h
1.20 +2 -62 apache-2.0/src/lib/apr/network_io/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.in 2000/11/14 06:40:06 1.19
+++ Makefile.in 2000/11/15 11:50:06 1.20
@@ -1,8 +1,3 @@
-#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
-#LIBS=$(EXTRA_LIBS) $(LIBS1)
-#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
-#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-
RM=@RM@
CC=@CC@
RANLIB=@RANLIB@
@@ -13,6 +8,7 @@
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
+MKDEP=../../helpers/mkdep.sh
LIB=libnetwork.a
@@ -33,63 +29,7 @@
distclean: clean
-$(RM) -f 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.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: $(OSDIR)/: $$(OSDIR)/:g' \
- -e '1,$$s: $(DEFOSDIR)/: $$(DEFOSDIR)/:g' \
- -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
- > Makefile.in \
- && rm Makefile.new
+ $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
-inet_aton.o: inet_aton.c $(INCDIR)/apr_private.h
-poll.o: poll.c $(OSDIR)/networkio.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
- $(OSDIR)/fileio.h
-sa_common.o: sa_common.c $(INCDIR)/apr.h
-sendrecv.o: sendrecv.c $(OSDIR)/networkio.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_tables.h
-sockaddr.o: sockaddr.c $(OSDIR)/networkio.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_strings.h sa_common.c
-sockets.o: sockets.c $(OSDIR)/networkio.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_portable.h \
- $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h
-sockopt.o: sockopt.c $(OSDIR)/networkio.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_strings.h
1.3 +2 -35 apache-2.0/src/lib/apr/passwd/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/passwd/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 2000/11/13 18:32:29 1.2
+++ Makefile.in 2000/11/15 11:50:07 1.3
@@ -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@
AR=@AR@
@@ -12,8 +7,7 @@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../include
INCLUDES=-I$(INCDIR)
-
-#LIB=@LIBPREFIX@apr.a
+MKDEP=../helpers/mkdep.sh
OBJS=apr_md5.o \
apr_getpass.o
@@ -29,34 +23,7 @@
distclean: clean
-$(RM) -f 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.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_getpass.o: apr_getpass.c $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_strings.h $(INCDIR)/apr.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h $(INCDIR)/apr_tables.h
-apr_md5.o: apr_md5.c $(INCDIR)/apr_private.h $(INCDIR)/apr_strings.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_md5.h $(INCDIR)/apr_xlate.h
1.14 +2 -20 apache-2.0/src/lib/apr/shmem/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.in 2000/11/09 06:36:04 1.13
+++ Makefile.in 2000/11/15 11:50:07 1.14
@@ -1,8 +1,3 @@
-#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
-#LIBS=$(EXTRA_LIBS) $(LIBS1)
-#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
-#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-
RM=@RM@
CC=@CC@
AR=@AR@
@@ -13,6 +8,7 @@
INCDIR=../../include
INCDIR1=mm
INCLUDES=-I$(INCDIR) -I$(INCDIR1)
+MKDEP=../../helpers/mkdep.sh
LIB=libshmem.a
@@ -39,21 +35,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
-shmem.o: shmem.c mm/mm.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_shmem.h
1.6 +2 -51 apache-2.0/src/lib/apr/strings/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/strings/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 2000/11/09 06:38:15 1.5
+++ Makefile.in 2000/11/15 11:50:08 1.6
@@ -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@
AR=@AR@
@@ -12,8 +7,7 @@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../include
INCLUDES=-I$(INCDIR)
-
-#LIB=@LIBPREFIX@apr.a
+MKDEP=../helpers/mkdep.sh
OBJS=apr_cpystrn.o \
apr_snprintf.o \
@@ -32,50 +26,7 @@
distclean: clean
-$(RM) -f 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.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_cpystrn.o: apr_cpystrn.c $(INCDIR)/apr.h $(INCDIR)/apr_strings.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_private.h
-apr_fnmatch.o: apr_fnmatch.c $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_fnmatch.h $(INCDIR)/apr_errno.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_tables.h
-apr_snprintf.o: apr_snprintf.c $(INCDIR)/apr.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_tables.h
-apr_strings.o: apr_strings.c $(INCDIR)/apr.h $(INCDIR)/apr_strings.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_private.h
-apr_strnatcmp.o: apr_strnatcmp.c $(INCDIR)/apr_strings.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_tables.h
1.4 +2 -32 apache-2.0/src/lib/apr/tables/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/tables/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 2000/11/09 15:01:23 1.3
+++ Makefile.in 2000/11/15 11:50:09 1.4
@@ -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@
AR=@AR@
@@ -12,6 +7,7 @@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../include
INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+MKDEP=../helpers/mkdep.sh
OBJS=apr_tables.o \
apr_hash.o
@@ -27,33 +23,7 @@
distclean: clean
-$(RM) -f 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.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_hash.o: apr_hash.c $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h $(INCDIR)/apr_hash.h
-apr_tables.o: apr_tables.c $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_strings.h $(INCDIR)/apr_lib.h
1.26 +2 -71 apache-2.0/src/lib/apr/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/Makefile.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile.in 2000/10/06 12:19:42 1.25
+++ Makefile.in 2000/11/15 11:50:10 1.26
@@ -1,9 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
-#LIBS=$(EXTRA_LIBS) $(LIBS1)
-#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
-#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-
RM=@RM@
CC=@CC@
RANLIB=@RANLIB@
@@ -12,6 +6,7 @@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../include
INCLUDES=-I$(INCDIR)
+MKDEP=../helpers/mkdep.sh
TARGETS= testmd5@EXEEXT@ \
testfile@EXEEXT@ \
@@ -111,71 +106,7 @@
distclean: clean
-$(RM) -f Makefile
-
-#
-# 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
-abc.o: abc.c $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h
-client.o: client.c $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h
-mod_test.o: mod_test.c
-server.o: server.c $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h
-testargs.o: testargs.c $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_getopt.h
-testcontext.o: testcontext.c $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_thread_proc.h
-testdso.o: testdso.c $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_pools.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_dso.h
-testfile.o: testfile.c $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_thread_proc.h
-testmmap.o: testmmap.c $(INCDIR)/apr_mmap.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_portable.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_lock.h $(INCDIR)/apr_lib.h
-testoc.o: testoc.c $(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 $(INCDIR)/apr_lib.h
-testpipe.o: testpipe.c $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_thread_proc.h
-testproc.o: testproc.c $(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 $(INCDIR)/apr_lib.h
-testshmem.o: testshmem.c $(INCDIR)/apr_shmem.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_lock.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_thread_proc.h
-testsock.o: testsock.c $(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 $(INCDIR)/apr_lib.h
-testthread.o: testthread.c $(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 $(INCDIR)/apr_lock.h
-testtime.o: testtime.c $(INCDIR)/apr_time.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_errno.h
1.25 +2 -58 apache-2.0/src/lib/apr/threadproc/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.in 2000/11/09 06:47:53 1.24
+++ Makefile.in 2000/11/15 11:50:11 1.25
@@ -1,8 +1,3 @@
-#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
-#LIBS=$(EXTRA_LIBS) $(LIBS1)
-#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
-#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-
RM=@RM@
CC=@CC@
RANLIB=@RANLIB@
@@ -11,6 +6,7 @@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../../include
INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+MKDEP=../../helpers/mkdep.sh
LIB=libthreadproc.a
@@ -31,64 +27,12 @@
distclean: clean
-$(RM) -f 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.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
-proc.o: proc.c $(INCDIR)/arch/unix/threadproc.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/arch/unix/fileio.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_strings.h \
- $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h
-procsup.o: procsup.c $(INCDIR)/arch/unix/threadproc.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/arch/unix/fileio.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h
-signals.o: signals.c $(INCDIR)/arch/unix/threadproc.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/arch/unix/fileio.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h
-thread.o: thread.c $(INCDIR)/apr.h $(INCDIR)/apr_portable.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h \
- $(INCDIR)/arch/unix/threadproc.h $(INCDIR)/apr_private.h \
- $(INCDIR)/arch/unix/fileio.h $(INCDIR)/apr_tables.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h
-threadpriv.o: threadpriv.c $(INCDIR)/apr.h \
- $(INCDIR)/apr_portable.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_lock.h \
- $(INCDIR)/apr_dso.h $(INCDIR)/arch/unix/threadproc.h \
- $(INCDIR)/apr_private.h $(INCDIR)/arch/unix/fileio.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h
1.19 +2 -41 apache-2.0/src/lib/apr/time/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 2000/11/09 06:50:16 1.18
+++ Makefile.in 2000/11/15 11:50:11 1.19
@@ -1,8 +1,3 @@
-#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
-#LIBS=$(EXTRA_LIBS) $(LIBS1)
-#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
-#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-
RM=@RM@
CC=@CC@
RANLIB=@RANLIB@
@@ -11,8 +6,7 @@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../../include
INCLUDES=-I$(INCDIR)
-
-#LIB=libtime.a
+MKDEP=../../helpers/mkdep.sh
OBJS=time.o \
timestr.o
@@ -28,40 +22,7 @@
distclean: clean
-$(RM) -f 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.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
-time.o: time.c $(INCDIR)/apr_portable.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_lock.h \
- $(INCDIR)/apr_dso.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_tables.h \
- $(INCDIR)/apr_private.h
-timestr.o: timestr.c $(INCDIR)/apr_portable.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_lock.h \
- $(INCDIR)/apr_dso.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_tables.h \
- $(INCDIR)/apr_private.h
1.2 +2 -22 apache-2.0/src/lib/apr/user/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/user/unix/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 2000/11/13 03:18:18 1.1
+++ Makefile.in 2000/11/15 11:50:11 1.2
@@ -1,4 +1,3 @@
-
RM=@RM@
CC=@CC@
RANLIB=@RANLIB@
@@ -7,6 +6,7 @@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../../include
INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+MKDEP=../../helpers/mkdep.sh
OBJS=homedir.o
@@ -21,27 +21,7 @@
distclean: clean
-$(RM) -f Makefile
-
-#
-# 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
-homedir.o: homedir.c $(INCDIR)/apr_strings.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_tables.h \
- $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h \
- $(INCDIR)/apr_user.h $(INCDIR)/apr_private.h