You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2012/05/03 02:15:40 UTC
svn commit: r1333274 - /apr/apr/trunk/build/NWGNUtail.inc
Author: fuankg
Date: Thu May 3 00:15:40 2012
New Revision: 1333274
URL: http://svn.apache.org/viewvc?rev=1333274&view=rev
Log:
Few more NetWare build tweaks.
Modified:
apr/apr/trunk/build/NWGNUtail.inc
Modified: apr/apr/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUtail.inc?rev=1333274&r1=1333273&r2=1333274&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUtail.inc (original)
+++ apr/apr/trunk/build/NWGNUtail.inc Thu May 3 00:15:40 2012
@@ -44,14 +44,19 @@ ifeq "$(NLM_EXIT_SYM)" ""
NLM_EXIT_SYM = _LibCPostlude
endif
-ifeq "$(XDCDATA)" ""
-XDCDATA = $(APR)/misc/netware/apr.xdc
-endif
-
ifeq "$(NLM_VERSION)" ""
NLM_VERSION = $(VERSION)
endif
+# if APACHE_UNIPROC is defined, don't include XDCData
+ifndef APACHE_UNIPROC
+ifneq "$(XDCDATA)" ""
+NLM_XDCDATA = $(XDCDATA)
+else
+NLM_XDCDATA = $(APR)/misc/netware/apr.xdc
+endif
+endif
+
#
# Create dependency lists based on the files available
#
@@ -238,7 +243,7 @@ $(TARGET_nlm) : $(FILES_nlm_objs) $(FILE
$(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS)
$(call DEL,$@)
@echo $(DL)GEN $@$(DL)
-ifdef METROWERKS
+ifeq "$(findstring mwldnlm,$(LINK))" "mwldnlm" # for Metrowerks CodeWarrior
@echo $(DL)# Do not edit this file - it is created by make!$(DL) > $@
@echo $(DL)# All your changes will be lost!!$(DL)>> $@
@echo $(DL)-warnings off$(DL)>> $@
@@ -276,7 +281,7 @@ ifneq "$(FILES_nlm_Ximports)" ""
@echo $(DL)$(foreach imppath,$(dir $(strip $(FILES_nlm_Ximports))),$(subst @,-L,$(imppath)))$(DL)>> $@
endif
@echo $(DL)-commandfile $(@:.opt=.def)$(DL)>> $@
-else
+else # for GNU nlmconv
@echo $(DL)-UT $(@:.opt=.def)$(DL)>> $@
endif
@@ -307,38 +312,36 @@ ifneq "$(NLM_CHECK_SYM)" ""
@echo $(DL)check $(NLM_CHECK_SYM)$(DL)>> $@
endif
ifneq "$(FILES_nlm_modules)" ""
- @echo $(DL)module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(module))$(DL)>> $@
+ @echo $(DL)module $(strip $(FILES_nlm_modules))$(DL)>> $@
endif
ifneq "$(FILES_nlm_imports)" ""
- @echo $(DL)import $(foreach import,$(strip $(FILES_nlm_imports)),$(import))$(DL)>> $@
+ @echo $(DL)import $(strip $(FILES_nlm_imports))$(DL)>> $@
endif
-ifdef METROWERKS
+ifeq "$(findstring mwldnlm,$(LINK))" "mwldnlm" # for Metrowerks CodeWarrior
ifneq "$(FILES_nlm_Ximports)" ""
@echo $(DL)import $(foreach import,$(notdir $(strip $(FILES_nlm_Ximports))),@$(import))$(DL)>> $@
endif
ifneq "$(FILES_nlm_exports)" ""
@echo $(DL)export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(export))$(DL)>> $@
endif
-# if APACHE_UNIPROC is defined, don't include XDCData
-ifndef APACHE_UNIPROC
- @echo $(DL)xdcdata $(notdir $(XDCDATA))$(DL)>> $@
+ifneq "$(NLM_XDCDATA)" ""
+ @echo $(DL)xdcdata $(notdir $(NLM_XDCDATA))$(DL)>> $@
endif
-else
+else # for GNU nlmconv
ifneq "$(FILES_nlm_Ximports)" ""
- @echo $(DL)import $(foreach import,$(strip $(FILES_nlm_Ximports)),$(import))$(DL)>> $@
+ @echo $(DL)import $(strip $(FILES_nlm_Ximports))$(DL)>> $@
endif
ifneq "$(FILES_nlm_exports)" ""
@echo $(DL)export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(export))$(DL)>> $@
endif
-# if APACHE_UNIPROC is defined, don't include XDCData
-ifndef APACHE_UNIPROC
- @echo $(DL)xdcdata $(XDCDATA)$(DL)>> $@
+ifneq "$(NLM_XDCDATA)" ""
+ @echo $(DL)xdcdata $(NLM_XDCDATA)$(DL)>> $@
endif
ifneq "$(strip $(FILES_nlm_objs))" ""
- @echo $(DL)input $(foreach objfile,$(strip $(FILES_nlm_objs)),$(objfile))$(DL)>> $@
+ @echo $(DL)input $(strip $(FILES_nlm_objs))$(DL)>> $@
endif
ifneq "$(FILES_nlm_libs)" ""
- @echo $(DL)input $(foreach libfile,$(strip $(FILES_nlm_libs)),$(libfile))$(DL)>> $@
+ @echo $(DL)input $(strip $(FILES_nlm_libs))$(DL)>> $@
endif
@echo $(DL)output $(TARGET_nlm)$(DL)>> $@
ifeq "$(RELEASE)" "debug"