corrected shared library linking (add wx library to link)

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

diff --git a/src/makelib.env.in b/src/makelib.env.in
index 1707f4ad246515b364cdd8af1188d6b01da457d4..9cb590172d1db3700d983d53d249224355b888ed 100644 (file)
--- a/src/makelib.env.in
+++ b/src/makelib.env.in
@@ -57,17 +57,15 @@ VPATH = @PATH_IFS@$(top_srcdir)/$(libsrc_dir) # ':' for autoconf
 
 include $(top_builddir)/src/make.env
 
-
 all: libtype_@WX_TARGET_LIBRARY_TYPE@
 
 libtype_so: $(top_builddir)/lib/$(TARGETLIB_SHARED)
 
 libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC)
 
-
-$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS)
+$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS) $(top_builddir)/lib/@WX_LIBRARY_NAME_SHARED@
        @$(INSTALL) -d $(top_builddir)/lib
-       $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS)
+       $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) -L$(top_builddir)/lib @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS)
        cd $(top_builddir)/lib \
                && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
                && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \