apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r789564 - in /apr/apr/trunk/build: NWGNUenvironment.inc NWGNUmakefile NWGNUtail.inc
Date Tue, 30 Jun 2009 05:25:01 GMT
Author: fuankg
Date: Tue Jun 30 05:25:01 2009
New Revision: 789564

URL: http://svn.apache.org/viewvc?rev=789564&view=rev
Log:
build tweaks for NetWare (continued)

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

Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=789564&r1=789563&r2=789564&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Tue Jun 30 05:25:01 2009
@@ -268,9 +268,10 @@
 #
 
 APR		= $(subst \,/,$(APR_WORK))
-APRTEST		= $(APR)/test
+APRBUILD	= $(APR)/build
 APRLDAP		= $(APR)/ldap
 APRXML		= $(APR)/xml
+APRTEST		= $(APR)/test
 
 #
 # Internal Libraries

Modified: apr/apr/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUmakefile?rev=789564&r1=789563&r2=789564&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUmakefile (original)
+++ apr/apr/trunk/build/NWGNUmakefile Tue Jun 30 05:25:01 2009
@@ -22,9 +22,10 @@
 	$(APR)/include/apr_ldap.h \
 	$(APR)/include/private/apu_config.h \
 	$(APR)/include/private/apu_select_dbm.h \
-	$(APRXML)/expat_config.h \
+	$(EXPAT_SRC)/lib/config.h \
+	$(EXPAT_SRC)/lib/expat.h \
 	$(EOLIST)
-#	$(APRXML)/expat/lib/expat.h \
+#	$(APRXML)/expat_config.h \
     
 nlms :: $(APR)/aprlib.imp
 
@@ -64,11 +65,15 @@
 	@echo Creating $@
 	$(CP) $(subst /,\,$<) $(subst /,\,$@)
 
-$(APRXML)/%.h: $(APRXML)/%.hnw
+#$(APRXML)/%.h: $(APRXML)/%.hnw
+#	@echo Creating $@
+#	$(CP) $(subst /,\,$<) $(subst /,\,$@)
+
+$(EXPAT_SRC)/lib/%.h: $(EXPAT_SRC)/lib/%.hnw
 	@echo Creating $@
 	$(CP) $(subst /,\,$<) $(subst /,\,$@)
 
-$(APRXML)/expat/lib/%.h: $(APRXML)/expat/lib/%.h.in
+$(EXPAT_SRC)/lib/%.h: $(EXPAT_SRC)/lib/%.h.in
 	@echo Creating $@
 	$(CP) $(subst /,\,$<) $(subst /,\,$@)
 
@@ -90,6 +95,7 @@
 	$(CHK) $(subst /,\,$(APR))\include\private\apu_config.h     $(DEL) $(subst /,\,$(APR))\include\private\apu_config.h
 	$(CHK) $(subst /,\,$(APR))\include\private\apu_select_dbm.h $(DEL) $(subst /,\,$(APR))\include\private\apu_select_dbm.h
 	$(CHK) $(subst /,\,$(APR))\aprlib.imp                       $(DEL) $(subst /,\,$(APR))\aprlib.imp
-	$(CHK) $(subst /,\,$(APRXML))\expat_config.h                $(DEL) $(subst /,\,$(APRXML))\expat_config.h
-#	$(CHK) $(subst /,\,$(APRXML))\expat.h                       $(DEL) $(subst /,\,$(APRXML))\expat.h
+	$(CHK) $(subst /,\,$(EXPAT_SRC))\config.h                   $(DEL) $(subst /,\,$(EXPAT_SRC))\config.h
+	$(CHK) $(subst /,\,$(EXPAT_SRC))\expat.h                    $(DEL) $(subst /,\,$(EXPAT_SRC))\expat.h
+#	$(CHK) $(subst /,\,$(APRXML))\expat_config.h                $(DEL) $(subst /,\,$(APRXML))\expat_config.h
     

Modified: apr/apr/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUtail.inc?rev=789564&r1=789563&r2=789564&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUtail.inc (original)
+++ apr/apr/trunk/build/NWGNUtail.inc Tue Jun 30 05:25:01 2009
@@ -34,26 +34,26 @@
 
 
 CCOPT_DEPENDS			= \
-				$(APR)/build/NWGNUhead.inc \
-				$(APR)/build/NWGNUenvironment.inc \
-				$(APR)/build/NWGNUtail.inc \
+				$(APRBUILD)/NWGNUhead.inc \
+				$(APRBUILD)/NWGNUenvironment.inc \
+				$(APRBUILD)/NWGNUtail.inc \
 				NWGNUmakefile \
 				$(CUSTOM_INI) \
 				$(EOLIST)
 
 CPPOPT_DEPENDS			= \
-				$(APR)/build/NWGNUhead.inc \
-				$(APR)/build/NWGNUenvironment.inc \
-				$(APR)/build/NWGNUtail.inc \
+				$(APRBUILD)/NWGNUhead.inc \
+				$(APRBUILD)/NWGNUenvironment.inc \
+				$(APRBUILD)/NWGNUtail.inc \
 				NWGNUmakefile \
 				$(CUSTOM_INI) \
 				$(EOLIST)
 
 $(NLM_NAME)_LINKOPT_DEPENDS	= \
 				$(TARGET_lib) \
-				$(APR)/build/NWGNUenvironment.inc \
+				$(APRBUILD)/NWGNUenvironment.inc \
 				NWGNUmakefile \
-				$(APR)/build/NWGNUtail.inc \
+				$(APRBUILD)/NWGNUtail.inc \
 				$(CUSTOM_INI) \
 				$(VERSION_INC) \
 				$(EOLIST)
@@ -62,9 +62,9 @@
 LIB_NAME			= $(basename $(notdir $(TARGET_lib)))
 $(LIB_NAME)_LIBLST_DEPENDS	= \
 				$(FILES_lib_objs) \
-				$(APR)/build/NWGNUenvironment.inc \
+				$(APRBUILD)/NWGNUenvironment.inc \
 				NWGNUmakefile \
-				$(APR)/build/NWGNUtail.inc \
+				$(APRBUILD)/NWGNUtail.inc \
 				$(CUSTOM_INI) \
 				$(EOLIST)
 endif
@@ -83,14 +83,14 @@
 # Generic compiler rules
 #
 
-$(APR)/build/NWGNUversion.inc : $(APR)/build/nw_ver.awk $(APR)/include/apr_version.h
+$(APRBUILD)/NWGNUversion.inc : $(APRBUILD)/nw_ver.awk $(APR)/include/apr_version.h
 	@echo Generating $@
 	@$(AWK) -f $^ > $@
 
--include $(APR)/build/NWGNUversion.inc
+-include $(APRBUILD)/NWGNUversion.inc
 
 ifneq "$(strip $(VERSION_STR))" ""
-VERSION_INC = $(APR)/build/NWGNUversion.inc
+VERSION_INC = $(APRBUILD)/NWGNUversion.inc
 else
 VERSION		= 1,0,0
 VERSION_STR	= 1.0.0
@@ -204,7 +204,7 @@
 
 else # We must have more than one target library so load the individual makefiles
 
-$(OBJDIR)/%.lib: NWGNU% $(APR_WORK)/build/NWGNUhead.inc $(APR_WORK)/build/NWGNUtail.inc $(APR_WORK)/build/NWGNUenvironment.inc
FORCE
+$(OBJDIR)/%.lib: NWGNU% $(APRBUILD)/NWGNUhead.inc $(APRBUILD)/NWGNUtail.inc $(APRBUILD)/NWGNUenvironment.inc
FORCE
 	@echo Calling $<
 	$(MAKE) -f $< $(MAKECMDGOALS) RELEASE=$(RELEASE)
 
@@ -268,59 +268,59 @@
 ifneq "$(FILES_nlm_libs)" ""
 	@echo $(foreach libfile, $(notdir $(strip $(FILES_nlm_libs))),-l$(subst /,\,$(libfile)))
>> $@
 endif
-	@echo -commandfile $(subst /,\,$(@:.opt=.def)) >> $@
-	@echo # Do not edit this file - it is created by make! > $(subst /,\,$(@:.opt=.def))

-	@echo # All your changes will be lost!! >> $(subst /,\,$(@:.opt=.def)) 
+	@echo -commandfile $(@:.opt=.def) >> $@
+	@echo # Do not edit this file - it is created by make! > $(@:.opt=.def)
+	@echo # All your changes will be lost!! >> $(@:.opt=.def)
 ifneq "$(FILE_nlm_msg)" ""
-	@echo Messages $(FILE_nlm_msg) >> $(subst /,\,$(@:.opt=.def))
+	@echo Messages $(FILE_nlm_msg) >> $(@:.opt=.def)
 endif
 ifneq "$(FILE_nlm_hlp)" ""
-	@echo Help $(FILE_nlm_hlp) >> $(subst /,\,$(@:.opt=.def))
+	@echo Help $(FILE_nlm_hlp) >> $(@:.opt=.def)
 endif
 ifeq "$(FILE_nlm_copyright)" ""
-	@echo copyright "$(NLM_COPYRIGHT)" >> $(subst /,\,$(@:.opt=.def))
+	@echo copyright "$(NLM_COPYRIGHT)" >> $(@:.opt=.def)
 endif
-	@echo description "$(NLM_DESCRIPTION)" >> $(subst /,\,$(@:.opt=.def))
-	@echo threadname "$(NLM_THREAD_NAME)" >> $(subst /,\,$(@:.opt=.def))
+	@echo description "$(NLM_DESCRIPTION)" >> $(@:.opt=.def)
+	@echo threadname "$(NLM_THREAD_NAME)" >> $(@:.opt=.def)
 ifneq "$(NLM_STACK_SIZE)" ""
-	@echo stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE)))) >> $(subst
/,\,$(@:.opt=.def))
+	@echo stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE)))) >> $(@:.opt=.def)
 else
-	@echo stacksize 64000 >> $(subst /,\,$(@:.opt=.def))
+	@echo stacksize 64000 >> $(@:.opt=.def)
 endif
-	@echo screenname "$(NLM_SCREEN_NAME)" >> $(subst /,\,$(@:.opt=.def))
+	@echo screenname "$(NLM_SCREEN_NAME)" >> $(@:.opt=.def)
 ifneq "$(NLM_VERSION)" ""
-	@echo version $(NLM_VERSION) >> $(subst /,\,$(@:.opt=.def))
+	@echo version $(NLM_VERSION) >> $(@:.opt=.def)
 else
-	@echo version $(VERSION) >> $(subst /,\,$(@:.opt=.def))
+	@echo version $(VERSION) >> $(@:.opt=.def)
 endif
 ifneq "$(NLM_ENTRY_SYM)" ""
-	@echo start $(NLM_ENTRY_SYM) >> $(subst /,\,$(@:.opt=.def))
+	@echo start $(NLM_ENTRY_SYM) >> $(@:.opt=.def)
 endif
 ifneq "$(NLM_EXIT_SYM)" ""
-	@echo exit $(NLM_EXIT_SYM) >> $(subst /,\,$(@:.opt=.def))
+	@echo exit $(NLM_EXIT_SYM) >> $(@:.opt=.def)
 endif
 ifneq "$(NLM_CHECK_SYM)" ""
-	@echo check $(NLM_CHECK_SYM) >> $(subst /,\,$(@:.opt=.def))
+	@echo check $(NLM_CHECK_SYM) >> $(@:.opt=.def)
 endif
 ifneq "$(NLM_FLAGS)" ""
-	@echo $(strip $(NLM_FLAGS)) >> $(subst /,\,$(@:.opt=.def))
+	@echo $(strip $(NLM_FLAGS)) >> $(@:.opt=.def)
 endif
 ifneq "$(FILES_nlm_modules)" ""
-	@echo module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(subst
/,\,$(module))) >> $(subst /,\,$(@:.opt=.def))
+	@echo module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(subst
/,\,$(module))) >> $(@:.opt=.def)
 endif
 ifneq "$(FILES_nlm_Ximports)" ""
-	@echo import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(subst
/,\,$(import))) >> $(subst /,\,$(@:.opt=.def))
+	@echo import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(subst
/,\,$(import))) >> $(@:.opt=.def)
 endif
 ifneq "$(FILES_nlm_exports)" ""
-	@echo export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(subst
/,\,$(export))) >> $(subst /,\,$(@:.opt=.def))
+	@echo export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(subst
/,\,$(export))) >> $(@:.opt=.def)
 endif
 
 # if APACHE_UNIPROC is defined, don't include XDCData
 ifndef APACHE_UNIPROC
 ifneq "$(string $(XDCDATA))" ""
-	@echo xdcdata $(XDCDATA) >> $(subst /,\,$(@:.opt=.def))
+	@echo xdcdata $(XDCDATA) >> $(@:.opt=.def)
 else
-	@echo xdcdata $(APR)\misc\netware\apr.xdc >> $(subst /,\,$(@:.opt=.def))
+	@echo xdcdata $(APR)/misc/netware/apr.xdc >> $(@:.opt=.def)
 endif
 endif
 
@@ -331,7 +331,7 @@
 
 ifndef NO_LICENSE_FILE
 
-$(OBJDIR)/%.nlm: NWGNU% $(APR_WORK)/build/NWGNUhead.inc $(APR_WORK)/build/NWGNUtail.inc $(APR_WORK)/build/NWGNUenvironment.inc
$(CUSTOM_INI) $(VERSION_INC) FORCE
+$(OBJDIR)/%.nlm: NWGNU% $(APRBUILD)/NWGNUhead.inc $(APRBUILD)/NWGNUtail.inc $(APRBUILD)/NWGNUenvironment.inc
$(CUSTOM_INI) $(VERSION_INC) FORCE
 	@echo Calling $<
 	$(MAKE) -f $< $(MAKECMDGOALS) RELEASE=$(RELEASE)
 	$(CMD) echo.



Mime
View raw message