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 2007/06/29 21:56:02 UTC
svn commit: r552014 - in /apr/apr/branches/1.2.x: NWGNUmakefile
build/NWGNUmakefile build/NWGNUtail.inc
Author: fuankg
Date: Fri Jun 29 12:56:01 2007
New Revision: 552014
URL: http://svn.apache.org/viewvc?view=rev&rev=552014
Log:
moved install target to NWGNUtail.inc so that it can be used by other makefiles;
moved a couple of options to the generated def file since -copy option seems broken;
this makes the def file also compatible to other NLM linkers.
Modified:
apr/apr/branches/1.2.x/NWGNUmakefile
apr/apr/branches/1.2.x/build/NWGNUmakefile
apr/apr/branches/1.2.x/build/NWGNUtail.inc
Modified: apr/apr/branches/1.2.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/NWGNUmakefile?view=diff&rev=552014&r1=552013&r2=552014
==============================================================================
--- apr/apr/branches/1.2.x/NWGNUmakefile (original)
+++ apr/apr/branches/1.2.x/NWGNUmakefile Fri Jun 29 12:56:01 2007
@@ -103,7 +103,7 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = aprlib
+NLM_NAME = aprlib
#
# This is used by the link '-desc ' directive.
@@ -120,7 +120,7 @@
# If this is specified, it will override VERSION value in
# $(APR_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION =
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -145,14 +145,14 @@
#
# If this is specified it will be used by the link '-flags' directive
#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
#
# If this is specified it will be linked in with the XDCData option in the def
# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can
# be disabled by setting APACHE_UNIPROC in the environment
#
-XDCDATA =
+XDCDATA =
#
# Declare all target files (you must add your files here)
@@ -203,7 +203,7 @@
# Include the Winsock libraries if Winsock is being used
ifndef USE_STDSOCKETS
FILES_nlm_modules += ws2_32 \
- $(EOLIST)
+ $(EOLIST)
endif
#If the LDAP support is defined then add the auto-load modules
@@ -236,7 +236,7 @@
@libc.imp \
@netware.imp \
$(EOLIST)
-
+
# Include the Winsock imports if Winsock is being used
ifndef USE_STDSOCKETS
FILES_nlm_Ximports += \
@@ -260,7 +260,7 @@
FILES_nlm_exports = \
@aprlib.imp \
$(EOLIST)
-
+
#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
@@ -358,10 +358,7 @@
@echo xcopy docs $(INSTALLBASE)\docs\*.* $(XCOPYSW) >> xc.bat
$(CMD) xc.bat
$(DEL) xc.bat
-endif
-
-$(INSTDIRS) ::
- $(CHKNOT) $@\NUL mkdir $@
+endif
ifndef DEST
installdev :: $(INSTDEVDIRS) FORCE
@@ -369,10 +366,10 @@
-copy $(subst /,\,$(APRUTIL))\include\*.h $(INSTALLBASE)\include\*.*
-copy $(subst /,\,$(APR))\*.imp $(INSTALLBASE)\lib\*.*
-copy $(subst /,\,$(APR))\misc\netware\*.xdc $(INSTALLBASE)\lib\*.*
-
+
$(INSTDEVDIRS) ::
$(CHKNOT) $@\NUL mkdir $@
-endif
+endif
#
# Any specialized rules here
Modified: apr/apr/branches/1.2.x/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/build/NWGNUmakefile?view=diff&rev=552014&r1=552013&r2=552014
==============================================================================
--- apr/apr/branches/1.2.x/build/NWGNUmakefile (original)
+++ apr/apr/branches/1.2.x/build/NWGNUmakefile Fri Jun 29 12:56:01 2007
@@ -77,7 +77,7 @@
# installation area
#
install :: nlms FORCE
-
+
clean ::
$(CHK) nw_export.i $(DEL) nw_export.i
@@ -85,6 +85,7 @@
$(CHK) NWGNUversion.inc $(DEL) NWGNUversion.inc
$(CHK) $(subst /,\,$(APR))\include\apr.h $(DEL) $(subst /,\,$(APR))\include\apr.h
$(CHK) $(subst /,\,$(APRUTIL))\include\apu.h $(DEL) $(subst /,\,$(APRUTIL))\include\apu.h
+ $(CHK) $(subst /,\,$(APRUTIL))\include\apu_want.h $(DEL) $(subst /,\,$(APRUTIL))\include\apu_want.h
$(CHK) $(subst /,\,$(APRUTIL))\include\apr_ldap.h $(DEL) $(subst /,\,$(APRUTIL))\include\apr_ldap.h
$(CHK) $(subst /,\,$(APRUTIL))\include\private\apu_config.h $(DEL) $(subst /,\,$(APRUTIL))\include\private\apu_config.h
$(CHK) $(subst /,\,$(APRUTIL))\include\private\apu_select_dbm.h $(DEL) $(subst /,\,$(APRUTIL))\include\private\apu_select_dbm.h
Modified: apr/apr/branches/1.2.x/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/build/NWGNUtail.inc?view=diff&rev=552014&r1=552013&r2=552014
==============================================================================
--- apr/apr/branches/1.2.x/build/NWGNUtail.inc (original)
+++ apr/apr/branches/1.2.x/build/NWGNUtail.inc Fri Jun 29 12:56:01 2007
@@ -25,12 +25,7 @@
endif
ifndef NLM_COPYRIGHT
-NLM_COPYRIGHT = Licensed to the Apache Software Foundation (ASF) under one or more
-NLM_COPYRIGHT = contributor license agreements. See the NOTICE file distributed with
-NLM_COPYRIGHT = this work for additional information regarding copyright ownership.
-NLM_COPYRIGHT = The ASF licenses this file to You under the Apache License, Version 2.0
-NLM_COPYRIGHT = (the "License"); you may not use this file except in compliance with
-NLM_COPYRIGHT = the License. You may obtain a copy of the License at
+NLM_COPYRIGHT = Licensed under the Apache License, Version 2.0
endif
#
@@ -97,8 +92,8 @@
ifneq "$(strip $(VERSION_STR))" ""
VERSION_INC = $(APR_WORK)\build\NWGNUversion.inc
else
-VERSION = 1,0,0
-VERSION_STR = 1.0.0
+VERSION = 1,2,0
+VERSION_STR = 1.2.0
endif
ifeq "$(words $(strip $(TARGET_nlm)))" "1"
@@ -216,12 +211,9 @@
@echo Generating $@
@echo -warnings off >> $@
@echo -zerobss >> $@
- @echo -desc "$(NLM_DESCRIPTION)" >> $@
@echo -o $(TARGET_nlm) >> $@
ifneq "$(FILE_nlm_copyright)" ""
@-type $(FILE_nlm_copyright) >> $@
-else
- @echo -copy "$(NLM_COPYRIGHT)" >> $@
endif
ifeq "$(RELEASE)" "debug"
@echo -g >> $@
@@ -231,12 +223,6 @@
else
@echo -sym internal >> $@
endif
- @echo -screenname "$(NLM_SCREEN_NAME)" >> $@
-ifneq "$(NLM_VERSION)" ""
- @echo -nlmversion=$(NLM_VERSION) >> $@
-else
- @echo -nlmversion=$(VERSION) >> $@
-endif
@echo -l $(APR)/$(OBJDIR) >> $@
@echo -l $(APRUTIL)/$(OBJDIR) >> $@
@echo -l $(APULDAP)/$(OBJDIR) >> $@
@@ -246,30 +232,12 @@
ifneq "$(IPV6)" ""
@echo -l $(NOVELLLIBC)\include\winsock\IPV6 >> $@
endif
- @echo -l $(NOVELLLIBC)/imports >> $@
+ @echo -l $(NOVELLLIBC)/imports >> $@
ifneq "$(LDAPSDK)" ""
@echo -l $(LDAPSDK)/lib/nlm >> $@
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
- @echo -stacksize 64000 >> $@
-endif
-ifneq "$(NLM_ENTRY_SYM)" ""
- @echo -entry $(NLM_ENTRY_SYM) >> $@
-endif
-ifneq "$(NLM_EXIT_SYM)" ""
- @echo -exit $(NLM_EXIT_SYM) >> $@
-endif
-ifneq "$(NLM_CHECK_SYM)" ""
- @echo -check $(NLM_CHECK_SYM) >> $@
-endif
-ifneq "$(NLM_FLAGS)" ""
- @echo -flags $(NLM_FLAGS) >> $@
-endif
ifneq "$(strip $(XLFLAGS))" ""
@echo $(XLFLAGS) >> $@
endif
@@ -280,28 +248,58 @@
@echo $(foreach libfile, $(notdir $(strip $(FILES_nlm_libs))),-l$(subst /,\,$(libfile))) >> $@
endif
@echo -commandfile $(OBJDIR)\$(NLM_NAME)_link.def >> $@
+ @echo # Do not edit this file - it is created by make! > $(OBJDIR)\$(NLM_NAME)_link.def
+ @echo # All your changes will be lost!! >> $(OBJDIR)\$(NLM_NAME)_link.def
ifneq "$(FILE_nlm_msg)" ""
@echo Messages $(FILE_nlm_msg) >> $(OBJDIR)\$(NLM_NAME)_link.def
endif
ifneq "$(FILE_nlm_hlp)" ""
@echo Help $(FILE_nlm_hlp) >> $(OBJDIR)\$(NLM_NAME)_link.def
endif
+ifeq "$(FILE_nlm_copyright)" ""
+ @echo copyright "$(NLM_COPYRIGHT)" >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
+ @echo description "$(NLM_DESCRIPTION)" >> $(OBJDIR)\$(NLM_NAME)_link.def
+ @echo threadname "$(NLM_THREAD_NAME)" >> $(OBJDIR)\$(NLM_NAME)_link.def
+ifneq "$(NLM_STACK_SIZE)" ""
+ @echo stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE)))) >> $(OBJDIR)\$(NLM_NAME)_link.def
+else
+ @echo stacksize 64000 >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
+ @echo screenname "$(NLM_SCREEN_NAME)" >> $(OBJDIR)\$(NLM_NAME)_link.def
+ifneq "$(NLM_VERSION)" ""
+ @echo version $(NLM_VERSION) >> $(OBJDIR)\$(NLM_NAME)_link.def
+else
+ @echo version $(VERSION) >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
+ifneq "$(NLM_ENTRY_SYM)" ""
+ @echo start $(NLM_ENTRY_SYM) >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
+ifneq "$(NLM_EXIT_SYM)" ""
+ @echo exit $(NLM_EXIT_SYM) >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
+ifneq "$(NLM_CHECK_SYM)" ""
+ @echo check $(NLM_CHECK_SYM) >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
+ifneq "$(NLM_FLAGS)" ""
+ @echo $(strip $(NLM_FLAGS)) >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
ifneq "$(FILES_nlm_modules)" ""
@echo module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(subst /,\,$(module))) >> $(OBJDIR)\$(NLM_NAME)_link.def
endif
ifneq "$(FILES_nlm_Ximports)" ""
- @echo Import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(subst /,\,$(import))) >> $(OBJDIR)\$(NLM_NAME)_link.def
+ @echo import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(subst /,\,$(import))) >> $(OBJDIR)\$(NLM_NAME)_link.def
endif
ifneq "$(FILES_nlm_exports)" ""
- @echo Export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(subst /,\,$(export))) >> $(OBJDIR)\$(NLM_NAME)_link.def
+ @echo export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(subst /,\,$(export))) >> $(OBJDIR)\$(NLM_NAME)_link.def
endif
# if APACHE_UNIPROC is defined, don't include XDCData
ifndef APACHE_UNIPROC
ifneq "$(string $(XDCDATA))" ""
- @echo XDCData $(XDCDATA) >> $(OBJDIR)\$(NLM_NAME)_link.def
+ @echo xdcdata $(XDCDATA) >> $(OBJDIR)\$(NLM_NAME)_link.def
else
- @echo XDCData $(APR)\misc\netware\apr.xdc >> $(OBJDIR)\$(NLM_NAME)_link.def
+ @echo xdcdata $(APR)\misc\netware\apr.xdc >> $(OBJDIR)\$(NLM_NAME)_link.def
endif
endif
@@ -324,4 +322,8 @@
endif # NO_LICENSE_FILE
endif # multiple targets
+
+$(INSTDIRS) ::
+ $(CHKNOT) $@\NUL mkdir $@
+