From 2dc5bacc01efec6be5e739673caefc67294a8c7f Mon Sep 17 00:00:00 2001
From: Ron Lee <ron@debian.org>
Date: Sun, 2 Dec 2001 10:07:15 +0000
Subject: [PATCH] fixes for contrib build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 contrib/samples/Makefile.in | 2 +-
 contrib/src/Makefile.in     | 2 +-
 src/makelib.env.in          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/samples/Makefile.in b/contrib/samples/Makefile.in
index 2d1cd3a037..be88e149d0 100644
--- 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 45e37c974d..0d880d3147 100644
--- 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 9cb590172d..0e6a61b6bb 100644
--- 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) \
-- 
2.47.2