]> granicus.if.org Git - apache/commitdiff
final NetWare mod_lua build fixes.
authorGuenter Knauf <fuankg@apache.org>
Mon, 13 Jul 2009 01:44:24 +0000 (01:44 +0000)
committerGuenter Knauf <fuankg@apache.org>
Mon, 13 Jul 2009 01:44:24 +0000 (01:44 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@793442 13f79535-47bb-0310-9956-ffa450edef68

modules/lua/NWGNUmakefile

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