summaryrefslogtreecommitdiff
path: root/dso
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2000-11-15 16:06:08 +0000
committerJeff Trawick <trawick@apache.org>2000-11-15 16:06:08 +0000
commit085441575175b6d1f95467e5d536ff64ed693a66 (patch)
tree3fddbc526fd1471a8d82b79404c5d3400ff5fb58 /dso
parentcb6c61445ca8231e24fd6cf34400cf4fe36ba44e (diff)
downloadapr-085441575175b6d1f95467e5d536ff64ed693a66.tar.gz
OS/2 changes to the way dependencies are built in APR makefiles
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@60732 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dso')
-rw-r--r--dso/os2/Makefile.in26
1 files changed, 2 insertions, 24 deletions
diff --git a/dso/os2/Makefile.in b/dso/os2/Makefile.in
index 7f2c9ae8a..ba2385b0a 100644
--- a/dso/os2/Makefile.in
+++ b/dso/os2/Makefile.in
@@ -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 @@ INCDIR=../../include
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 @@ $(LIB): $(OBJS)
$(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