From: Guenter Knauf <fuankg@apache.org>
Date: Mon, 13 Jul 2009 01:44:24 +0000 (+0000)
Subject: final NetWare mod_lua build fixes.
X-Git-Tag: 2.3.3~444
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3aa02d23ccc79d94aa550f29fe5c8e612cf397ee;p=thirdparty%2Fapache%2Fhttpd.git

final NetWare mod_lua build fixes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@793442 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/lua/NWGNUmakefile b/modules/lua/NWGNUmakefile
index 8a7e3377698..0fe0d586f0e 100644
--- a/modules/lua/NWGNUmakefile
+++ b/modules/lua/NWGNUmakefile
@@ -24,19 +24,20 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS	+= \
+			$(LUASRC)/src \
 			$(AP_WORK)/include \
 			$(NWOS) \
 			$(AP_WORK)/modules/arch/netware \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(APR) \
-			$(LUASRC)/src \
 			$(EOLIST)
 
 #
 # These flags will come after CFLAGS
 #
 XCFLAGS		+= \
+			-opt nointrinsics \
 			$(EOLIST)
 
 #
@@ -224,8 +225,6 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
-#	@$(LUASRC)/netware/lua.imp \
-
 #
 # Any symbols exported to here
 #
@@ -237,8 +236,10 @@ FILES_nlm_exports = \
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
+UNWANTED = $(LUASRC)/src/lua.c
+
 FILES_lib_objs = \
-	$(patsubst $(LUASRC)/src/%.c,$(OBJDIR)/%.o, $(wildcard $(LUASRC)/src/*.c)) \
+	$(patsubst $(LUASRC)/src/%.c,$(OBJDIR)/%.o, $(filter-out $(UNWANTED), $(wildcard $(LUASRC)/src/*.c))) \
 	$(EOLIST)
 
 #