apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1082344 - /apr/apr/trunk/build/NWGNUtail.inc
Date Wed, 16 Mar 2011 23:22:54 GMT
Author: fuankg
Date: Wed Mar 16 23:22:54 2011
New Revision: 1082344

URL: http://svn.apache.org/viewvc?rev=1082344&view=rev
Log:
NetWare build overhaul in order to compile on Linux.

Some final changes to delimit all echo output lines for Linux.

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=1082344&r1=1082343&r2=1082344&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUtail.inc (original)
+++ apr/apr/trunk/build/NWGNUtail.inc Wed Mar 16 23:22:54 2011
@@ -44,6 +44,10 @@ ifeq "$(NLM_EXIT_SYM)" ""
 NLM_EXIT_SYM = _LibCPostlude
 endif
 
+ifeq "$(NLM_VERSION)" ""
+NLM_VERSION = $(VERSION)
+endif
+
 #
 # Create dependency lists based on the files available
 #
@@ -139,22 +143,22 @@ $(OBJDIR)/$(CCOPT_NAME)_cc.opt: $(CCOPT_
 #	@echo Generating $@
 	@echo $(DL)GEN  $@$(DL)
 ifneq "$(strip $(CFLAGS))" ""
-	@echo $(CFLAGS) >> $@
+	@echo $(DL)$(CFLAGS)$(DL)>> $@
 endif
 ifneq "$(strip $(XCFLAGS))" ""
-	@echo $(XCFLAGS) >> $@
+	@echo $(DL)$(XCFLAGS)$(DL)>> $@
 endif
 ifneq "$(strip $(XINCDIRS))" ""
-	@echo $(foreach xincdir,$(strip $(subst ;,$(SPACE),$(XINCDIRS))),-I$(xincdir)) >>
$@
+	@echo $(DL)$(foreach xincdir,$(strip $(subst ;,$(SPACE),$(XINCDIRS))),-I$(xincdir))$(DL)>>
$@
 endif
 ifneq "$(strip $(INCDIRS))" ""
-	@echo $(foreach incdir,$(strip $(subst ;,$(SPACE),$(INCDIRS))),-I$(incdir)) >> $@
+	@echo $(DL)$(foreach incdir,$(strip $(subst ;,$(SPACE),$(INCDIRS))),-I$(incdir))$(DL)>>
$@
 endif
 ifneq "$(strip $(DEFINES))" ""
-	@echo $(DEFINES) >> $@
+	@echo $(DL)$(DEFINES)$(DL)>> $@
 endif
 ifneq "$(strip $(XDEFINES))" ""
-	@echo $(XDEFINES) >> $@
+	@echo $(DL)$(XDEFINES)$(DL)>> $@
 endif
 
 $(OBJDIR)/%.o: %.cpp $(OBJDIR)/$(CCOPT_NAME)_cpp.opt
@@ -168,22 +172,22 @@ $(OBJDIR)/$(CCOPT_NAME)_cpp.opt: $(CPPOP
 #	@echo Generating $@
 	@echo $(DL)GEN  $@$(DL)
 ifneq "$(strip $(CFLAGS))" ""
-	@echo $(CFLAGS) >> $@
+	@echo $(DL)$(CFLAGS)$(DL)>> $@
 endif
 ifneq "$(strip $(XCFLAGS))" ""
-	@echo $(XCFLAGS) >> $@
+	@echo $(DL)$(XCFLAGS)$(DL)>> $@
 endif
 ifneq "$(strip $(XINCDIRS))" ""
-	@echo $(foreach xincdir,$(strip $(subst ;,$(SPACE),$(XINCDIRS))),-I$(xincdir)) >>
$@
+	@echo $(DL)$(foreach xincdir,$(strip $(subst ;,$(SPACE),$(XINCDIRS))),-I$(xincdir))$(DL)>>
$@
 endif
 ifneq "$(strip $(INCDIRS))" ""
-	@echo $(foreach incdir,$(strip $(subst ;,$(SPACE),$(INCDIRS))),-I$(incdir)) >> $@
+	@echo $(DL)$(foreach incdir,$(strip $(subst ;,$(SPACE),$(INCDIRS))),-I$(incdir))$(DL)>>
$@
 endif
 ifneq "$(strip $(DEFINES))" ""
-	@echo $(DEFINES) >> $@
+	@echo $(DL)$(DEFINES)$(DL)>> $@
 endif
 ifneq "$(strip $(XDEFINES))" ""
-	@echo $(XDEFINES) >> $@
+	@echo $(DL)$(XDEFINES)$(DL)>> $@
 endif
 
 endif # one target nlm or lib
@@ -207,17 +211,17 @@ $(OBJDIR)/aprlib_lib.lst: $(aprlib_LIBLS
 ifneq "$(strip $(FILES_lib_objs))" ""
 #	@echo Generating $@
 	@echo $(DL)GEN  $@$(DL)
-	@echo $(wordlist 1, 10, $(FILES_lib_objs)) >> $@
-	@echo $(wordlist 11, 20, $(FILES_lib_objs)) >> $@
-	@echo $(wordlist 21, 30, $(FILES_lib_objs)) >> $@
-	@echo $(wordlist 31, 40, $(FILES_lib_objs)) >> $@
-	@echo $(wordlist 41, 50, $(FILES_lib_objs)) >> $@
-	@echo $(wordlist 51, 60, $(FILES_lib_objs)) >> $@
-	@echo $(wordlist 61, 70, $(FILES_lib_objs)) >> $@
-	@echo $(wordlist 71, 80, $(FILES_lib_objs)) >> $@
-	@echo $(wordlist 81, 90, $(FILES_lib_objs)) >> $@
-	@echo $(wordlist 91, 100, $(FILES_lib_objs)) >> $@
-	@echo $(wordlist 101, 110, $(FILES_lib_objs)) >> $@
+	@echo $(DL)$(wordlist 1, 10, $(FILES_lib_objs))$(DL)>> $@
+	@echo $(DL)$(wordlist 11, 20, $(FILES_lib_objs))$(DL)>> $@
+	@echo $(DL)$(wordlist 21, 30, $(FILES_lib_objs))$(DL)>> $@
+	@echo $(DL)$(wordlist 31, 40, $(FILES_lib_objs))$(DL)>> $@
+	@echo $(DL)$(wordlist 41, 50, $(FILES_lib_objs))$(DL)>> $@
+	@echo $(DL)$(wordlist 51, 60, $(FILES_lib_objs))$(DL)>> $@
+	@echo $(DL)$(wordlist 61, 70, $(FILES_lib_objs))$(DL)>> $@
+	@echo $(DL)$(wordlist 71, 80, $(FILES_lib_objs))$(DL)>> $@
+	@echo $(DL)$(wordlist 81, 90, $(FILES_lib_objs))$(DL)>> $@
+	@echo $(DL)$(wordlist 91, 100, $(FILES_lib_objs))$(DL)>> $@
+	@echo $(DL)$(wordlist 101, 110, $(FILES_lib_objs))$(DL)>> $@
 endif
 
 $(OBJDIR)/%_lib.lst: $($(LIB_NAME)_LIBLST_DEPENDS)
@@ -225,13 +229,13 @@ $(OBJDIR)/%_lib.lst: $($(LIB_NAME)_LIBLS
 ifneq "$(strip $(FILES_lib_objs))" ""
 #	@echo Generating $@
 	@echo $(DL)GEN  $@$(DL)
-	@echo $(FILES_lib_objs) >> $@
+	@echo $(DL)$(FILES_lib_objs)$(DL)>> $@
 endif
 
 else # We must have more than one target library so load the individual makefiles
 
 $(OBJDIR)/%.lib: NWGNU% $(APRBUILD)/NWGNUhead.inc $(APRBUILD)/NWGNUtail.inc $(APRBUILD)/NWGNUenvironment.inc
FORCE
-	@echo Calling $<
+	@echo $(DL)Calling $<$(DL)
 	$(MAKE) -f $< $(MAKECMDGOALS) RELEASE=$(RELEASE)
 
 endif
@@ -259,88 +263,84 @@ $(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM
 #	@echo Generating $@
 	@echo $(DL)GEN  $@$(DL)
 	@echo $(DL)# Do not edit this file - it is created by make!$(DL) > $@
-	@echo $(DL)# All your changes will be lost!!$(DL) >> $@
-	@echo -warnings off >> $@
-	@echo -zerobss >> $@
-	@echo -o $(TARGET_nlm) >> $@
+	@echo $(DL)# All your changes will be lost!!$(DL)>> $@
+	@echo $(DL)-warnings off$(DL)>> $@
+	@echo $(DL)-zerobss$(DL)>> $@
+	@echo $(DL)-o $(TARGET_nlm)$(DL)>> $@
 ifneq "$(FILE_nlm_copyright)" ""
 	@-$(CAT) $(FILE_nlm_copyright) >> $@
 endif
 ifeq "$(RELEASE)" "debug"
-	@echo -g >> $@
-	@echo -sym internal >> $@
-	@echo -sym codeview4 >> $@
-	@echo -osym $(OBJDIR)/$(NLM_NAME).sym >> $@
+	@echo $(DL)-g$(DL)>> $@
+	@echo $(DL)-sym internal$(DL)>> $@
+	@echo $(DL)-sym codeview4$(DL)>> $@
+	@echo $(DL)-osym $(OBJDIR)/$(NLM_NAME).sym$(DL)>> $@
 else
-	@echo -sym internal >> $@
+	@echo $(DL)-sym internal$(DL)>> $@
 endif
-	@echo -l $(APR)/$(OBJDIR) >> $@
-	@echo -l $(APRLDAP)/$(OBJDIR) >> $@
-	@echo -l $(APRXML)/$(OBJDIR) >> $@
-	@echo -l $(APR)/misc/netware >> $@
-	@echo -l $(APR) >> $@
-	@echo $(DL)-l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime"$(DL) >>
$@
-	@echo $(DL)-l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++"$(DL) >>
$@
+	@echo $(DL)-l $(APR)/$(OBJDIR)$(DL)>> $@
+	@echo $(DL)-l $(APRLDAP)/$(OBJDIR)$(DL)>> $@
+	@echo $(DL)-l $(APRXML)/$(OBJDIR)$(DL)>> $@
+	@echo $(DL)-l $(APR)/misc/netware$(DL)>> $@
+	@echo $(DL)-l $(APR)$(DL)>> $@
+	@echo $(DL)-l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime"$(DL)>>
$@
+	@echo $(DL)-l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++"$(DL)>>
$@
 ifneq "$(IPV6)" ""
-	@echo -l $(NOVELLLIBC)/include/winsock/IPV6 >> $@
+	@echo $(DL)-l $(NOVELLLIBC)/include/winsock/IPV6$(DL)>> $@
 endif
-	@echo -l $(NOVELLLIBC)/imports >> $@
+	@echo $(DL)-l $(NOVELLLIBC)/imports$(DL)>> $@
 ifneq "$(LDAPSDK)" ""
-	@echo -l $(LDAPSDK)/imports >> $@
+	@echo $(DL)-l $(LDAPSDK)/imports$(DL)>> $@
 endif
-	@echo -nodefaults >> $@
-	@echo -map $(OBJDIR)/$(NLM_NAME).map>> $@
+	@echo $(DL)-nodefaults$(DL)>> $@
+	@echo $(DL)-map $(OBJDIR)/$(NLM_NAME).map$(DL)>> $@
 ifneq "$(strip $(XLFLAGS))" ""
-	@echo $(XLFLAGS) >> $@
+	@echo $(DL)$(XLFLAGS)$(DL)>> $@
 endif
 ifneq "$(strip $(FILES_nlm_objs))" ""
-	@echo $(foreach objfile,$(strip $(FILES_nlm_objs)),$(objfile)) >> $@
+	@echo $(DL)$(foreach objfile,$(strip $(FILES_nlm_objs)),$(objfile))$(DL)>> $@
 endif
 ifneq "$(FILES_nlm_libs)" ""
-	@echo $(foreach libfile, $(notdir $(strip $(FILES_nlm_libs))),-l$(libfile)) >> $@
+	@echo $(DL)$(foreach libfile, $(notdir $(strip $(FILES_nlm_libs))),-l$(libfile))$(DL)>>
$@
 endif
-	@echo -commandfile $(@:.opt=.def) >> $@
-	@echo $(DL)# Do not edit this file - it is created by make!$(DL) > $(@:.opt=.def)
-	@echo $(DL)# All your changes will be lost!!$(DL) >> $(@:.opt=.def)
+	@echo $(DL)-commandfile $(@:.opt=.def)$(DL)>> $@
+	@echo $(DL)# Do not edit this file - it is created by make!$(DL)> $(@:.opt=.def)
+	@echo $(DL)# All your changes will be lost!!$(DL)>> $(@:.opt=.def)
 ifneq "$(FILE_nlm_msg)" ""
-	@echo Messages $(FILE_nlm_msg) >> $(@:.opt=.def)
+	@echo $(DL)Messages $(FILE_nlm_msg)$(DL)>> $(@:.opt=.def)
 endif
 ifneq "$(FILE_nlm_hlp)" ""
-	@echo Help $(FILE_nlm_hlp) >> $(@:.opt=.def)
+	@echo $(DL)Help $(FILE_nlm_hlp)$(DL)>> $(@:.opt=.def)
 endif
 ifeq "$(FILE_nlm_copyright)" ""
-	@echo $(DL)copyright "$(NLM_COPYRIGHT)"$(DL) >> $(@:.opt=.def)
-endif
-	@echo $(DL)description "$(NLM_DESCRIPTION)"$(DL) >> $(@:.opt=.def)
-	@echo $(DL)threadname "$(NLM_THREAD_NAME)"$(DL) >> $(@:.opt=.def)
-	@echo $(DL)screenname "$(NLM_SCREEN_NAME)"$(DL) >> $(@:.opt=.def)
-	@echo stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE)))) >> $(@:.opt=.def)
-ifneq "$(NLM_VERSION)" ""
-	@echo version $(NLM_VERSION) >> $(@:.opt=.def)
-else
-	@echo version $(VERSION) >> $(@:.opt=.def)
+	@echo $(DL)copyright "$(NLM_COPYRIGHT)"$(DL)>> $(@:.opt=.def)
 endif
-	@echo $(strip $(NLM_FLAGS)) >> $(@:.opt=.def)
-	@echo start $(NLM_ENTRY_SYM) >> $(@:.opt=.def)
-	@echo exit $(NLM_EXIT_SYM) >> $(@:.opt=.def)
+	@echo $(DL)description "$(NLM_DESCRIPTION)"$(DL)>> $(@:.opt=.def)
+	@echo $(DL)threadname "$(NLM_THREAD_NAME)"$(DL)>> $(@:.opt=.def)
+	@echo $(DL)screenname "$(NLM_SCREEN_NAME)"$(DL)>> $(@:.opt=.def)
+	@echo $(DL)stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE))))$(DL)>>
$(@:.opt=.def)
+	@echo $(DL)version $(NLM_VERSION) $(DL)>> $(@:.opt=.def)
+	@echo $(DL)$(strip $(NLM_FLAGS))$(DL)>> $(@:.opt=.def)
+	@echo $(DL)start $(NLM_ENTRY_SYM)$(DL)>> $(@:.opt=.def)
+	@echo $(DL)exit $(NLM_EXIT_SYM)$(DL)>> $(@:.opt=.def)
 ifneq "$(NLM_CHECK_SYM)" ""
-	@echo check $(NLM_CHECK_SYM) >> $(@:.opt=.def)
+	@echo $(DL)check $(NLM_CHECK_SYM)$(DL)>> $(@:.opt=.def)
 endif
 ifneq "$(FILES_nlm_modules)" ""
-	@echo module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(module))
>> $(@:.opt=.def)
+	@echo $(DL)module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(module))$(DL)>>
$(@:.opt=.def)
 endif
 ifneq "$(FILES_nlm_Ximports)" ""
-	@echo import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(import))
>> $(@:.opt=.def)
+	@echo $(DL)import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(import))$(DL)>>
$(@:.opt=.def)
 endif
 ifneq "$(FILES_nlm_exports)" ""
-	@echo export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(export))
>> $(@:.opt=.def)
+	@echo $(DL)export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(export))$(DL)>>
$(@:.opt=.def)
 endif
 # if APACHE_UNIPROC is defined, don't include XDCData
 ifndef APACHE_UNIPROC
 ifneq "$(string $(XDCDATA))" ""
-	@echo xdcdata $(XDCDATA) >> $(@:.opt=.def)
+	@echo $(DL)xdcdata $(XDCDATA)$(DL)>> $(@:.opt=.def)
 else
-	@echo xdcdata apr.xdc >> $(@:.opt=.def)
+	@echo $(DL)xdcdata apr.xdc$(DL)>> $(@:.opt=.def)
 endif
 endif
 
@@ -352,7 +352,7 @@ else # more than one target so look for 
 ifndef NO_LICENSE_FILE
 
 $(OBJDIR)/%.nlm: NWGNU% $(APRBUILD)/NWGNUhead.inc $(APRBUILD)/NWGNUtail.inc $(APRBUILD)/NWGNUenvironment.inc
$(CUSTOM_INI) $(VERSION_INC) FORCE
-	@echo Calling $<
+	@echo $(DL)Calling $<$(DL)
 	$(MAKE) -f $< $(MAKECMDGOALS) RELEASE=$(RELEASE)
 	@$(ECHONL)
 



Mime
View raw message