apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r793390 - in /apr/apr/trunk: NWGNUmakefile build/NWGNUenvironment.inc xml/NWGNUmakefile
Date Sun, 12 Jul 2009 18:32:36 GMT
Author: fuankg
Date: Sun Jul 12 18:32:36 2009
New Revision: 793390

URL: http://svn.apache.org/viewvc?rev=793390&view=rev
Log:
more NetWare expat build improvements.

Modified:
    apr/apr/trunk/NWGNUmakefile
    apr/apr/trunk/build/NWGNUenvironment.inc
    apr/apr/trunk/xml/NWGNUmakefile

Modified: apr/apr/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/NWGNUmakefile?rev=793390&r1=793389&r2=793390&view=diff
==============================================================================
--- apr/apr/trunk/NWGNUmakefile (original)
+++ apr/apr/trunk/NWGNUmakefile Sun Jul 12 18:32:36 2009
@@ -201,6 +201,14 @@
 	$(APRXMLLIB) \
 	$(EOLIST)
 
+ifdef EXPATSDK
+ifdef EXPAT_LINK_STATIC
+FILES_nlm_libs += \
+	$(EXPAT_LIB) \
+	$(EOLIST)
+endif
+endif
+
 #
 # These are the modules that the above NLM target depends on to load.
 # These will be added as a module command in the link.opt file.
@@ -223,6 +231,14 @@
 	$(EOLIST)
 endif
 
+ifdef EXPATSDK
+ifndef EXPAT_LINK_STATIC
+FILES_nlm_modules += \
+	$(EXPAT_NLM) \
+	$(EOLIST)
+endif
+endif
+
 #
 # If the nlm has a msg file, put it's path here
 #
@@ -263,6 +279,14 @@
 	$(EOLIST)
 endif
 
+ifdef EXPATSDK
+ifndef EXPAT_LINK_STATIC
+FILES_nlm_Ximports += \
+	@$(EXPAT_IMP) \
+	$(EOLIST)
+endif
+endif
+
 #
 # Any symbols exported to here
 #

Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=793390&r1=793389&r2=793390&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Sun Jul 12 18:32:36 2009
@@ -51,22 +51,23 @@
 
 ifdef EXPATSDK
 ifeq "$(wildcard $(EXPATSDK)/include/expat.h)" "$(EXPATSDK)/include/expat.h"
-EXPATINC = $(EXPATSRC)/include
-EXPATIMP = $(EXPATSRC)/imports/expatlbc.imp
-EXPATNLM = EXPATLBC
+EXPAT_IMP = $(EXPATSDK)/imports/expatlbc.imp
+EXPAT_INC = $(EXPATSDK)/include
+EXPAT_LIB = $(EXPATSDK)/lib/expat.lib
+EXPAT_NLM = EXPATLBC
 else
 $(error EXPATSDK does not point to a valid EXPAT SDK) 
 endif
 endif
 ifdef EXPATSRC
 ifeq "$(wildcard $(EXPATSRC)/lib/xmlparse.c)" "$(EXPATSRC)/lib/xmlparse.c"
-EXPATINC = $(EXPATSRC)/lib
-EXPATLIB = $(EXPATSRC)/lib/$(OBJDIR)/expat.lib
+EXPAT_INC = $(EXPATSRC)/lib
+EXPAT_LIB = $(EXPATSRC)/lib/$(OBJDIR)/expat.lib
 else
 $(error EXPATSRC does not point to a valid EXPAT source tree) 
 endif
 endif
-ifndef EXPATINC
+ifndef EXPAT_INC
 $(error neither EXPATSDK nor EXPATSRC defined - cant compile without EXPAT SDK or source
tree) 
 endif
 

Modified: apr/apr/trunk/xml/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/xml/NWGNUmakefile?rev=793390&r1=793389&r2=793390&view=diff
==============================================================================
--- apr/apr/trunk/xml/NWGNUmakefile (original)
+++ apr/apr/trunk/xml/NWGNUmakefile Sun Jul 12 18:32:36 2009
@@ -52,7 +52,7 @@
 # INCDIRS
 #
 XINCDIRS	+= \
-			$(EXPATINC) \
+			$(EXPAT_INC) \
 			$(APR)/include \
 			$(APR)/include/private \
 			$(APR)/include/arch/NetWare \
@@ -274,10 +274,7 @@
 #
 install :: nlms FORCE
 
-#del_file = $(shell if exist $(subst /,\,$(1)) $(DEL) $(subst /,\,$(1)))
-
 clean ::
-#	$(foreach file,$(EXPAT_prebuild_headers),$(call del_file,$(file)))
 	$(foreach file,$(EXPAT_prebuild_headers),$(shell if exist $(subst /,\,$(file)) $(DEL) $(subst
/,\,$(file))))
 
 #



Mime
View raw message