Fix OS/2 build after the move of private APR headers to the include/arch/

area. This also messes with some unix stuff where it's shared with OS/2.
The strategy used to get the right platform specific include files is:

- Every Makefile.in contains something like
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)

- all APR private includes look like #include "fileio.h", ie no leading
arch directory so no #ifdef'ing needed in shared .c files.

This ensures that the include file for the target platform is always used
if it exists, otherwise the default is used.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60720 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 17 insertions, 15 deletions

diff --git a/misc/unix/Makefile.in b/misc/unix/Makefile.in
index 8c8b5ca5e..47be670f5 100644
--- a/misc/unix/Makefile.in
+++ b/misc/unix/Makefile.in
@@ -10,7 +10,9 @@ CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(LIBS)
 INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch/@OSDIR@
+OSDIR=$(INCDIR)/arch/@OSDIR@
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
 
 #LIB=libmisc.a
 
@@ -43,19 +45,20 @@ 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 \
+	    && 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
 
 # DO NOT REMOVE
-canonerr.o: canonerr.c $(INCDIR)/arch/unix/misc.h \
+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 $(INCDIR)/arch/unix/misc.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 \
@@ -63,7 +66,7 @@ errorcodes.o: errorcodes.c $(INCDIR)/arch/unix/misc.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 $(INCDIR)/arch/unix/misc.h $(INCDIR)/apr.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 \
@@ -76,26 +79,25 @@ getuuid.o: getuuid.c $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
  $(INCDIR)/apr_time.h $(INCDIR)/apr_tables.h \
  $(INCDIR)/apr_xlate.h
 otherchild.o: otherchild.c $(INCDIR)/apr.h \
- $(INCDIR)/arch/unix/misc.h $(INCDIR)/apr_private.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 $(INCDIR)/arch/unix/threadproc.h \
- $(INCDIR)/arch/unix/fileio.h $(INCDIR)/apr_tables.h \
- $(INCDIR)/apr_lib.h
-rand.o: rand.c $(INCDIR)/arch/unix/misc.h $(INCDIR)/apr.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 $(INCDIR)/arch/unix/misc.h $(INCDIR)/apr.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 \
- $(INCDIR)/arch/unix/locks.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_lock.h \
- $(INCDIR)/apr_strings.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 \