Bump the version to 3.0.0

At the same time, change the library sonames for -3.0 to just -3.
This is necessary since the 2.99 releases installed libraries like
libgtk-3.0.so.0.9903.0, and we want to prevent the library version
number from jumping back. So 3.0 will have libgtk-3.so.0.0.0.
This commit is contained in:
Matthias Clasen
2011-02-10 14:41:02 -05:00
parent c7d41ac54f
commit 524ce69bcb
32 changed files with 130 additions and 125 deletions

View File

@ -13,8 +13,8 @@ INCLUDES = \
LDADDS = \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.la \
$(top_builddir)/gtk/libgtk-3.la \
$(GTK_DEP_LIBS)
enginedir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/engines

View File

@ -12,9 +12,9 @@ INCLUDES = \
$(GTK_DEP_CFLAGS)
LDADDS = \
$(GTK_DEP_LIBS) \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.0.la
$(GTK_DEP_LIBS) \
$(top_builddir)/gdk/libgdk-3.la \
$(top_builddir)/gtk/libgtk-3.la
enginedir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/engines

View File

@ -17,10 +17,10 @@ INCLUDES = \
$(INCLUDED_IMMODULE_DEFINE)
DEPS = \
$(top_builddir)/gtk/libgtk-3.0.la
$(top_builddir)/gtk/libgtk-3.la
LDADDS = \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(GTK_DEP_LIBS)
moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules

View File

@ -141,8 +141,8 @@ libgail_la_CFLAGS = \
$(AM_CFLAGS)
libgail_la_LIBADD = \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/modules/other/gail/libgail-util/libgailutil-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/modules/other/gail/libgail-util/libgailutil-3.la \
$(GTK_DEP_LIBS) \
$(INTLLIBS)

View File

@ -29,7 +29,7 @@ uninstall-ms-lib:
endif
lib_LTLIBRARIES = libgailutil-3.0.la
lib_LTLIBRARIES = libgailutil-3.la
util_c_sources = \
gailmisc.c \
@ -42,13 +42,13 @@ util_public_h_sources = \
gailtextutil.h \
gail-util.h
libgailutil_3_0_la_SOURCES = \
libgailutil_3_la_SOURCES = \
$(util_c_sources)
libgailutilinclude_HEADERS = \
$(util_public_h_sources)
libgailutil_3_0_la_CPPFLAGS = \
libgailutil_3_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
@ -58,23 +58,23 @@ libgailutil_3_0_la_CPPFLAGS = \
-DGDK_DISABLE_DEPRECATED\
-DGTK_DISABLE_DEPRECATED
libgailutil_3_0_la_CFLAGS = \
libgailutil_3_la_CFLAGS = \
$(GTK_DEP_CFLAGS) \
$(GTK_DEBUG_FLAGS) \
$(AM_CFLAGS)
libgailutil_3_0_la_LIBADD = \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
libgailutil_3_la_LIBADD = \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS)
libgailutil_3_0_la_LDFLAGS = \
libgailutil_3_la_LDFLAGS = \
-version-info $(GAIL_LT_VERSION_INFO) \
$(no_undefined) \
$(export_symbols) \
$(LDFLAGS)
gailutil.lib: libgailutil-3.0.la gailutil.def
gailutil.lib: libgailutil-3.la gailutil.def
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-3.0-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
install-data-local: install-ms-lib install-def-file

View File

@ -56,7 +56,7 @@ libferret_la_LDFLAGS = \
$(LDFLAGS)
libferret_la_LIBADD = \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(GTK_DEP_LIBS) \
$(GAIL_INET_LIBS)
endif
@ -66,8 +66,8 @@ libtestaction_la_SOURCES = \
libtestaction_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -78,8 +78,8 @@ libtestbutton_la_SOURCES = \
libtestbutton_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -90,8 +90,8 @@ libtestcombo_la_SOURCES = \
libtestcombo_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -100,8 +100,8 @@ libtestcomponent_la_SOURCES = \
libtestcomponent_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -110,8 +110,8 @@ libtestimage_la_SOURCES = \
libtestimage_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -122,8 +122,8 @@ libtestmenuitem_la_SOURCES = \
libtestmenuitem_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -134,8 +134,8 @@ libtestnotebook_la_SOURCES = \
libtestnotebook_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -146,8 +146,8 @@ libtestobject_la_SOURCES = \
libtestobject_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -158,8 +158,8 @@ libtestpaned_la_SOURCES = \
libtestpaned_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -170,8 +170,8 @@ libtestprops_la_SOURCES = \
libtestprops_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -180,8 +180,8 @@ libtestselection_la_SOURCES = \
libtestselection_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -190,8 +190,8 @@ libteststatusbar_la_SOURCES = \
libteststatusbar_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -204,8 +204,8 @@ libtesttable_la_SOURCES = \
libtesttable_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -218,8 +218,8 @@ libtesttext_la_SOURCES = \
libtesttext_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -230,8 +230,8 @@ libtesttoplevel_la_SOURCES = \
libtesttoplevel_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -242,8 +242,8 @@ libtesttreetable_la_SOURCES = \
libtesttreetable_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@ -252,8 +252,8 @@ libtestvalues_la_SOURCES = \
libtestvalues_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(LDFLAGS)

View File

@ -16,7 +16,7 @@ INCLUDES = \
$(GTK_DEBUG_FLAGS)
LDADDS = \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(GTK_DEP_LIBS)
backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends

View File

@ -28,7 +28,7 @@ libprintbackend_file_la_LDFLAGS = \
-avoid-version -module $(no_undefined)
libprintbackend_file_la_LIBADD = \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(GTK_DEP_LIBS)
noinst_HEADERS = \

View File

@ -15,7 +15,7 @@ INCLUDES = \
$(GTK_DEBUG_FLAGS)
LDADDS = \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(GTK_DEP_LIBS)
backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends

View File

@ -13,7 +13,7 @@ INCLUDES = \
$(GTK_DEBUG_FLAGS)
LDADDS = \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(GTK_DEP_LIBS)
backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends

View File

@ -28,7 +28,7 @@ libprintbackend_test_la_LDFLAGS = \
-avoid-version -module $(no_undefined)
libprintbackend_test_la_LIBADD = \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/gtk/libgtk-3.la \
$(GTK_DEP_LIBS)
noinst_HEADERS = \