apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: apr/build NWGNUtail.inc NWGNUenvironment.inc
Date Thu, 26 Sep 2002 20:16:27 GMT
bnicholes    2002/09/26 13:16:27

  Modified:    build    NWGNUtail.inc NWGNUenvironment.inc
  Log:
  Clean up addition IPV6 build issues
  
  Revision  Changes    Path
  1.3       +29 -26    apr/build/NWGNUtail.inc
  
  Index: NWGNUtail.inc
  ===================================================================
  RCS file: /home/cvs/apr/build/NWGNUtail.inc,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NWGNUtail.inc	18 Jul 2002 23:31:35 -0000	1.2
  +++ NWGNUtail.inc	26 Sep 2002 20:16:27 -0000	1.3
  @@ -4,7 +4,7 @@
   #
   
   #
  -# If we are going to create an nlm, make sure we have assigned variables to 
  +# If we are going to create an nlm, make sure we have assigned variables to
   # use during the link.
   #
   echo NLM_NAME=$(NLM_NAME)
  @@ -37,7 +37,7 @@
   				NWGNUmakefile \
   				$(CUSTOM_INI) \
   				$(EOLIST)
  -                
  +
   CPPOPT_DEPENDS	= \
   				$(APR_WORK)\build\NWGNUhead.inc \
   				$(APR_WORK)\build\NWGNUenvironment.inc \
  @@ -81,7 +81,7 @@
   
   $(OBJDIR)/%.o: %.c $(OBJDIR)\cc.opt
   	@echo Compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt 
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
   
   $(OBJDIR)\cc.opt: $(CCOPT_DEPENDS)
   	@echo CCOPT_DEPENDS=$(CCOPT_DEPENDS)
  @@ -89,46 +89,46 @@
   	@echo Generating $@
   ifneq "$(strip $(CFLAGS))" ""
   	@echo $(CFLAGS) >> $@
  -endif	
  +endif
   ifneq "$(strip $(XCFLAGS))" ""
   	@echo $(XCFLAGS) >> $@
   endif
   ifneq "$(strip $(XINCDIRS))" ""
   	@echo $(foreach xincdir,$(strip $(subst ;,$(SPACE),$(XINCDIRS))),-I$(xincdir)) >>
$@
  -endif	
  +endif
   ifneq "$(strip $(INCDIRS))" ""
   	@echo $(foreach incdir,$(strip $(subst ;,$(SPACE),$(INCDIRS))),-I$(incdir)) >> $@
   endif
  -ifneq "$(strip $(DEFINES))" "" 
  +ifneq "$(strip $(DEFINES))" ""
   	@echo $(DEFINES) >> $@
   endif
  -ifneq "$(strip $(XDEFINES))" "" 
  +ifneq "$(strip $(XDEFINES))" ""
   	@echo $(XDEFINES) >> $@
   endif
   
   $(OBJDIR)/%.o: %.cpp $(OBJDIR)\cpp.opt
   	@echo Compiling $<
  -	$(CPP) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cpp.opt 
  +	$(CPP) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cpp.opt
   
   $(OBJDIR)\cpp.opt: $(CPPOPT_DEPENDS)
   	$(CHK) $@ $(DEL) $@
   	@echo Generating $@
   ifneq "$(strip $(CFLAGS))" ""
   	@echo $(CFLAGS) >> $@
  -endif	
  +endif
   ifneq "$(strip $(XCFLAGS))" ""
   	@echo $(XCFLAGS) >> $@
   endif
   ifneq "$(strip $(XINCDIRS))" ""
   	@echo $(foreach xincdir,$(strip $(subst ;,$(SPACE),$(XINCDIRS))),-I$(xincdir)) >>
$@
  -endif	
  +endif
   ifneq "$(strip $(INCDIRS))" ""
   	@echo $(foreach incdir,$(strip $(subst ;,$(SPACE),$(INCDIRS))),-I$(incdir)) >> $@
   endif
  -ifneq "$(strip $(DEFINES))" "" 
  +ifneq "$(strip $(DEFINES))" ""
   	@echo $(DEFINES) >> $@
   endif
  -ifneq "$(strip $(XDEFINES))" "" 
  +ifneq "$(strip $(XDEFINES))" ""
   	@echo $(XDEFINES) >> $@
   endif
   
  @@ -144,7 +144,7 @@
   	@echo Generating $@
   	$(CHK) $(OBJDIR)\$(@F) $(DEL) $(OBJDIR)\$(@F)
   	$(LIB) -o $(OBJDIR)\$(@F) @$?
  -   
  +
   $(OBJDIR)\$(LIB_NAME)_lib.lst: $($(LIB_NAME)_LIBLST_DEPENDS)
   	$(CHK) $@ $(DEL) $@
   	@echo Generating $@
  @@ -161,7 +161,7 @@
   endif
   
   #
  -# Rules to build nlms. 
  +# Rules to build nlms.
   #
   
   vpath libcpre.o $(NOVELLLIBC)\imports
  @@ -173,7 +173,7 @@
   	@echo Linking $@
   	$(LINK) @$(OBJDIR)\$(NLM_NAME)_link.opt
   
  -# This will force the link option file to be rebuilt if we change the 
  +# This will force the link option file to be rebuilt if we change the
   # corresponding makefile
   
   $(OBJDIR)\$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS)
  @@ -192,12 +192,12 @@
   	@echo -sym internal >> $@
   	@echo -sym codeview4 >> $@
   	@echo -osym $(OBJDIR)\$(NLM_NAME).sym >> $@
  -else	
  +else
   	@echo -sym internal >> $@
  -endif	
  -	@echo -screenname "$(NLM_SCREEN_NAME)" >> $@ 
  +endif
  +	@echo -screenname "$(NLM_SCREEN_NAME)" >> $@
   ifneq "$(NLM_VERSION)" ""
  -	@echo -nlmversion=$(NLM_VERSION) >> $@ 
  +	@echo -nlmversion=$(NLM_VERSION) >> $@
   else
   	@echo -nlmversion=$(VERSION) >> $@
   endif
  @@ -206,16 +206,19 @@
   	@echo -l $(XML)/$(OBJDIR) >> $@
   	@echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime" >>
$@
   	@echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++" >>
$@
  -	@echo -l $(NOVELLLIBC)/imports >> $@
  -ifneq "$(LDAPSDK)" ""    
  +ifneq "$(IPV6)" ""
  +	@echo -l $(NOVELLLIBC)\include\winsock\IPV6 >> $@
  +endif
  +		@echo -l $(NOVELLLIBC)/imports >> $@
  +ifneq "$(LDAPSDK)" ""
   	@echo -l $(LDAPSDK)/lib/nlm >> $@
  -endif    
  +endif
   	@echo -nodefaults >> $@
   	@echo -map $(OBJDIR)\$(NLM_NAME).map>> $@
   	@echo -threadname "$(NLM_THREAD_NAME)" >> $@
   ifneq "$(NLM_STACK_SIZE)" ""
   	@echo -stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE)))) >> $@
  -else	
  +else
   	@echo -stacksize 64000 >> $@
   endif
   ifneq "$(NLM_ENTRY_SYM)" ""
  @@ -248,10 +251,10 @@
   endif
   ifneq "$(FILES_nlm_Ximports)" ""
   	@echo Import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(subst
/,\,$(import))) >> $(OBJDIR)\$(NLM_NAME)_link.def
  -endif	
  +endif
   ifneq "$(FILES_nlm_exports)" ""
   	@echo Export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(subst
/,\,$(export))) >> $(OBJDIR)\$(NLM_NAME)_link.def
  -endif	
  +endif
   ifneq "$(strip $(XLFLAGS))" ""
   	@echo $(XLFLAGS) >> $(OBJDIR)\$(NLM_NAME)_link.def
   endif
  @@ -267,7 +270,7 @@
   
   else # more than one target so look for individual makefiles.
   
  -# Only include these if NO_LICENSE_FILE isn't set to prevent excessive 
  +# Only include these if NO_LICENSE_FILE isn't set to prevent excessive
   # recursion
   
   ifndef NO_LICENSE_FILE
  
  
  
  1.5       +2 -1      apr/build/NWGNUenvironment.inc
  
  Index: NWGNUenvironment.inc
  ===================================================================
  RCS file: /home/cvs/apr/build/NWGNUenvironment.inc,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NWGNUenvironment.inc	10 Sep 2002 22:45:29 -0000	1.4
  +++ NWGNUenvironment.inc	26 Sep 2002 20:16:27 -0000	1.5
  @@ -185,6 +185,7 @@
   # Add support for building IPV6 alongside
   ifneq "$(IPV6)" ""
   DEFINES += -DNW_BUILD_IPV6
  +INCDIRS := $(NOVELLLIBC)\include\winsock\IPV6;$(INCDIRS)
   
   ifneq "$(IPV6)" "SET"
   OBJDIR := $(OBJDIR)_IPV6
  @@ -254,7 +255,7 @@
   # Additional general defines
   #
   VERSION		= 2,0,0
  -			
  +
   EnvironmentDefined = 1
   endif # ifndef EnvironmentDefined
   
  
  
  

Mime
View raw message