Commit 524ce69b authored by Matthias Clasen's avatar Matthias Clasen
Browse files

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.
parent c7d41ac5
...@@ -39,3 +39,8 @@ Release notes for 3.0 ...@@ -39,3 +39,8 @@ Release notes for 3.0
Or online at: Or online at:
http://library.gnome.org/devel/gtk/3.0/migrating.html http://library.gnome.org/devel/gtk/3.0/migrating.html
* Note that the library sonames in this release have been changed from
libgtk-3.0 and libgdk-3.0 to libgtk-3 and libgdk-3, to prevent the
library versions from going backwards, compared to the 2.90/91/99
releases. Applications will have to be recompiled.
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
# if backwards compatibility has been broken, # if backwards compatibility has been broken,
# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0. # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
m4_define([gtk_major_version], [2]) m4_define([gtk_major_version], [3])
m4_define([gtk_minor_version], [99]) m4_define([gtk_minor_version], [0])
m4_define([gtk_micro_version], [4]) m4_define([gtk_micro_version], [0])
m4_define([gtk_interface_age], [0]) m4_define([gtk_interface_age], [0])
m4_define([gtk_binary_age], m4_define([gtk_binary_age],
[m4_eval(100 * gtk_minor_version + gtk_micro_version)]) [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
......
...@@ -12,11 +12,11 @@ INCLUDES = \ ...@@ -12,11 +12,11 @@ INCLUDES = \
$(GTK_DEP_CFLAGS) $(GTK_DEP_CFLAGS)
DEPS = \ DEPS = \
$(top_builddir)/gtk/libgtk-3.0.la $(top_builddir)/gtk/libgtk-3.la
LDADDS = \ LDADDS = \
$(top_builddir)/gtk/libgtk-3.0.la \ $(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.0.la \ $(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(MATH_LIB) $(MATH_LIB)
......
...@@ -55,11 +55,11 @@ INCLUDES = \ ...@@ -55,11 +55,11 @@ INCLUDES = \
$(GTK_DEP_CFLAGS) $(GTK_DEP_CFLAGS)
DEPS = \ DEPS = \
$(top_builddir)/gtk/libgtk-3.0.la $(top_builddir)/gtk/libgtk-3.la
LDADDS = \ LDADDS = \
$(top_builddir)/gtk/libgtk-3.0.la \ $(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.0.la \ $(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
-lm -lm
......
...@@ -44,7 +44,7 @@ INCLUDES = \ ...@@ -44,7 +44,7 @@ INCLUDES = \
$(GTK_DEBUG_FLAGS) \ $(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS) $(GDK_DEP_CFLAGS)
GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.0.la $(GDK_DEP_LIBS) GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.la $(GDK_DEP_LIBS)
# Extra options to supply to gtkdoc-mkdb # Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk
......
...@@ -106,7 +106,7 @@ CPPFLAGS += \ ...@@ -106,7 +106,7 @@ CPPFLAGS += \
-UGTK_DISABLE_SINGLE_INCLUDES -UGTK_DISABLE_SINGLE_INCLUDES
GTKDOC_LIBS = \ GTKDOC_LIBS = \
$(top_builddir)/gtk/libgtk-3.0.la \ $(top_builddir)/gtk/libgtk-3.la \
$(GTK_DEP_LIBS) $(GTK_DEP_LIBS)
......
...@@ -9,13 +9,13 @@ INCLUDES = \ ...@@ -9,13 +9,13 @@ INCLUDES = \
$(GTK_DEP_CFLAGS) $(GTK_DEP_CFLAGS)
DEPS = \ DEPS = \
$(top_builddir)/gtk/libgtk-3.0.la $(top_builddir)/gtk/libgtk-3.la
LDADDS = \ LDADDS = \
$(top_builddir)/gtk/libgtk-3.0.la \ $(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.0.la \ $(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(GDK_DEP_LIBS) \ $(GDK_DEP_LIBS) \
-lm -lm
if USE_X11 if USE_X11
......
...@@ -45,11 +45,11 @@ INCLUDES = \ ...@@ -45,11 +45,11 @@ INCLUDES = \
$(GTK_DEP_CFLAGS) $(GTK_DEP_CFLAGS)
LDADD = \ LDADD = \
$(top_builddir)/gtk/libgtk-3.0.la \ $(top_builddir)/gtk/libgtk-3.la \
$(GTK_DEP_LIBS) $(GTK_DEP_LIBS)
drawing_LDADD = $(LDADD) \ drawing_LDADD = $(LDADD) \
$(top_builddir)/gdk/libgdk-3.0.la $(top_builddir)/gdk/libgdk-3.la
noinst_PROGRAMS = \ noinst_PROGRAMS = \
hello-world \ hello-world \
......
...@@ -6,6 +6,6 @@ includedir=@includedir@ ...@@ -6,6 +6,6 @@ includedir=@includedir@
Name: Gail Name: Gail
Description: GNOME Accessibility Implementation Library Description: GNOME Accessibility Implementation Library
Version: @VERSION@ Version: @VERSION@
Requires: atk gtk+-3. Requires: atk gtk+-3.0
Libs: ${pc_top_builddir}/${pcfiledir}/modules/other/gail/libgail.la ${pc_top_builddir}/${pcfiledir}/modules/other/gail/libgail-util/libgailutil.la Libs: ${pc_top_builddir}/${pcfiledir}/modules/other/gail/libgail.la ${pc_top_builddir}/${pcfiledir}/modules/other/gail/libgail-util/libgailutil.la
Cflags: -I${pc_top_builddir}/${pcfiledir}/modules/other/gail Cflags: -I${pc_top_builddir}/${pcfiledir}/modules/other/gail
...@@ -7,5 +7,5 @@ Name: Gail ...@@ -7,5 +7,5 @@ Name: Gail
Description: GNOME Accessibility Implementation Library Description: GNOME Accessibility Implementation Library
Version: @VERSION@ Version: @VERSION@
Requires: atk gtk+-3.0 Requires: atk gtk+-3.0
Libs: -L${libdir} -lgailutil-3.0 Libs: -L${libdir} -lgailutil-3
Cflags: -I${includedir}/gail-3.0 Cflags: -I${includedir}/gail-3.0
...@@ -8,5 +8,5 @@ Name: GDK ...@@ -8,5 +8,5 @@ Name: GDK
Description: GTK+ Drawing Kit Description: GTK+ Drawing Kit
Version: @VERSION@ Version: @VERSION@
Requires: @GDK_PACKAGES@ Requires: @GDK_PACKAGES@
Libs: -L${libdir} -lgdk-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@ Libs: -L${libdir} -lgdk-3 @GDK_EXTRA_LIBS@
Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GDK_EXTRA_CFLAGS@ Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GDK_EXTRA_CFLAGS@
...@@ -157,23 +157,23 @@ common_sources = \ ...@@ -157,23 +157,23 @@ common_sources = \
gdkmarshalers.c \ gdkmarshalers.c \
gdkmarshalers.h gdkmarshalers.h
libgdk_3_0_la_SOURCES = $(common_sources) libgdk_3_la_SOURCES = $(common_sources)
libgdk_3_0_la_LIBADD = $(GDK_DEP_LIBS) libgdk_3_la_LIBADD = $(GDK_DEP_LIBS)
libgdk_3_0_la_LDFLAGS = $(LDADD) libgdk_3_la_LDFLAGS = $(LDADD)
if USE_X11 if USE_X11
libgdk_3_0_la_LIBADD += x11/libgdk-x11.la libgdk_3_la_LIBADD += x11/libgdk-x11.la
endif # USE_X11 endif # USE_X11
if USE_QUARTZ if USE_QUARTZ
libgdk_3_0_la_LIBADD += quartz/libgdk-quartz.la libgdk_3_la_LIBADD += quartz/libgdk-quartz.la
endif # USE_QUARTZ endif # USE_QUARTZ
if USE_WIN32 if USE_WIN32
libgdk_3_0_la_SOURCES += gdkkeynames.c libgdk_3_la_SOURCES += gdkkeynames.c
libgdk_3_0_la_LIBADD += win32/libgdk-win32.la libgdk_3_la_LIBADD += win32/libgdk-win32.la
libgdk_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
libgdk_3_0_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
endif # USE_WIN32 endif # USE_WIN32
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
...@@ -184,11 +184,11 @@ introspection_files = \ ...@@ -184,11 +184,11 @@ introspection_files = \
gdkenumtypes.c \ gdkenumtypes.c \
gdkenumtypes.h gdkenumtypes.h
Gdk-3.0.gir: libgdk-3.0.la Makefile Gdk-3.0.gir: libgdk-3.la Makefile
Gdk_3_0_gir_SCANNERFLAGS = \ Gdk_3_0_gir_SCANNERFLAGS = \
--c-include="gdk/gdk.h" --c-include="gdk/gdk.h"
Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0 Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
Gdk_3_0_gir_LIBS = libgdk-3.0.la Gdk_3_0_gir_LIBS = libgdk-3.la
Gdk_3_0_gir_FILES = $(introspection_files) Gdk_3_0_gir_FILES = $(introspection_files)
Gdk_3_0_gir_CFLAGS = $(INCLUDES) Gdk_3_0_gir_CFLAGS = $(INCLUDES)
Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0 Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
...@@ -235,13 +235,13 @@ x11_introspection_files = \ ...@@ -235,13 +235,13 @@ x11_introspection_files = \
x11/gdkx11visual.h \ x11/gdkx11visual.h \
x11/gdkx11window.h x11/gdkx11window.h
GdkX11-3.0.gir: libgdk-3.0.la Gdk-3.0.gir Makefile GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
GdkX11_3_0_gir_SCANNERFLAGS = \ GdkX11_3_0_gir_SCANNERFLAGS = \
--identifier-prefix=Gdk \ --identifier-prefix=Gdk \
--c-include="gdk/gdkx.h" \ --c-include="gdk/gdkx.h" \
--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
GdkX11_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0 GdkX11_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
GdkX11_3_0_gir_LIBS = libgdk-3.0.la GdkX11_3_0_gir_LIBS = libgdk-3.la
GdkX11_3_0_gir_FILES = $(x11_introspection_files) GdkX11_3_0_gir_FILES = $(x11_introspection_files)
GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0 GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0
...@@ -297,7 +297,7 @@ if OS_LINUX ...@@ -297,7 +297,7 @@ if OS_LINUX
TESTS = abicheck.sh TESTS = abicheck.sh
endif endif
lib_LTLIBRARIES = libgdk-3.0.la lib_LTLIBRARIES = libgdk-3.la
MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
EXTRA_DIST += $(gdk_built_sources) EXTRA_DIST += $(gdk_built_sources)
...@@ -305,7 +305,7 @@ EXTRA_HEADERS = ...@@ -305,7 +305,7 @@ EXTRA_HEADERS =
install-exec-hook: install-exec-hook:
if DISABLE_EXPLICIT_DEPS if DISABLE_EXPLICIT_DEPS
$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.0.la $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.la
endif endif
#note: not gdkconfig.h #note: not gdkconfig.h
...@@ -349,7 +349,7 @@ stamp-gc-h: $(top_builddir)/config.status ...@@ -349,7 +349,7 @@ stamp-gc-h: $(top_builddir)/config.status
dist-hook: ../build/win32/vs9/gdk.vcproj dist-hook: ../build/win32/vs9/gdk.vcproj
../build/win32/vs9/gdk.vcproj: ../build/win32/vs9/gdk.vcprojin ../build/win32/vs9/gdk.vcproj: ../build/win32/vs9/gdk.vcprojin
for F in $(libgdk_3_0_la_SOURCES); do \ for F in $(libgdk_3_la_SOURCES); do \
case $$F in \ case $$F in \
*.c) echo ' <File RelativePath="..\..\..\gdk\'$$F'" />' \ *.c) echo ' <File RelativePath="..\..\..\gdk\'$$F'" />' \
;; \ ;; \
......
#! /bin/sh #! /bin/sh
cpp -P -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi cpp -P -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
nm -D -g --defined-only .libs/libgdk-3.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi nm -D -g --defined-only .libs/libgdk-3.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
diff -u expected-abi actual-abi && rm -f expected-abi actual-abi diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
...@@ -12,7 +12,7 @@ AM_CPPFLAGS = \ ...@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
progs_ldadd = \ progs_ldadd = \
$(GDK_DEP_LIBS) \ $(GDK_DEP_LIBS) \
$(top_builddir)/gdk/libgdk-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/libgdk-3.la \
$(NULL) $(NULL)
#TEST_PROGS += check-gdk-cairo #TEST_PROGS += check-gdk-cairo
......
...@@ -6,5 +6,5 @@ Name: GTK+ Uninstalled ...@@ -6,5 +6,5 @@ Name: GTK+ Uninstalled
Description: GTK+ Graphical UI Library (${target} target), Not Installed Description: GTK+ Graphical UI Library (${target} target), Not Installed
Version: @VERSION@ Version: @VERSION@
Requires: gdk-@GTK_API_VERSION@-uninstalled @GTK_PACKAGES@ Requires: gdk-@GTK_API_VERSION@-uninstalled @GTK_PACKAGES@
Libs: ${pc_top_builddir}/${pcfiledir}/gtk/libgtk-@GTK_API_VERSION@.la @GTK_EXTRA_LIBS@ Libs: ${pc_top_builddir}/${pcfiledir}/gtk/libgtk-3.la @GTK_EXTRA_LIBS@
Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GTK_EXTRA_CFLAGS@ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GTK_EXTRA_CFLAGS@
...@@ -11,5 +11,5 @@ Name: GTK+ ...@@ -11,5 +11,5 @@ Name: GTK+
Description: GTK+ Graphical UI Library Description: GTK+ Graphical UI Library
Version: @VERSION@ Version: @VERSION@
Requires: gdk-@GTK_API_VERSION@ @GTK_PACKAGES@ Requires: gdk-@GTK_API_VERSION@ @GTK_PACKAGES@
Libs: -L${libdir} -lgtk-@GTK_API_VERSION@ @GTK_EXTRA_LIBS@ Libs: -L${libdir} -lgtk-3 @GTK_EXTRA_LIBS@
Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@ -DGSEAL_ENABLE Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@ -DGSEAL_ENABLE
...@@ -108,7 +108,7 @@ endif ...@@ -108,7 +108,7 @@ endif
libgtkincludedir = $(includedir)/gtk-3.0/gtk libgtkincludedir = $(includedir)/gtk-3.0/gtk
libadd = \ libadd = \
$(top_builddir)/gdk/libgdk-3.0.la \ $(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) $(GTK_DEP_LIBS)
deps = deps =
...@@ -879,7 +879,7 @@ gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h $(top_srcdir)/gtk/*.h $(top_sr ...@@ -879,7 +879,7 @@ gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h $(top_srcdir)/gtk/*.h $(top_sr
gtktestutils.c: gtktypefuncs.c gtktestutils.c: gtktypefuncs.c
# target platform: # target platform:
lib_LTLIBRARIES = libgtk-3.0.la lib_LTLIBRARIES = libgtk-3.la
gtkincludedir = $(includedir)/gtk-3.0/gtk gtkincludedir = $(includedir)/gtk-3.0/gtk
gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
...@@ -887,22 +887,22 @@ gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk ...@@ -887,22 +887,22 @@ gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk
gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources) gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
libgtk_3_0_la_SOURCES = $(gtk_c_sources) libgtk_3_la_SOURCES = $(gtk_c_sources)
libgtk_3_0_la_LDFLAGS = $(libtool_opts) libgtk_3_la_LDFLAGS = $(libtool_opts)
libgtk_3_0_la_LIBADD = $(libadd) libgtk_3_la_LIBADD = $(libadd)
libgtk_3_0_la_DEPENDENCIES = $(deps) libgtk_3_la_DEPENDENCIES = $(deps)
#libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid #libgtk_win32_3_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
if USE_WIN32 if USE_WIN32
libgtk_3_0_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid
libgtk_3_0_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps) libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
endif endif
install-exec-hook: install-exec-hook:
if DISABLE_EXPLICIT_DEPS if DISABLE_EXPLICIT_DEPS
$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.0.la $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.la
endif endif
if USE_QUARTZ if USE_QUARTZ
...@@ -949,13 +949,13 @@ distclean-local: ...@@ -949,13 +949,13 @@ distclean-local:
rm -f $(MAINTAINERCLEANFILES); \ rm -f $(MAINTAINERCLEANFILES); \
fi fi
DEPS = libgtk-3.0.la $(top_builddir)/gdk/libgdk-3.0.la DEPS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
TEST_DEPS = $(DEPS) immodules.cache TEST_DEPS = $(DEPS) immodules.cache
LDADDS = \ LDADDS = \
libgtk-3.0.la \ libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.0.la \ $(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) $(GTK_DEP_LIBS)
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
...@@ -966,7 +966,7 @@ introspection_files = \ ...@@ -966,7 +966,7 @@ introspection_files = \
gtktypebuiltins.h \ gtktypebuiltins.h \
gtktypebuiltins.c gtktypebuiltins.c
Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.0.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
Gtk_3_0_gir_SCANNERFLAGS = \ Gtk_3_0_gir_SCANNERFLAGS = \
--add-include-path=$(top_builddir)/gdk \ --add-include-path=$(top_builddir)/gdk \
--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
...@@ -980,7 +980,7 @@ Gtk_3_0_gir_CFLAGS = \ ...@@ -980,7 +980,7 @@ Gtk_3_0_gir_CFLAGS = \
-UGDK_DISABLE_DEPRECATED \ -UGDK_DISABLE_DEPRECATED \
-UGTK_DISABLE_DEPRECATED \ -UGTK_DISABLE_DEPRECATED \
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
Gtk_3_0_gir_LIBS = libgtk-3.0.la Gtk_3_0_gir_LIBS = libgtk-3.la
Gtk_3_0_gir_FILES = $(introspection_files) Gtk_3_0_gir_FILES = $(introspection_files)
Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0 Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0
INTROSPECTION_GIRS += Gtk-3.0.gir INTROSPECTION_GIRS += Gtk-3.0.gir
......
#! /bin/sh #! /bin/sh
cpp -P -DG_OS_UNIX -DGDK_WINDOWING_X11 ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi cpp -P -DG_OS_UNIX -DGDK_WINDOWING_X11 ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
nm -D -g --defined-only .libs/libgtk-3.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi nm -D -g --defined-only .libs/libgtk-3.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
diff -u expected-abi actual-abi && rm -f expected-abi actual-abi diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
...@@ -11,11 +11,11 @@ INCLUDES = \ ...@@ -11,11 +11,11 @@ INCLUDES = \
$(GTK_DEP_CFLAGS) $(GTK_DEP_CFLAGS)
DEPS = \ DEPS = \
$(top_builddir)/gtk/libgtk-3.0.la $(top_builddir)/gtk/libgtk-3.la
progs_ldadd = \ progs_ldadd = \
$(top_builddir)/gtk/libgtk-3.0.la \ $(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.0.la \ $(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) $(GTK_DEP_LIBS)
noinst_PROGRAMS = $(TEST_PROGS) noinst_PROGRAMS = $(TEST_PROGS)
......
...@@ -13,8 +13,8 @@ INCLUDES = \ ...@@ -13,8 +13,8 @@ INCLUDES = \
LDADDS = \ LDADDS = \
$(top_builddir)/gdk/libgdk-3.0.la \ $(top_builddir)/gdk/libgdk-3.la \
$(top_builddir)/gtk/libgtk-3.0.la \ $(top_builddir)/gtk/libgtk-3.la \
$(GTK_DEP_LIBS) $(GTK_DEP_LIBS)
enginedir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/engines enginedir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/engines
......
...@@ -12,9 +12,9 @@ INCLUDES = \ ...@@ -12,9 +12,9 @@ INCLUDES = \
$(GTK_DEP_CFLAGS) $(GTK_DEP_CFLAGS)
LDADDS = \ LDADDS = \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(top_builddir)/gdk/libgdk-3.0.la \ $(top_builddir)/gdk/libgdk-3.la \
$(top_builddir)/gtk/libgtk-3.0.la $(top_builddir)/gtk/libgtk-3.la
enginedir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/engines enginedir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/engines
......
...@@ -17,10 +17,10 @@ INCLUDES = \ ...@@ -17,10 +17,10 @@ INCLUDES = \
$(INCLUDED_IMMODULE_DEFINE) $(INCLUDED_IMMODULE_DEFINE)
DEPS = \ DEPS = \
$(top_builddir)/gtk/libgtk-3.0.la $(top_builddir)/gtk/libgtk-3.la
LDADDS = \ LDADDS = \
$(top_builddir)/gtk/libgtk-3.0.la \ $(top_builddir)/gtk/libgtk-3.la \
$(GTK_DEP_LIBS) $(GTK_DEP_LIBS)
moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules
......
...@@ -141,8 +141,8 @@ libgail_la_CFLAGS = \ ...@@ -141,8 +141,8 @@ libgail_la_CFLAGS = \
$(AM_CFLAGS) $(AM_CFLAGS)
libgail_la_LIBADD = \ libgail_la_LIBADD = \
$(top_builddir)/gtk/libgtk-3.0.la \ $(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/modules/other/gail/libgail-util/libgailutil-3.0.la \ $(top_builddir)/modules/other/gail/libgail-util/libgailutil-3.la \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(INTLLIBS) $(INTLLIBS)
......
...@@ -29,7 +29,7 @@ uninstall-ms-lib: ...@@ -29,7 +29,7 @@ uninstall-ms-lib:
endif endif
lib_LTLIBRARIES = libgailutil-3.0.la lib_LTLIBRARIES = libgailutil-3.la
util_c_sources = \ util_c_sources = \
gailmisc.c \ gailmisc.c \
...@@ -42,13 +42,13 @@ util_public_h_sources = \ ...@@ -42,13 +42,13 @@ util_public_h_sources = \
gailtextutil.h \ gailtextutil.h \
gail-util.h gail-util.h
libgailutil_3_0_la_SOURCES = \ libgailutil_3_la_SOURCES = \
$(util_c_sources) $(util_c_sources)
libgailutilinclude_HEADERS = \ libgailutilinclude_HEADERS = \
$(util_public_h_sources) $(util_public_h_sources)
libgailutil_3_0_la_CPPFLAGS = \ libgailutil_3_la_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
...@@ -58,23 +58,23 @@ libgailutil_3_0_la_CPPFLAGS = \ ...@@ -58,23 +58,23 @@ libgailutil_3_0_la_CPPFLAGS = \
-DGDK_DISABLE_DEPRECATED\ -DGDK_DISABLE_DEPRECATED\
-DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
libgailutil_3_0_la_CFLAGS = \ libgailutil_3_la_CFLAGS = \
$(GTK_DEP_CFLAGS) \ $(GTK_DEP_CFLAGS) \
$(GTK_DEBUG_FLAGS) \ $(GTK_DEBUG_FLAGS) \
$(AM_CFLAGS)