more build and distrib stuff

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

wxPython/distrib/build.py

@@ -285,10 +285,9 @@ class BuildConfig:
                           '`$(WXCONFIG) --cflags` -I$(PYINCLUDE) -I$(EXECINCLUDE) '\
                           '-I$(WXPSRCDIR)'
             self.LFLAGS = '-L$(WXPSRCDIR) `$(WXCONFIG) --libs`'
-            self.LIBS   = '-l$(HELPERLIB)'
             self.RMCMD  = '-rm -f '
             self.WXCONFIG = 'wx-config'
-
+            self.USE_SONAME = '0'
 
             # **** What to do when I start supporting Motif, etc.???
             self.GENCODEDIR = 'gtk'
@@ -712,7 +711,7 @@ MODULE = %(MODULE)s
 SWIGFLAGS = %(SWIGFLAGS)s %(SWIGTOOLKITFLAG)s %(OTHERSWIGFLAGS)s
 CFLAGS = %(CFLAGS)s $(OPT) %(OTHERCFLAGS)s
 LFLAGS = %(LFLAGS)s %(OTHERLFLAGS)s
-LIBS = %(LIBS)s %(OTHERLIBS)s
+
 PYVERSION = %(PYVERSION)s
 PYPREFIX = %(PYPREFIX)s
 EXECPREFIX = %(EXECPREFIX)s
@@ -753,6 +752,13 @@ ifeq ($(WXP_USE_THREAD), 1)
 THREAD=-DWXP_USE_THREAD
 endif
 
+USE_SONAME = %(USE_SONAME)s
+ifeq ($(USE_SONAME), 1)
+LIBS = -l$(HELPERLIB) %(OTHERLIBS)s
+else
+LIBS = $(WXPSRCDIR)/lib$(HELPERLIB)$(SO) %(OTHERLIBS)s
+endif
+
 #----------------------------------------------------------------------
 
 %(DEFAULTRULE)s %(OTHERTARGETS)s