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 /locks | |
| 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 'locks')
| -rw-r--r-- | locks/os2/Makefile.in | 24 | ||||
| -rw-r--r-- | locks/os2/locks.c | 4 |
2 files changed, 16 insertions, 12 deletions
diff --git a/locks/os2/Makefile.in b/locks/os2/Makefile.in index eb0fffafb..df319b749 100644 --- a/locks/os2/Makefile.in +++ b/locks/os2/Makefile.in @@ -9,7 +9,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=lock.a @@ -41,16 +43,18 @@ 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: $(INCDIR1)/: $$(INCDIR1)/:g' \ - -e '1,$$s: $(INCDIR2)/: $$(INCDIR2)/: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 -locks.o: locks.c $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \ - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_lib.h \ - $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_time.h \ - $(INCDIR1)/apr_thread_proc.h locks.h $(INCDIR1)/apr_lock.h \ - $(INCDIR2)/fileio.h $(INCDIR1)/apr_private.h +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 diff --git a/locks/os2/locks.c b/locks/os2/locks.c index 9dd2e589d..d5a4a2add 100644 --- a/locks/os2/locks.c +++ b/locks/os2/locks.c @@ -55,8 +55,8 @@ #include "apr_general.h" #include "apr_lib.h" #include "apr_strings.h" -#include "os2/locks.h" -#include "os2/fileio.h" +#include "locks.h" +#include "fileio.h" #include <string.h> #define INCL_DOS #include <os2.h> |