svn commit: r386885 - /incubator/stdcxx/trunk/GNUmakefile

[se...@apache.org]

Author: sebor
Date: Sat Mar 18 13:06:13 2006
New Revision: 386885

URL: http://svn.apache.org/viewcvs?rev=386885&view=rev
Log:
2006-03-18  Martin Sebor  <se...@roguewave.com>

	STDCXX-166
	* GNUmakefile (SHARED_SUFFIX, STATIC_SUFFIX): Defined variables
	only if they are not already defined (in the .config file).

Modified:
    incubator/stdcxx/trunk/GNUmakefile

Modified: incubator/stdcxx/trunk/GNUmakefile
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/GNUmakefile?rev=386885&r1=386884&r2=386885&view=diff
==============================================================================
--- incubator/stdcxx/trunk/GNUmakefile (original)
+++ incubator/stdcxx/trunk/GNUmakefile Sat Mar 18 13:06:13 2006
@@ -107,7 +107,7 @@
 #
 #   LIBVER    - library version number in the <major>.<minor>.<micro> format
 #
-#   LIBSUFFIX - static/shared library suffix (defaults to a)
+#   LIBSUFFIX - archive/shared library suffix (defaults to a)
 #
 #   LDSOFLAGS - linker flags used when building a shared lib
 #
@@ -416,10 +416,15 @@
     endif
   endif
 
-  # shared and static library suffix defaults
-  # (may be overridden in config file)
-  SHARED_SUFFIX = .so
-  STATIC_SUFFIX = .a
+  ifeq ($(SHARED_SUFFIX),)
+    # shared library suffix default (may be set in config file)
+    SHARED_SUFFIX = .so
+  endif
+
+  ifeq ($(STATIC_SUFFIX),)
+    # archive library suffix default (may be set in config file)
+    STATIC_SUFFIX = .a
+  endif
 
   # shared/archive
   ifeq ($(findstring shared,$(BUILDMODE)),shared)