summaryrefslogtreecommitdiff
path: root/build/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 /build/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 'build/NWGNUmakefile')
-rw-r--r--build/NWGNUmakefile39
1 files changed, 19 insertions, 20 deletions
diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index 8be33a105..fc51a7e38 100644
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -15,6 +15,23 @@ include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
+#
+# Make sure all needed macro's are defined
+#
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS += \
+ $(APR)/include \
+ $(APR)/include/private \
+ $(APR)/include/arch/netware \
+ $(APR)/include/arch/unix \
+ $(APRBUILD) \
+ $(LDAPSDK)/inc \
+ $(EOLIST)
+
FILES_prebuild_headers = \
$(APR)/include/apr.h \
$(APR)/include/apu_want.h \
@@ -25,30 +42,12 @@ FILES_prebuild_headers = \
nlms :: $(APR)/aprlib.imp
$(APR)/aprlib.imp : make_nw_export.awk nw_export.i
-# @echo Generating $@
@echo $(DL)GEN $@$(DL)
$(AWK) -v EXPPREFIX=APR$(VERSION_MAJMIN) -f $^ >$@
-nw_export.i : nw_export.inc $(FILES_prebuild_headers) cc.opt
-# @echo Generating $@
+nw_export.i : nw_export.h $(FILES_prebuild_headers) $(CCOPT_DEPENDS)
@echo $(DL)GEN $@$(DL)
- $(CC) $< @cc.opt
-
-cc.opt : NWGNUmakefile $(APR)/build/NWGNUenvironment.inc $(APR)/build/NWGNUhead.inc $(APR)/build/NWGNUtail.inc $(CUSTOM_INI)
- @echo -P > $@
- @echo -EP >> $@
- @echo -nosyspath >> $@
- @echo -w nocmdline >> $@
- @echo $(DEFINES) -DGENEXPORTS >> $@
- @echo -I$(APR)/include >> $@
- @echo -I$(APR)/include/private >> $@
- @echo -I$(APR)/include/arch/netware >> $@
- @echo -I$(APR)/include/arch/unix >> $@
- @echo -I$(APR)/build >> $@
- @echo -ir $(NOVELLLIBC) >> $@
-ifneq "$(LDAPSDK)" ""
- @echo -ir $(LDAPSDK) >> $@
-endif
+ $(CPRE) $(CCFLAGS) -DGENEXPORTS $< -o $@
%.h: %.hnw
@echo Creating $@