From: Robert Roebling Date: Sat, 5 Jun 1999 20:42:19 +0000 (+0000) Subject: Changed to libtool's interface vs. release versioning X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2b6f061f0a69927c92ec637d20b5478b92402fe4 Changed to libtool's interface vs. release versioning make install works git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.am b/Makefile.am index cf2ae65578..13d83bc880 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,13 @@ + +AUTOMAKE_OPTIONS = 1.4 +# no-dependencies + SUBDIRS = include src samples # utils user docs -pkgdata_SCRIPTS = wx-config +bin_SCRIPTS = wx-config + +configincludedir = $(libdir)/wx/include/wx/$(TOOLKIT_DIR) + +configinclude_DATA = \ + setup.h + diff --git a/configure.in b/configure.in index 5dc0745817..22a7497e6b 100644 --- a/configure.in +++ b/configure.in @@ -19,12 +19,38 @@ dnl the file passed to AC_INIT should be speicific to our package AC_INIT(wx-config.in) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(wxWindows, 2.1.0) + +dnl When making releases do: +dnl +dnl WX_RELEASE_NUMBER += 1 +dnl WX_INTERFACE_AGE += 1 +dnl WX_BINARY_AGE += 1 +dnl +dnl if any functions have been added, do: +dnl +dnl WX_INTERFACE_AGE = 1 WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=1 WX_RELEASE_NUMBER=0 +WX_INTERFACE_AGE=0 +WX_BINARY_AGE=0 + +WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER + +AM_INIT_AUTOMAKE(wxWindows, $WX_VERSION) + +dnl libtool versioning +LT_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER +LT_CURRENT=`expr $WX_RELEASE_NUMBER - $WX_INTERFACE_AGE` +LT_REVISION=$WX_INTERFACE_AGE +LT_AGE=`expr $WX_BINARY_AGE - $WX_INTERFACE_AGE` +AC_SUBST(LT_RELEASE) +AC_SUBST(LT_CURRENT) +AC_SUBST(LT_REVISION) +AC_SUBST(LT_AGE) + dnl FIXME this hack suppresses automake 1.4 warning about @LTLIBOBJS@ being dnl never defined in configure.in (remove these lines to see what I'm dnl speaking about) - Tom Tromey told me that it will @@ -999,7 +1025,10 @@ dnl the symbol which allows conditional compilation for the given toolkit TOOLKIT_DEF=-D__WX${TOOLKIT}__ dnl the name of the (libtool) library -WX_LIBRARY_NAME="libwx_${TOOLKIT_DIR}2.la" +WX_LIBRARY_NAME="libwx_${TOOLKIT_DIR}.la" + +dnl the name of the library to be linked reported by wx-config +WX_LIBRARY="wx_${TOOLKIT_DIR}" dnl ------------------------------------------------------------------------ dnl Check for headers @@ -1015,7 +1044,7 @@ dnl defines HAVE_WCSTR_H AC_CHECK_HEADERS(wcstr.h) dnl defines HAVE_FNMATCH_H AC_CHECK_HEADERS(fnmatch.h) -dnl defines HAVE_XKBLIB_H +dnl defines HAVE_X11_XKBLIB_H AC_CHECK_HEADERS(X11/XKBlib.h) dnl --------------------------------------------------------------------------- @@ -1860,6 +1889,7 @@ AC_SUBST(WX_MAJOR_VERSION_NUMBER) AC_SUBST(WX_MINOR_VERSION_NUMBER) AC_SUBST(WX_RELEASE_NUMBER) AC_SUBST(WX_LIBRARY_NAME) +AC_SUBST(WX_LIBRARY) dnl suppress libtool's informational messages - they duplicate its command line LIBTOOL="$LIBTOOL --silent" diff --git a/include/wx/Makefile.am b/include/wx/Makefile.am index e5b13ae464..51ff5cf0b6 100644 --- a/include/wx/Makefile.am +++ b/include/wx/Makefile.am @@ -8,6 +8,10 @@ SUBDIRS = generic @TOOLKIT_DIR@ @INCLUDE_SUBDIRS@ wx_includedir = ${includedir}/wx wx_include_HEADERS = \ +\ + arrimpl.cpp \ + listimpl.cpp \ +\ accel.h \ app.h \ bitmap.h \ diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am index 77496f9883..1967ab60d2 100644 --- a/src/gtk/Makefile.am +++ b/src/gtk/Makefile.am @@ -14,10 +14,10 @@ VPATH = .:${srcdir}:${srcdir}/../common:${srcdir}/../generic:${EXTRA_VPATH} EXTRA_DIST = "${srcdir}/../common ${srcdir}/../generic ${srcdir}" lib_LTLIBRARIES = @WX_LIBRARY_NAME@ -EXTRA_LTLIBRARIES = libwx_gtk2.la libwx_motif2.la +EXTRA_LTLIBRARIES = libwx_gtk.la libwx_motif.la # these are the common files which always make part of the library -libwx_gtk2_la_SOURCES = \ +libwx_gtk_la_SOURCES = \ \ win_gtk.c \ extended.c \ @@ -206,6 +206,8 @@ lexer.c: $(srcdir)/../common/lexer.l sed -e "s/unput/PROIO_unput/g" > lexer.c @$(RM) lex.yy.c -libwx_gtk2_la_LDFLAGS = -rpath @libdir@ -release @WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@ -libwx_gtk2_la_LIBADD = $(LTLIBOBJS) -libwx_gtk2_la_DEPENDENCIES = $(libwx_gtk2_la_LIBADD) lexer.l parser.y +libwx_gtk_la_LDFLAGS = -rpath @libdir@ \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -release $(LT_RELEASE) +libwx_gtk_la_LIBADD = $(LTLIBOBJS) +libwx_gtk_la_DEPENDENCIES = $(libwx_gtk_la_LIBADD) lexer.l parser.y diff --git a/src/gtk1/Makefile.am b/src/gtk1/Makefile.am index 77496f9883..1967ab60d2 100644 --- a/src/gtk1/Makefile.am +++ b/src/gtk1/Makefile.am @@ -14,10 +14,10 @@ VPATH = .:${srcdir}:${srcdir}/../common:${srcdir}/../generic:${EXTRA_VPATH} EXTRA_DIST = "${srcdir}/../common ${srcdir}/../generic ${srcdir}" lib_LTLIBRARIES = @WX_LIBRARY_NAME@ -EXTRA_LTLIBRARIES = libwx_gtk2.la libwx_motif2.la +EXTRA_LTLIBRARIES = libwx_gtk.la libwx_motif.la # these are the common files which always make part of the library -libwx_gtk2_la_SOURCES = \ +libwx_gtk_la_SOURCES = \ \ win_gtk.c \ extended.c \ @@ -206,6 +206,8 @@ lexer.c: $(srcdir)/../common/lexer.l sed -e "s/unput/PROIO_unput/g" > lexer.c @$(RM) lex.yy.c -libwx_gtk2_la_LDFLAGS = -rpath @libdir@ -release @WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@ -libwx_gtk2_la_LIBADD = $(LTLIBOBJS) -libwx_gtk2_la_DEPENDENCIES = $(libwx_gtk2_la_LIBADD) lexer.l parser.y +libwx_gtk_la_LDFLAGS = -rpath @libdir@ \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -release $(LT_RELEASE) +libwx_gtk_la_LIBADD = $(LTLIBOBJS) +libwx_gtk_la_DEPENDENCIES = $(libwx_gtk_la_LIBADD) lexer.l parser.y diff --git a/wx-config.in b/wx-config.in index 884eb80b1a..6c0f4262a8 100755 --- a/wx-config.in +++ b/wx-config.in @@ -36,7 +36,7 @@ while test $# -gt 0; do echo $exec_prefix ;; --version) - echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@ + echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@ ;; --cflags) if test @includedir@ != /usr/include ; then @@ -44,14 +44,14 @@ while test $# -gt 0; do includes=-I@includedir@ fi fi - includes="$includes -I@datadir@/@PACKAGE@/include" + includes="$includes -I@libdir@/wx/include" echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@ ;; --libs) if test @libdir@ != /usr/lib ; then libs="-L@libdir@" fi - echo $libs -lwx_@WX_LIBRARY@ @EXTRA_LIBS@ + echo $libs -l@WX_LIBRARY@ @EXTRA_LIBS@ ;; *) echo "${usage}" 1>&2