summaryrefslogtreecommitdiff
path: root/NWGNUmakefile
diff options
context:
space:
mode:
authorGuenter Knauf <fuankg@apache.org>2011-04-10 20:07:31 +0000
committerGuenter Knauf <fuankg@apache.org>2011-04-10 20:07:31 +0000
commitbccb881e4f3e67eb11d5f9d12487f77b2d37fbf2 (patch)
tree065e28d2a525d64aa978284ff78012bcdd5ab920 /NWGNUmakefile
parentd9e75f0dbcd8f1ce6f2974a6e38a9dcf6c5ec980 (diff)
downloadapr-bccb881e4f3e67eb11d5f9d12487f77b2d37fbf2.tar.gz
Prepare NetWare build system for other compilers.
Initial patch from NormW <normw gknw net>; various modifications and adds by fuankg. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1090884 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'NWGNUmakefile')
-rw-r--r--NWGNUmakefile14
1 files changed, 5 insertions, 9 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile
index 4c96325e1..19884c8e5 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -43,10 +43,9 @@ include $(APR_WORK)/build/NWGNUhead.inc
XINCDIRS += \
$(APR)/include \
$(APR)/include/private \
- $(APR)/include/arch/NetWare \
+ $(APR)/include/arch/netware \
$(APR)/include/arch/unix \
$(APR)/dbm/sdbm \
- $(APR)/memory/unix \
$(APR)/random/unix \
$(LDAPSDK)/inc \
$(EOLIST)
@@ -428,6 +427,7 @@ nlms :: libs $(TARGET_nlm)
# Updated this target to create necessary directories and copy files to the
# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
+
install :: nlms $(INSTDIRS) FORCE
$(call COPY,$(APR)/$(TARGET_nlm),$(INSTALLBASE)/)
ifndef DEST
@@ -453,9 +453,10 @@ endif
# Any specialized rules here
#
+vpath filepath.c file_io/win32
vpath %.c atomic/netware:strings:tables:passwd:time/unix
-vpath %.c file_io/unix:locks/netware:misc/netware:misc/unix:threadproc/netware
-vpath %.c poll/unix:shmem/unix:support/unix:random/unix
+vpath %.c file_io/netware:file_io/unix:locks/netware:misc/netware:misc/unix
+vpath %.c threadproc/netware:poll/unix:shmem/unix:support/unix:random/unix
vpath %.c dso/netware:memory/unix:mmap/unix:user/netware:util-misc
vpath %.c buckets:crypto:dbd:dbm:dbm/sdbm:encoding:hooks:memcache:misc:strmatch:uri:xlate
@@ -465,11 +466,6 @@ vpath %.c network_io/win32
endif
vpath %.c network_io/unix
-$(OBJDIR)/%.o: file_io/netware/%.c $(OBJDIR)/$(NLM_NAME)_cc.opt
-# @echo Compiling $<
- @echo $(DL)CC $<$(DL)
- $(CC) -cwd source -o $@ $< @$(OBJDIR)/$(NLM_NAME)_cc.opt
-
#
# Include the 'tail' makefile that has targets that depend on variables defined
# in this makefile