apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1088203 - in /apr/apr-util/branches: 1.3.x/dbm/NWGNUdbmdb 1.3.x/dbm/NWGNUdbmgdbm 1.4.x/dbm/NWGNUdbmdb 1.4.x/dbm/NWGNUdbmgdbm 1.5.x/dbm/NWGNUdbmdb 1.5.x/dbm/NWGNUdbmgdbm
Date Sun, 03 Apr 2011 03:27:22 GMT
Author: fuankg
Date: Sun Apr  3 03:27:22 2011
New Revision: 1088203

URL: http://svn.apache.org/viewvc?rev=1088203&view=rev
Log:
Fixed NetWare dbm makefiles.

Modified:
    apr/apr-util/branches/1.3.x/dbm/NWGNUdbmdb
    apr/apr-util/branches/1.3.x/dbm/NWGNUdbmgdbm
    apr/apr-util/branches/1.4.x/dbm/NWGNUdbmdb
    apr/apr-util/branches/1.4.x/dbm/NWGNUdbmgdbm
    apr/apr-util/branches/1.5.x/dbm/NWGNUdbmdb
    apr/apr-util/branches/1.5.x/dbm/NWGNUdbmgdbm

Modified: apr/apr-util/branches/1.3.x/dbm/NWGNUdbmdb
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbm/NWGNUdbmdb?rev=1088203&r1=1088202&r2=1088203&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbm/NWGNUdbmdb (original)
+++ apr/apr-util/branches/1.3.x/dbm/NWGNUdbmdb Sun Apr  3 03:27:22 2011
@@ -14,8 +14,6 @@ ifndef EnvironmentDefined
 include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
-
 #
 # build this level's files
 
@@ -27,8 +25,8 @@ endif
 
 # for now defined here - should finally go into build/NWGNUenvironment.inc
 DB_INC = $(DBSDK)/inc
-DB_IMP = $(DBSDK)/imp/libdb47.imp
-DB_LIB = $(DBSDK)/lib/libdb47.lib
+DB_IMP = libdb47.imp
+DB_LIB = libdb47.lib
 DB_NLM = libdb47
 
 #
@@ -38,8 +36,8 @@ DB_NLM = libdb47
 XINCDIRS	+= \
 			$(APR)/include/arch/netware \
 			$(APR)/include \
-			$(APRUTIL)/include \
-			$(APRUTIL)/include/private \
+			$(APU)/include \
+			$(APU)/include/private \
 			$(APR) \
 			$(DB_INC) \
 			$(EOLIST)
@@ -69,6 +67,10 @@ ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(DBSDK)/lib \
 			$(EOLIST)
+else
+XLFLAGS		+= \
+			-l $(DBSDK)/imp \
+			$(EOLIST)
 endif
 
 #
@@ -244,7 +246,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: apr/apr-util/branches/1.3.x/dbm/NWGNUdbmgdbm
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbm/NWGNUdbmgdbm?rev=1088203&r1=1088202&r2=1088203&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbm/NWGNUdbmgdbm (original)
+++ apr/apr-util/branches/1.3.x/dbm/NWGNUdbmgdbm Sun Apr  3 03:27:22 2011
@@ -14,8 +14,6 @@ ifndef EnvironmentDefined
 include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
-
 #
 # build this level's files
 
@@ -27,8 +25,8 @@ endif
 
 # for now defined here - should finally go into build/NWGNUenvironment.inc
 GDBM_INC = $(GDBMSDK)/inc
-GDBM_IMP = $(GDBMSDK)/imp/libgdbm.imp
-GDBM_LIB = $(GDBMSDK)/lib/libgdbm.lib
+GDBM_IMP = libgdbm.imp
+GDBM_LIB = libgdbm.lib
 GDBM_NLM = libgdbm
 
 #
@@ -38,8 +36,8 @@ GDBM_NLM = libgdbm
 XINCDIRS	+= \
 			$(APR)/include/arch/netware \
 			$(APR)/include \
-			$(APRUTIL)/include \
-			$(APRUTIL)/include/private \
+			$(APU)/include \
+			$(APU)/include/private \
 			$(APR) \
 			$(GDBM_INC) \
 			$(EOLIST)
@@ -68,6 +66,10 @@ ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(GDBMSDK)/lib \
 			$(EOLIST)
+else
+XLFLAGS		+= \
+			-l $(GDBMSDK)/imp \
+			$(EOLIST)
 endif
 
 #
@@ -243,7 +245,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: apr/apr-util/branches/1.4.x/dbm/NWGNUdbmdb
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/dbm/NWGNUdbmdb?rev=1088203&r1=1088202&r2=1088203&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/dbm/NWGNUdbmdb (original)
+++ apr/apr-util/branches/1.4.x/dbm/NWGNUdbmdb Sun Apr  3 03:27:22 2011
@@ -14,8 +14,6 @@ ifndef EnvironmentDefined
 include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
-
 #
 # build this level's files
 
@@ -27,8 +25,8 @@ endif
 
 # for now defined here - should finally go into build/NWGNUenvironment.inc
 DB_INC = $(DBSDK)/inc
-DB_IMP = $(DBSDK)/imp/libdb47.imp
-DB_LIB = $(DBSDK)/lib/libdb47.lib
+DB_IMP = libdb47.imp
+DB_LIB = libdb47.lib
 DB_NLM = libdb47
 
 #
@@ -38,8 +36,8 @@ DB_NLM = libdb47
 XINCDIRS	+= \
 			$(APR)/include/arch/netware \
 			$(APR)/include \
-			$(APRUTIL)/include \
-			$(APRUTIL)/include/private \
+			$(APU)/include \
+			$(APU)/include/private \
 			$(APR) \
 			$(DB_INC) \
 			$(EOLIST)
@@ -69,6 +67,10 @@ ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(DBSDK)/lib \
 			$(EOLIST)
+else
+XLFLAGS		+= \
+			-l $(DBSDK)/imp \
+			$(EOLIST)
 endif
 
 #
@@ -244,7 +246,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: apr/apr-util/branches/1.4.x/dbm/NWGNUdbmgdbm
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/dbm/NWGNUdbmgdbm?rev=1088203&r1=1088202&r2=1088203&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/dbm/NWGNUdbmgdbm (original)
+++ apr/apr-util/branches/1.4.x/dbm/NWGNUdbmgdbm Sun Apr  3 03:27:22 2011
@@ -14,8 +14,6 @@ ifndef EnvironmentDefined
 include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
-
 #
 # build this level's files
 
@@ -27,8 +25,8 @@ endif
 
 # for now defined here - should finally go into build/NWGNUenvironment.inc
 GDBM_INC = $(GDBMSDK)/inc
-GDBM_IMP = $(GDBMSDK)/imp/libgdbm.imp
-GDBM_LIB = $(GDBMSDK)/lib/libgdbm.lib
+GDBM_IMP = libgdbm.imp
+GDBM_LIB = libgdbm.lib
 GDBM_NLM = libgdbm
 
 #
@@ -38,8 +36,8 @@ GDBM_NLM = libgdbm
 XINCDIRS	+= \
 			$(APR)/include/arch/netware \
 			$(APR)/include \
-			$(APRUTIL)/include \
-			$(APRUTIL)/include/private \
+			$(APU)/include \
+			$(APU)/include/private \
 			$(APR) \
 			$(GDBM_INC) \
 			$(EOLIST)
@@ -68,6 +66,10 @@ ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(GDBMSDK)/lib \
 			$(EOLIST)
+else
+XLFLAGS		+= \
+			-l $(GDBMSDK)/imp \
+			$(EOLIST)
 endif
 
 #
@@ -243,7 +245,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: apr/apr-util/branches/1.5.x/dbm/NWGNUdbmdb
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbm/NWGNUdbmdb?rev=1088203&r1=1088202&r2=1088203&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbm/NWGNUdbmdb (original)
+++ apr/apr-util/branches/1.5.x/dbm/NWGNUdbmdb Sun Apr  3 03:27:22 2011
@@ -14,8 +14,6 @@ ifndef EnvironmentDefined
 include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
-
 #
 # build this level's files
 
@@ -27,8 +25,8 @@ endif
 
 # for now defined here - should finally go into build/NWGNUenvironment.inc
 DB_INC = $(DBSDK)/inc
-DB_IMP = $(DBSDK)/imp/libdb47.imp
-DB_LIB = $(DBSDK)/lib/libdb47.lib
+DB_IMP = libdb47.imp
+DB_LIB = libdb47.lib
 DB_NLM = libdb47
 
 #
@@ -38,8 +36,8 @@ DB_NLM = libdb47
 XINCDIRS	+= \
 			$(APR)/include/arch/netware \
 			$(APR)/include \
-			$(APRUTIL)/include \
-			$(APRUTIL)/include/private \
+			$(APU)/include \
+			$(APU)/include/private \
 			$(APR) \
 			$(DB_INC) \
 			$(EOLIST)
@@ -69,6 +67,10 @@ ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(DBSDK)/lib \
 			$(EOLIST)
+else
+XLFLAGS		+= \
+			-l $(DBSDK)/imp \
+			$(EOLIST)
 endif
 
 #
@@ -244,7 +246,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: apr/apr-util/branches/1.5.x/dbm/NWGNUdbmgdbm
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbm/NWGNUdbmgdbm?rev=1088203&r1=1088202&r2=1088203&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbm/NWGNUdbmgdbm (original)
+++ apr/apr-util/branches/1.5.x/dbm/NWGNUdbmgdbm Sun Apr  3 03:27:22 2011
@@ -14,8 +14,6 @@ ifndef EnvironmentDefined
 include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
-
 #
 # build this level's files
 
@@ -27,8 +25,8 @@ endif
 
 # for now defined here - should finally go into build/NWGNUenvironment.inc
 GDBM_INC = $(GDBMSDK)/inc
-GDBM_IMP = $(GDBMSDK)/imp/libgdbm.imp
-GDBM_LIB = $(GDBMSDK)/lib/libgdbm.lib
+GDBM_IMP = libgdbm.imp
+GDBM_LIB = libgdbm.lib
 GDBM_NLM = libgdbm
 
 #
@@ -38,8 +36,8 @@ GDBM_NLM = libgdbm
 XINCDIRS	+= \
 			$(APR)/include/arch/netware \
 			$(APR)/include \
-			$(APRUTIL)/include \
-			$(APRUTIL)/include/private \
+			$(APU)/include \
+			$(APU)/include/private \
 			$(APR) \
 			$(GDBM_INC) \
 			$(EOLIST)
@@ -68,6 +66,10 @@ ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(GDBMSDK)/lib \
 			$(EOLIST)
+else
+XLFLAGS		+= \
+			-l $(GDBMSDK)/imp \
+			$(EOLIST)
 endif
 
 #
@@ -243,7 +245,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 



Mime
View raw message