fixes for contrib build.

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

diff --git a/contrib/samples/Makefile.in b/contrib/samples/Makefile.in
index 2d1cd3a037a81be3f2ab6b545e7fbc8c3e4f186c..be88e149d0e9d897981b337b3014f171d898acbb 100644 (file)
--- a/contrib/samples/Makefile.in
+++ b/contrib/samples/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$
 
-CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xrc plot applet fl
+CONTRIB_SAMPLES=canvas fl gizmos mmedia net ogl plot stc xrc #applet
 
 all:
        @for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done

diff --git a/contrib/src/Makefile.in b/contrib/src/Makefile.in
index 45e37c974dfb71c6c6d5792965049e815875b66e..0d880d3147f770aa614a6664ed187effaaec3cf5 100644 (file)
--- a/contrib/src/Makefile.in
+++ b/contrib/src/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$
 
-CONTRIB_SUBDIRS=ogl mmedia stc xrc plot canvas animate fl #applet
+CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc xrc #applet
 
 all:
        @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done

diff --git a/src/makelib.env.in b/src/makelib.env.in
index 9cb590172d1db3700d983d53d249224355b888ed..0e6a61b6bb5ad19a9e135768ed631827967c5997 100644 (file)
--- a/src/makelib.env.in
+++ b/src/makelib.env.in
@@ -63,9 +63,9 @@ libtype_so: $(top_builddir)/lib/$(TARGETLIB_SHARED)
 
 libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC)
 
-$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS) $(top_builddir)/lib/@WX_LIBRARY_NAME_SHARED@
+$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS)
        @$(INSTALL) -d $(top_builddir)/lib
-       $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) -L$(top_builddir)/lib @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS)
+       $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS)
        cd $(top_builddir)/lib \
                && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
                && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \