From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Mon, 17 Jan 2005 13:02:12 +0000 (+0000)
Subject: Minor output simplification. Significantly influences all makefiles but nothing regen... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/46da6d0629858da0b82ec54f2d804edc80eef552

Minor output simplification. Significantly influences all makefiles but nothing regenerated before incoming new bakefile release.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 3e04b9ab3b..5514715acd 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -204,13 +204,15 @@
         <set var="BUILDDIR">$(OBJS)</set>
     </if>
 
+    <set var="LIBTYPE_SUFFIX" make_var="1">
+        <if cond="FORMAT!='autoconf' and SHARED=='0'">lib</if>
+        <if cond="FORMAT!='autoconf' and SHARED=='1'">dll</if>
+    </set>
+
     <set var="LIBDIRNAME" make_var="1">
         <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
-        <if cond="FORMAT!='autoconf' and SHARED=='0'">
-            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_lib$(CFG)
-        </if>
-        <if cond="FORMAT!='autoconf' and SHARED=='1'">
-            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_dll$(CFG)
+        <if cond="FORMAT!='autoconf'">
+            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
         </if>
     </set>