don't link in libwx_gtk twice when linking apps using OpenGL

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

diff --git a/Makefile.in b/Makefile.in
index acb1f207f7fff7c2b3910662252e94852030b3f2..edca976e543dc9c3569bc4c13f4684f603c1f062 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -318,9 +318,11 @@ $(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
        @$(INSTALL) -d $(build_libdir)
        $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
 
        @$(INSTALL) -d $(build_libdir)
        $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
 

+# NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line
+#     but this seems to result in problems with libwx_gtk being linked in twice

 $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
        @$(INSTALL) -d $(build_libdir)
 $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
        @$(INSTALL) -d $(build_libdir)

-       $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o -L$(build_libdir) @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS)
+       $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS)

 
 $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
        @$(INSTALL) -d $(build_libdir)
 
 $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
        @$(INSTALL) -d $(build_libdir)