diff options
| author | Brian Havard <bjh@apache.org> | 2000-11-14 06:40:07 +0000 |
|---|---|---|
| committer | Brian Havard <bjh@apache.org> | 2000-11-14 06:40:07 +0000 |
| commit | 12d2674e20b7d2d849f570a07cd0967839b3822b (patch) | |
| tree | d4f70b5ae7a2241e1bfff696ec914f241741062a /dso | |
| parent | 56aa150bfb90f3a8c9bf1c89d9610fb083aa5581 (diff) | |
| download | apr-12d2674e20b7d2d849f570a07cd0967839b3822b.tar.gz | |
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: https://svn.apache.org/repos/asf/apr/apr/trunk@60720 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dso')
| -rw-r--r-- | dso/os2/Makefile.in | 17 | ||||
| -rw-r--r-- | dso/os2/dso.c | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/dso/os2/Makefile.in b/dso/os2/Makefile.in index 374453368..7f2c9ae8a 100644 --- a/dso/os2/Makefile.in +++ b/dso/os2/Makefile.in @@ -10,7 +10,9 @@ CFLAGS=@CFLAGS@ @OPTIM@ LIBS=@LIBS@ LDFLAGS=@LDFLAGS@ $(LIBS) INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch +OSDIR=$(INCDIR)/arch/@OSDIR@ +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) LIB=libdso.a @@ -42,15 +44,16 @@ 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: $(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 -dso.o: dso.c dso.h $(INCDIR)/apr_private.h \ +dso.o: dso.c $(OSDIR)/dso.h $(INCDIR)/apr_private.h \ $(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_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 diff --git a/dso/os2/dso.c b/dso/os2/dso.c index d5bfc4cc6..d7706f138 100644 --- a/dso/os2/dso.c +++ b/dso/os2/dso.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "os2/dso.h" +#include "dso.h" #define INCL_DOS #include <os2.h> #include <stdio.h> |