You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@apr.apache.org by Jeff Trawick <tr...@bellsouth.net> on 2000/11/15 13:16:22 UTC
[OS/2 patch] change the way dependencies are built in APR makefiles
Brian, your sed logic to change backslashes to forward slashes is
lost. I guess you could put that in mkdep.sh for everybody, but I
doubt that the slashes make a difference.
I'll go ahead and commit if you want but the changes are not tested.
Index: dso/os2/Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/os2/Makefile.in,v
retrieving revision 1.8
diff -u -r1.8 Makefile.in
--- dso/os2/Makefile.in 2000/11/14 06:40:02 1.8
+++ dso/os2/Makefile.in 2000/11/15 12:13:43
@@ -1,8 +1,3 @@
-#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
-#LIBS=$(EXTRA_LIBS) $(LIBS1)
-#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
-#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-
SHELL=@SH@
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=libdso.a
@@ -35,25 +31,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 | sed -e "s%\\\\\(.\)%/\\1%g" >> 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
-dso.o: dso.c $(OSDIR)/dso.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_dso.h
Index: file_io/os2/Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/Makefile.in,v
retrieving revision 1.15
diff -u -r1.15 Makefile.in
--- file_io/os2/Makefile.in 2000/11/14 13:33:03 1.15
+++ file_io/os2/Makefile.in 2000/11/15 12:13:43
@@ -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@
@@ -12,6 +7,7 @@
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
+MKDEP=../../helpers/mkdep.sh
LIB=file.a
@@ -42,86 +38,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 | sed -e "s%\\\\\(.\)%/\\1%g" >> 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
-dir.o: dir.c $(OSDIR)/fileio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.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
-fileacc.o: fileacc.c ../unix/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)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_tables.h $(OSDIR)/fileio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_lock.h
-filedup.o: filedup.c $(OSDIR)/fileio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.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
-filestat.o: filestat.c $(OSDIR)/fileio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.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
-maperrorcode.o: maperrorcode.c $(OSDIR)/fileio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- ../../network_io/os2/os2calls.h ../../network_io/os2/os2nerrno.h
-open.o: open.c $(OSDIR)/fileio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.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_network_io.h \
- $(INCDIR)/apr_dso.h $(INCDIR)/apr_strings.h
-pipe.o: pipe.c $(OSDIR)/fileio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.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
-readwrite.o: readwrite.c $(OSDIR)/fileio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.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
-seek.o: seek.c $(OSDIR)/fileio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.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
Index: locks/os2/Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/Makefile.in,v
retrieving revision 1.10
diff -u -r1.10 Makefile.in
--- locks/os2/Makefile.in 2000/11/14 06:40:06 1.10
+++ locks/os2/Makefile.in 2000/11/15 12:13:44
@@ -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@
@@ -12,6 +7,7 @@
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
+MKDEP=../../helpers/mkdep.sh
LIB=lock.a
@@ -34,27 +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 | sed -e "s%\\\\\(.\)%/\\1%g" >> 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
-locks.o: locks.c $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.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_strings.h $(OSDIR)/locks.h \
- $(INCDIR)/apr_lock.h $(OSDIR)/fileio.h \
- $(INCDIR)/apr_private.h
Index: network_io/os2/Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/Makefile.in,v
retrieving revision 1.11
diff -u -r1.11 Makefile.in
--- network_io/os2/Makefile.in 2000/11/14 06:40:06 1.11
+++ network_io/os2/Makefile.in 2000/11/15 12:13:44
@@ -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@
@@ -12,6 +7,7 @@
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
+MKDEP=../../helpers/mkdep.sh
LIB=network.a
@@ -39,76 +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 | sed -e "s%\\\\\(.\)%/\\1%g" >> 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
-os2calls.o: os2calls.c $(OSDIR)/networkio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(OSDIR)/os2calls.h $(OSDIR)/os2nerrno.h \
- $(INCDIR)/apr_portable.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_tables.h
-poll.o: poll.c $(OSDIR)/networkio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(OSDIR)/os2calls.h $(OSDIR)/os2nerrno.h \
- $(INCDIR)/apr_portable.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_tables.h
-sendrecv.o: sendrecv.c $(OSDIR)/networkio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(OSDIR)/os2calls.h $(OSDIR)/os2nerrno.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h
-sockaddr.o: sockaddr.c ../unix/sockaddr.c \
- $(OSDIR)/networkio.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/../network_io/os2/os2nerrno.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(OSDIR)/os2calls.h $(OSDIR)/os2nerrno.h \
- $(INCDIR)/apr_strings.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_tables.h ../unix/sa_common.c
-sockets.o: sockets.c $(OSDIR)/networkio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(OSDIR)/os2calls.h $(OSDIR)/os2nerrno.h \
- $(INCDIR)/apr_portable.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_tables.h os2calls.h os2nerrno.h
-sockopt.o: sockopt.c $(OSDIR)/networkio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(OSDIR)/os2calls.h $(OSDIR)/os2nerrno.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
- $(INCDIR)/apr_strings.h
Index: shmem/os2/Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/os2/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- shmem/os2/Makefile.in 2000/11/14 06:40:06 1.5
+++ shmem/os2/Makefile.in 2000/11/15 12:13:45
@@ -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@
@@ -12,6 +7,7 @@
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
+MKDEP=../../helpers/mkdep.sh
LIB=shmem.a
@@ -34,25 +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 | sed -e "s%\\\\\(.\)%/\\1%g" >> 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
-shmem.o: shmem.c $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
- $(INCDIR)/apr_shmem.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_strings.h
Index: threadproc/os2/Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/Makefile.in,v
retrieving revision 1.11
diff -u -r1.11 Makefile.in
--- threadproc/os2/Makefile.in 2000/11/14 06:40:07 1.11
+++ threadproc/os2/Makefile.in 2000/11/15 12:13:45
@@ -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@
@@ -12,6 +7,7 @@
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
+MKDEP=../../helpers/mkdep.sh
LIB=threadproc.a
@@ -37,57 +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 | sed -e "s%\\\\\(.\)%/\\1%g" >> 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
-proc.o: proc.c $(OSDIR)/threadproc.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
- $(INCDIR)/apr_time.h $(OSDIR)/fileio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_lock.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_portable.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_dso.h \
- $(INCDIR)/apr_strings.h
-signals.o: signals.c $(OSDIR)/threadproc.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
- $(INCDIR)/apr_time.h $(OSDIR)/fileio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_lock.h
-thread.o: thread.c $(OSDIR)/threadproc.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_tables.h \
- $(OSDIR)/fileio.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_lock.h
-threadcancel.o: threadcancel.c $(OSDIR)/threadproc.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
- $(INCDIR)/apr_time.h $(OSDIR)/fileio.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_lock.h
-threadpriv.o: threadpriv.c $(OSDIR)/threadproc.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_tables.h \
- $(OSDIR)/fileio.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_lock.h
--
Jeff Trawick | trawick@ibm.net | PGP public key at web site:
http://www.geocities.com/SiliconValley/Park/9289/
Born in Roswell... married an alien...
Re: [OS/2 patch] change the way dependencies are built in APR makefiles
Posted by Brian Havard <br...@kheldar.apana.org.au>.
On Wed, 15 Nov 2000 07:16:22 -0500, Jeff Trawick wrote:
>Brian, your sed logic to change backslashes to forward slashes is
>lost. I guess you could put that in mkdep.sh for everybody, but I
>doubt that the slashes make a difference.
It's not necessary here, it was only done to match the INCDIR etc
substitutions later on.
>I'll go ahead and commit if you want but the changes are not tested.
Just commit it. If anything's broken I'll fix it but I just tried misc/unix
which is used on OS/2 & it works fine.
--
______________________________________________________________________________
| Brian Havard | "He is not the messiah! |
| brianh@kheldar.apana.org.au | He's a very naughty boy!" - Life of Brian |
------------------------------------------------------------------------------