sanitized library names in contrib hierarchy

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-22 15:08:16 +00:00
parent 4bfedab037
commit 0357e1513d
42 changed files with 373 additions and 323 deletions
--- a/486
+++ b/486
--- a/configure.in
+++ b/configure.in
@@ -2588,6 +2588,7 @@ fi
 dnl library link name
 WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
 WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
+WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"

 dnl the name of the shared library
 WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
@@ -5194,9 +5195,16 @@ wx_cv_program_ext=$PROGRAM_EXT
 wx_cv_target_library=$WX_TARGET_LIBRARY
 wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
 wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
+wx_cv_library_basename=${WX_LIBRARY_BASENAME}
+wx_cv_release=${WX_RELEASE}
+wx_cv_current=${WX_CURRENT}
+wx_cv_revision=${WX_REVISION}
+wx_cv_age=${WX_AGE}
 export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
       wx_cv_path_ifs wx_cv_program_ext \
-       wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
+       wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
+       wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age
+

 AC_CONFIG_SUBDIRS(demos samples utils contrib)

--- a/contrib/configure
+++ b/contrib/configure
@@ -691,6 +691,16 @@ fi
 PATH_IFS=$wx_cv_path_ifs
 WX_TARGET_LIBRARY=$wx_cv_target_library
 WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype
+WX_LIBRARY_BASENAME=$wx_cv_library_basename
+WX_RELEASE=$wx_cv_release
+WX_CURRENT=$wx_cv_current
+WX_REVISION=$wx_cv_revision
+WX_AGE=$wx_cv_age
+
+
+
+
+



@@ -890,6 +900,11 @@ s%@PATH_IFS@%$PATH_IFS%g
 s%@ESD_LINK@%$ESD_LINK%g
 s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
 s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g
+s%@WX_LIBRARY_BASENAME@%$WX_LIBRARY_BASENAME%g
+s%@WX_RELEASE@%$WX_RELEASE%g
+s%@WX_CURRENT@%$WX_CURRENT%g
+s%@WX_REVISION@%$WX_REVISION%g
+s%@WX_AGE@%$WX_AGE%g

 CEOF
 EOF
--- a/contrib/configure.in
+++ b/contrib/configure.in
@@ -26,11 +26,21 @@ dnl Final subst
 PATH_IFS=$wx_cv_path_ifs
 WX_TARGET_LIBRARY=$wx_cv_target_library
 WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype
+WX_LIBRARY_BASENAME=$wx_cv_library_basename
+WX_RELEASE=$wx_cv_release
+WX_CURRENT=$wx_cv_current
+WX_REVISION=$wx_cv_revision
+WX_AGE=$wx_cv_age

 AC_SUBST(PATH_IFS)
 AC_SUBST(ESD_LINK)
 AC_SUBST(WX_TARGET_LIBRARY)
 AC_SUBST(WX_TARGET_LIBRARY_TYPE)
+AC_SUBST(WX_LIBRARY_BASENAME)
+AC_SUBST(WX_RELEASE)
+AC_SUBST(WX_CURRENT)
+AC_SUBST(WX_REVISION)
+AC_SUBST(WX_AGE)

 dnl -----------
 dnl File output
@@ -55,6 +65,7 @@ AC_OUTPUT([
            samples/ogl/ogledit/Makefile
            samples/ogl/studio/Makefile
            samples/stc/Makefile
+            samples/svg/Makefile
            samples/canvas/Makefile
            samples/canvas/test/Makefile
            samples/canvas/simple/Makefile
--- a/contrib/samples/animate/Makefile.in
+++ b/contrib/samples/animate/Makefile.in
@@ -17,7 +17,7 @@ PROGRAM=anitest

 OBJECTS=$(PROGRAM).o

-APPEXTRALIBS=$(top_builddir)/lib/libwx_anim.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_anim-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/applet/Makefile.in
+++ b/contrib/samples/applet/Makefile.in
@@ -19,7 +19,7 @@ DATAFILES=about.html index.html

 OBJECTS=applet.o dialogs_wdr.o monitorapplet.o combobox.o

-APPEXTRALIBS=$(top_builddir)/lib/libapplet.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_applet-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/canvas/simple/Makefile.in
+++ b/contrib/samples/canvas/simple/Makefile.in
@@ -17,7 +17,7 @@ PROGRAM=simple

 OBJECTS=simple.o

-APPEXTRALIBS=$(top_builddir)/lib/libcanvas.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_canvas-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/canvas/test/Makefile.in
+++ b/contrib/samples/canvas/test/Makefile.in
@@ -19,7 +19,7 @@ OBJECTS=test.o

 DATAFILES = pat4.bmp pat36.bmp

-APPEXTRALIBS=$(top_builddir)/lib/libcanvas.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_canvas-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/fl/fl_demo1/Makefile.in
+++ b/contrib/samples/fl/fl_demo1/Makefile.in
@@ -17,7 +17,7 @@ TARGET = fl_demo1
 program_dir = contrib/samples/fl/$(TARGET)

 APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@

 PROGRAM = $(TARGET)
 OBJECTS = $(TARGET).o
--- a/contrib/samples/fl/fl_demo2/Makefile.in
+++ b/contrib/samples/fl/fl_demo2/Makefile.in
@@ -17,7 +17,7 @@ TARGET = fl_demo2
 program_dir = contrib/samples/fl/$(TARGET)

 APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@

 PROGRAM = $(TARGET)
 OBJECTS = $(TARGET).o
--- a/contrib/samples/fl/fl_sample1/Makefile.in
+++ b/contrib/samples/fl/fl_sample1/Makefile.in
@@ -17,7 +17,7 @@ TARGET = fl_sample1
 program_dir = contrib/samples/fl/$(TARGET)

 APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@

 PROGRAM = $(TARGET)
 OBJECTS = $(TARGET).o
--- a/contrib/samples/fl/fl_sample2/Makefile.in
+++ b/contrib/samples/fl/fl_sample2/Makefile.in
@@ -17,7 +17,7 @@ TARGET = fl_sample2
 program_dir = contrib/samples/fl/$(TARGET)

 APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@

 PROGRAM = $(TARGET)
 OBJECTS = $(TARGET).o
--- a/contrib/samples/fl/fl_sample3/Makefile.in
+++ b/contrib/samples/fl/fl_sample3/Makefile.in
@@ -17,7 +17,7 @@ TARGET = fl_sample3
 program_dir = contrib/samples/fl/$(TARGET)

 APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@

 PROGRAM = $(TARGET)
 OBJECTS = $(TARGET).o
--- a/contrib/samples/gizmos/dynsash/Makefile.in
+++ b/contrib/samples/gizmos/dynsash/Makefile.in
@@ -16,7 +16,7 @@ program_dir = contrib/samples/gizmos/dynsash
 PROGRAM=dynsash
 OBJECTS=dynsash.o

-APPEXTRALIBS=$(top_builddir)/lib/libgizmos.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_gizmos-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/gizmos/dynsash_switch/Makefile.in
+++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in
@@ -16,7 +16,7 @@ program_dir = contrib/samples/gizmos/dynsash_switch
 PROGRAM=dynsash_switch
 OBJECTS=dynsash_switch.o

-APPEXTRALIBS=$(top_builddir)/lib/libgizmos.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_gizmos-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/gizmos/editlbox/Makefile.in
+++ b/contrib/samples/gizmos/editlbox/Makefile.in
@@ -16,7 +16,7 @@ program_dir = contrib/samples/gizmos/editlbox
 PROGRAM=test
 OBJECTS=test.o

-APPEXTRALIBS=$(top_builddir)/lib/libgizmos.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_gizmos-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/gizmos/multicell/Makefile.in
+++ b/contrib/samples/gizmos/multicell/Makefile.in
@@ -17,7 +17,7 @@ PROGRAM=multicell

 OBJECTS=mtest.o

-APPEXTRALIBS=$(top_builddir)/lib/libgizmos.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_gizmos-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/gizmos/splittree/Makefile.in
+++ b/contrib/samples/gizmos/splittree/Makefile.in
@@ -16,7 +16,7 @@ program_dir = contrib/samples/gizmos/splittree
 PROGRAM=splittree
 OBJECTS=tree.o

-APPEXTRALIBS=$(top_builddir)/lib/libgizmos.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_gizmos-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/mmedia/Makefile.in
+++ b/contrib/samples/mmedia/Makefile.in
@@ -9,7 +9,7 @@ PROGRAM=mmboard

 OBJECTS=mmboard.o mmbman.o

-APPEXTRALIBS=$(top_builddir)/lib/libmmedia.@WX_TARGET_LIBRARY_TYPE@ @ESD_LINK@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_mmedia-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@ @ESD_LINK@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/ogl/ogledit/Makefile.in
+++ b/contrib/samples/ogl/ogledit/Makefile.in
@@ -9,7 +9,7 @@ PROGRAM=ogledit

 OBJECTS=$(PROGRAM).o doc.o view.o palette.o

-APPEXTRALIBS=$(top_builddir)/lib/libogl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_ogl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/ogl/studio/Makefile.in
+++ b/contrib/samples/ogl/studio/Makefile.in
@@ -12,7 +12,7 @@ DATAFILES=studio_resources.wxr
 OBJECTS=$(PROGRAM).o doc.o shapes.o symbols.o view.o cspalette.o\
  mainfrm.o project.o dialogs.o csprint.o

-APPEXTRALIBS=$(top_builddir)/lib/libogl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_ogl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include -I$(top_srcdir)/$(program_dir)/bitmaps

 include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/plot/Makefile.in
+++ b/contrib/samples/plot/Makefile.in
@@ -9,7 +9,7 @@ PROGRAM=plot

 OBJECTS=plot.o

-APPEXTRALIBS=$(top_builddir)/lib/libwx_plot.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_plot-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/stc/Makefile.in
+++ b/contrib/samples/stc/Makefile.in
@@ -13,7 +13,7 @@ PROGRAM=stctest

 OBJECTS=$(PROGRAM).o

-APPEXTRALIBS=$(top_builddir)/lib/libstc.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_stc-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 DATAFILES=stctest.cpp
--- a/contrib/samples/svg/Makefile.in
+++ b/contrib/samples/svg/Makefile.in
@@ -9,7 +9,7 @@ PROGRAM=svgtest

 OBJECTS=svgtest.o

-APPEXTRALIBS=$(top_builddir)/lib/libwx_dcsvg.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_dcsvg-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/xrc/Makefile.in
+++ b/contrib/samples/xrc/Makefile.in
@@ -16,7 +16,7 @@ OBJECTS=$(PROGRAM).o \
        derivdlg.o \
 	custclas.o

-APPEXTRALIBS=$(top_builddir)/lib/libwxxrc.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_xrc-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 DATADIRS = rc
--- a/contrib/src/animate/Makefile.in
+++ b/contrib/src/animate/Makefile.in
@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/animate

-TARGET_LIBNAME=libwx_anim
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_animate-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@

-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0

 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=plot
--- a/contrib/src/applet/Makefile.in
+++ b/contrib/src/applet/Makefile.in
@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/applet

-TARGET_LIBNAME=libapplet
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_applet-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@

-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0

 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=applet
--- a/contrib/src/canvas/Makefile.in
+++ b/contrib/src/canvas/Makefile.in
@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/canvas

-TARGET_LIBNAME=libcanvas
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_canvas-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@

-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0

 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=canvas
--- a/contrib/src/fl/Makefile.in
+++ b/contrib/src/fl/Makefile.in
@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/fl

-TARGET_LIBNAME = libfl
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@

-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0

 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=fl
--- a/contrib/src/gizmos/Makefile.in
+++ b/contrib/src/gizmos/Makefile.in
@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/gizmos

-TARGET_LIBNAME=libgizmos
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_gizmos-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@

-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0

 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=gizmos
--- a/contrib/src/mmedia/Makefile.in
+++ b/contrib/src/mmedia/Makefile.in
@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/mmedia

-TARGET_LIBNAME=libmmedia
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_mmedia-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@

-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0

 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=mmedia
--- a/contrib/src/net/Makefile.in
+++ b/contrib/src/net/Makefile.in
@@ -4,14 +4,15 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/net

-TARGET_LIBNAME=libwx_net
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_net-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@

-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0

 HEADER_PATH=$(top_srcdir)/contrib/include/wx
-HEADER_SUBDIR=plot
+HEADER_SUBDIR=net

 HEADERS=msg.h email.h web.h

--- a/contrib/src/ogl/Makefile.in
+++ b/contrib/src/ogl/Makefile.in
@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/ogl

-TARGET_LIBNAME=libogl
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_ogl-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@

-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0

 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=ogl
--- a/contrib/src/plot/Makefile.in
+++ b/contrib/src/plot/Makefile.in
@@ -4,11 +4,11 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/plot

-TARGET_LIBNAME=libwx_plot
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_plot-@WX_RELEASE@

-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@

 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=plot
--- a/contrib/src/stc/Makefile.in
+++ b/contrib/src/stc/Makefile.in
@@ -11,11 +11,11 @@ top_builddir = ../../..
 scintilla_dir = $(top_srcdir)/contrib/src/stc/scintilla
 libsrc_dir = contrib/src/stc@PATH_IFS@$(scintilla_dir)/src

-TARGET_LIBNAME=libstc
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_stc-@WX_RELEASE@

-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@

 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=stc
--- a/contrib/src/svg/Makefile.in
+++ b/contrib/src/svg/Makefile.in
@@ -4,14 +4,14 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/svg

-TARGET_LIBNAME=libwx_dcsvg
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_dcsvg-@WX_RELEASE@

-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@

 HEADER_PATH=$(top_srcdir)/contrib/include/wx
-HEADER_SUBDIR=dcsvg
+HEADER_SUBDIR=svg

 HEADERS=dcsvg.h

--- a/contrib/src/xrc/Makefile.in
+++ b/contrib/src/xrc/Makefile.in
@@ -7,11 +7,11 @@ expat_dir = $(top_srcdir)/contrib/src/xrc/expat
 libsrc_dir = contrib/src/xrc@PATH_IFS@$(expat_dir)/xmlparse@PATH_IFS@$(expat_dir)/xmltok


-TARGET_LIBNAME=libwxxrc
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_xrc-@WX_RELEASE@

-LIBVERSION_CURRENT=0
-LIBVERSION_REVISION=1
-LIBVERSION_AGE=0
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@

 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=xrc
@@ -22,7 +22,7 @@ EXPAT_OBJECTS=xmltok.o xmlrole.o xmlparse.o
 HEADERS=xh_all.h xh_bttn.h xh_chckb.h xh_chckl.h xh_choic.h xh_combo.h \
        xh_dlg.h xh_gauge.h xh_html.h xh_menu.h xh_notbk.h xh_panel.h \
        xh_radbt.h xh_radbx.h xh_sizer.h xh_slidr.h xh_spin.h xh_stbmp.h \
-        xh_sttxt.h xh_text.h xh_listb.h xml.h xmlio.h xmlres.h xh_toolb.h \
+        xh_sttxt.h xh_text.h xh_listb.h xml.h xmlres.h xh_toolb.h \
        xh_bmpbt.h xh_cald.h xh_listc.h xh_scrol.h xh_stbox.h xh_tree.h \
        xh_stlin.h xh_bmp.h xh_unkwn.h xh_frame.h xh_gdctl.h

--- a/contrib/utils/wxrc/Makefile.in
+++ b/contrib/utils/wxrc/Makefile.in
@@ -9,7 +9,7 @@ PROGRAM=wxrc
 OBJECTS=wxrc.o


-APPEXTRALIBS=$(top_builddir)/lib/libwxxrc.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_xrc-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/contrib/utils/wxrcedit/Makefile.in
+++ b/contrib/utils/wxrcedit/Makefile.in
@@ -25,7 +25,7 @@ DATAFILES = df/break.df df/control.df df/menu_item.df df/notebookpage.df \
            df/wxStaticLine.df df/wxStaticText.df df/wxTextCtrl.df \
            df/wxToolBar.df df/wxTreeCtrl.df 
            
-APPEXTRALIBS=$(top_builddir)/lib/libwxxrc.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_xrc-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -16,7 +16,7 @@ OBJECTS=$(PROGRAM).o \
        derivdlg.o \
 	custclas.o

-APPEXTRALIBS=$(top_builddir)/lib/libwxxrc.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_xrc-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 DATADIRS = rc
--- a/src/xrc/Makefile.in
+++ b/src/xrc/Makefile.in
@@ -7,11 +7,11 @@ expat_dir = $(top_srcdir)/contrib/src/xrc/expat
 libsrc_dir = contrib/src/xrc@PATH_IFS@$(expat_dir)/xmlparse@PATH_IFS@$(expat_dir)/xmltok


-TARGET_LIBNAME=libwxxrc
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_xrc-@WX_RELEASE@

-LIBVERSION_CURRENT=0
-LIBVERSION_REVISION=1
-LIBVERSION_AGE=0
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@

 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=xrc
@@ -22,7 +22,7 @@ EXPAT_OBJECTS=xmltok.o xmlrole.o xmlparse.o
 HEADERS=xh_all.h xh_bttn.h xh_chckb.h xh_chckl.h xh_choic.h xh_combo.h \
        xh_dlg.h xh_gauge.h xh_html.h xh_menu.h xh_notbk.h xh_panel.h \
        xh_radbt.h xh_radbx.h xh_sizer.h xh_slidr.h xh_spin.h xh_stbmp.h \
-        xh_sttxt.h xh_text.h xh_listb.h xml.h xmlio.h xmlres.h xh_toolb.h \
+        xh_sttxt.h xh_text.h xh_listb.h xml.h xmlres.h xh_toolb.h \
        xh_bmpbt.h xh_cald.h xh_listc.h xh_scrol.h xh_stbox.h xh_tree.h \
        xh_stlin.h xh_bmp.h xh_unkwn.h xh_frame.h xh_gdctl.h

--- a/utils/wxrc/Makefile.in
+++ b/utils/wxrc/Makefile.in
@@ -9,7 +9,7 @@ PROGRAM=wxrc
 OBJECTS=wxrc.o


-APPEXTRALIBS=$(top_builddir)/lib/libwxxrc.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_xrc-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makeprog.env