[gtk+] Rename Makefile references from 3.0 to 4.0
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Rename Makefile references from 3.0 to 4.0
- Date: Fri, 7 Oct 2016 14:35:30 +0000 (UTC)
commit d053d5c58fedaac652bd059a9be53fb135f89fab
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Oct 5 15:38:34 2016 -0400
Rename Makefile references from 3.0 to 4.0
This is almost certainly incomplete.
Needs careful scrutiny
docs/tools/Makefile.am | 6 +-
examples/Makefile.am | 4 +-
examples/application1/Makefile.am | 4 +-
examples/application10/Makefile.am | 4 +-
examples/application2/Makefile.am | 4 +-
examples/application3/Makefile.am | 4 +-
examples/application4/Makefile.am | 4 +-
examples/application5/Makefile.am | 4 +-
examples/application6/Makefile.am | 4 +-
examples/application7/Makefile.am | 4 +-
examples/application8/Makefile.am | 4 +-
examples/application9/Makefile.am | 4 +-
examples/bp/Makefile.am | 4 +-
gdk/Makefile.am | 144 +++++++++++++-------------
gdk/broadway/Makefile.am | 4 +-
gdk/mir/Makefile.am | 4 +-
gdk/quartz/Makefile.am | 4 +-
gdk/wayland/Makefile.am | 4 +-
gdk/win32/Makefile.am | 4 +-
gdk/x11/Makefile.am | 4 +-
gtk/Makefile.am | 128 ++++++++++++------------
libgail-util/Makefile.am | 36 +++---
modules/input/Makefile.am | 22 ++--
modules/printbackends/cloudprint/Makefile.am | 4 +-
modules/printbackends/cups/Makefile.am | 4 +-
modules/printbackends/file/Makefile.am | 4 +-
modules/printbackends/lpr/Makefile.am | 4 +-
modules/printbackends/papi/Makefile.am | 4 +-
modules/printbackends/test/Makefile.am | 4 +-
tests/Makefile.am | 6 +-
tests/visuals/Makefile.am | 6 +-
testsuite/a11y/Makefile.am | 4 +-
testsuite/a11y/state/Makefile.am | 4 +-
testsuite/css/Makefile.am | 4 +-
testsuite/css/nodes/Makefile.am | 4 +-
testsuite/css/parser/Makefile.am | 4 +-
testsuite/css/style/Makefile.am | 4 +-
testsuite/gdk/Makefile.am | 2 +-
testsuite/gtk/Makefile.am | 6 +-
testsuite/reftests/Makefile.am | 8 +-
40 files changed, 242 insertions(+), 242 deletions(-)
---
diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index 6a6d70f..1a701ab 100644
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -10,11 +10,11 @@ AM_CPPFLAGS = \
$(GTK_DEP_CFLAGS)
DEPS = \
- $(top_builddir)/gtk/libgtk-3.la
+ $(top_builddir)/gtk/libgtk-4.la
LDADDS = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(top_builddir)/tests/gtkgears.o \
$(GTK_DEP_LIBS) \
$(GDK_DEP_LIBS) \
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 710d4a3..31abbc3 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -15,8 +15,8 @@ AM_CPPFLAGS = \
$(GTK_DEP_CFLAGS)
LDADD = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
noinst_PROGRAMS = \
diff --git a/examples/application1/Makefile.am b/examples/application1/Makefile.am
index 114e204..1dc66df 100644
--- a/examples/application1/Makefile.am
+++ b/examples/application1/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS = \
$(GTK_DEP_CFLAGS)
GTK_LIBS = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
diff --git a/examples/application10/Makefile.am b/examples/application10/Makefile.am
index 5db1037..791335b 100644
--- a/examples/application10/Makefile.am
+++ b/examples/application10/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS = \
$(GTK_DEP_CFLAGS)
GTK_LIBS = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
diff --git a/examples/application2/Makefile.am b/examples/application2/Makefile.am
index 0ecba8a..950b43e 100644
--- a/examples/application2/Makefile.am
+++ b/examples/application2/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS = \
$(GTK_DEP_CFLAGS)
GTK_LIBS = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
diff --git a/examples/application3/Makefile.am b/examples/application3/Makefile.am
index 0ecba8a..950b43e 100644
--- a/examples/application3/Makefile.am
+++ b/examples/application3/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS = \
$(GTK_DEP_CFLAGS)
GTK_LIBS = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
diff --git a/examples/application4/Makefile.am b/examples/application4/Makefile.am
index c14a3cb..20c6b58 100644
--- a/examples/application4/Makefile.am
+++ b/examples/application4/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS = \
$(GTK_DEP_CFLAGS)
GTK_LIBS = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
diff --git a/examples/application5/Makefile.am b/examples/application5/Makefile.am
index 2b199f9..e5417b4 100644
--- a/examples/application5/Makefile.am
+++ b/examples/application5/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS = \
$(GTK_DEP_CFLAGS)
GTK_LIBS = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
diff --git a/examples/application6/Makefile.am b/examples/application6/Makefile.am
index b8cff5b..b8fa33c 100644
--- a/examples/application6/Makefile.am
+++ b/examples/application6/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS = \
$(GTK_DEP_CFLAGS)
GTK_LIBS = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
diff --git a/examples/application7/Makefile.am b/examples/application7/Makefile.am
index b8cff5b..b8fa33c 100644
--- a/examples/application7/Makefile.am
+++ b/examples/application7/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS = \
$(GTK_DEP_CFLAGS)
GTK_LIBS = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
diff --git a/examples/application8/Makefile.am b/examples/application8/Makefile.am
index 5db1037..791335b 100644
--- a/examples/application8/Makefile.am
+++ b/examples/application8/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS = \
$(GTK_DEP_CFLAGS)
GTK_LIBS = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
diff --git a/examples/application9/Makefile.am b/examples/application9/Makefile.am
index 5db1037..791335b 100644
--- a/examples/application9/Makefile.am
+++ b/examples/application9/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS = \
$(GTK_DEP_CFLAGS)
GTK_LIBS = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
diff --git a/examples/bp/Makefile.am b/examples/bp/Makefile.am
index d521715..72dff40 100644
--- a/examples/bp/Makefile.am
+++ b/examples/bp/Makefile.am
@@ -7,8 +7,8 @@ AM_CPPFLAGS = \
$(GTK_DEP_CFLAGS)
LDADD = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
noinst_PROGRAMS = bloatpad
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 052d487..e1b6d81 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -190,11 +190,11 @@ gdk_built_sources = \
# setup GDK sources and their dependencies
#
-gdkincludedir = $(includedir)/gtk-3.0/gdk
+gdkincludedir = $(includedir)/gtk-4.0/gdk
gdkinclude_HEADERS = $(gdk_public_h_sources)
nodist_gdkinclude_HEADERS = gdkconfig.h gdkenumtypes.h gdkversionmacros.h
-deprecatedincludedir = $(includedir)/gtk-3.0/gdk/deprecated
+deprecatedincludedir = $(includedir)/gtk-4.0/gdk/deprecated
deprecatedinclude_HEADERS = $(deprecated_h_sources)
common_sources = \
@@ -206,36 +206,36 @@ common_sources = \
gdkresources.h \
gdkresources.c
-libgdk_3_la_SOURCES = $(common_sources)
-libgdk_3_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
-libgdk_3_la_LIBADD = $(GDK_DEP_LIBS) $(SHM_LIBS)
-libgdk_3_la_LDFLAGS = $(LDADD)
+libgdk_4_la_SOURCES = $(common_sources)
+libgdk_4_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
+libgdk_4_la_LIBADD = $(GDK_DEP_LIBS) $(SHM_LIBS)
+libgdk_4_la_LDFLAGS = $(LDADD)
if USE_X11
-libgdk_3_la_LIBADD += x11/libgdk-x11.la
+libgdk_4_la_LIBADD += x11/libgdk-x11.la
endif # USE_X11
if USE_QUARTZ
-libgdk_3_la_CFLAGS += -xobjective-c
-libgdk_3_la_LIBADD += quartz/libgdk-quartz.la
+libgdk_4_la_CFLAGS += -xobjective-c
+libgdk_4_la_LIBADD += quartz/libgdk-quartz.la
endif # USE_QUARTZ
if USE_WIN32
-libgdk_3_la_LIBADD += win32/libgdk-win32.la
-libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
-libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
+libgdk_4_la_LIBADD += win32/libgdk-win32.la
+libgdk_4_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
+libgdk_4_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
endif # USE_WIN32
if USE_BROADWAY
-libgdk_3_la_LIBADD += broadway/libgdk-broadway.la
+libgdk_4_la_LIBADD += broadway/libgdk-broadway.la
endif # USE_BROADWAY
if USE_WAYLAND
-libgdk_3_la_LIBADD += wayland/libgdk-wayland.la
+libgdk_4_la_LIBADD += wayland/libgdk-wayland.la
endif
if USE_MIR
-libgdk_3_la_LIBADD += mir/libgdk-mir.la
+libgdk_4_la_LIBADD += mir/libgdk-mir.la
endif
if HAVE_INTROSPECTION
@@ -246,17 +246,17 @@ introspection_files = \
gdkenumtypes.c \
gdkenumtypes.h
-Gdk-3.0.gir: libgdk-3.la Makefile
-Gdk_3_0_gir_SCANNERFLAGS = \
+Gdk-4.0.gir: libgdk-4.la Makefile
+Gdk_4_0_gir_SCANNERFLAGS = \
--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_LIBS = libgdk-3.la
-Gdk_3_0_gir_FILES = $(introspection_files)
-Gdk_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
-Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
-INTROSPECTION_GIRS += Gdk-3.0.gir
+Gdk_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
+Gdk_4_0_gir_LIBS = libgdk-4.la
+Gdk_4_0_gir_FILES = $(introspection_files)
+Gdk_4_0_gir_CFLAGS = $(AM_CPPFLAGS)
+Gdk_4_0_gir_EXPORT_PACKAGES = gdk-4.0
+INTROSPECTION_GIRS += Gdk-4.0.gir
if OS_WIN32
-Gdk_3_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir)
+Gdk_4_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir)
endif
if USE_X11
x11_introspection_files = \
@@ -306,17 +306,17 @@ x11_introspection_files = \
x11/gdkx11visual.h \
x11/gdkx11window.h
-GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
-GdkX11_3_0_gir_SCANNERFLAGS = \
+GdkX11-4.0.gir: libgdk-4.la Gdk-4.0.gir Makefile
+GdkX11_4_0_gir_SCANNERFLAGS = \
--identifier-prefix=Gdk \
--c-include="gdk/gdkx.h" \
- --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_LIBS = libgdk-3.la
-GdkX11_3_0_gir_FILES = $(x11_introspection_files)
-GdkX11_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
-GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0
-INTROSPECTION_GIRS += GdkX11-3.0.gir
+ --include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir
+GdkX11_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
+GdkX11_4_0_gir_LIBS = libgdk-4.la
+GdkX11_4_0_gir_FILES = $(x11_introspection_files)
+GdkX11_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
+GdkX11_4_0_gir_EXPORT_PACKAGES = gdk-x11-4.0
+INTROSPECTION_GIRS += GdkX11-4.0.gir
endif # USE_X11
@@ -351,16 +351,16 @@ w32_introspection_files = \
win32/gdkwindow-win32.c
if OS_WIN32
-GdkWin32-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
-GdkWin32_3_0_gir_SCANNERFLAGS = \
+GdkWin32-4.0.gir: libgdk-3.la Gdk-4.0.gir Makefile
+GdkWin32_4_0_gir_SCANNERFLAGS = \
--identifier-prefix=Gdk \
--c-include="gdk/gdkwin32.h" \
- --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
-GdkWin32_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
-GdkWin32_3_0_gir_LIBS = libgdk-3.la
-GdkWin32_3_0_gir_FILES = $(w32_introspection_files)
-GdkWin32_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -I$(srcdir)/win32 -I$(srcdir)
-INTROSPECTION_GIRS += GdkWin32-3.0.gir
+ --include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir
+GdkWin32_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
+GdkWin32_4_0_gir_LIBS = libgdk-4.la
+GdkWin32_4_0_gir_FILES = $(w32_introspection_files)
+GdkWin32_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -I$(srcdir)/win32 -I$(srcdir)
+INTROSPECTION_GIRS += GdkWin32-4.0.gir
endif # OS_WIN32
@@ -375,15 +375,15 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
endif # HAVE_INTROSPECTION
if OS_WIN32
-gdk.def: libgdk-3.la
+gdk.def: libgdk-4.la
echo "LIBRARY libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@
echo "EXPORTS" >>$@
objdump -p .libs/libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e
's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
install-def-file: gdk.def
mkdir -p $(DESTDIR)$(libdir)
- $(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
+ $(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-4.0.def
uninstall-def-file:
- -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def
+ -rm $(DESTDIR)$(libdir)/gdk-win32-4.0.def
else
install-def-file:
uninstall-def-file:
@@ -392,7 +392,7 @@ endif
if MS_LIB_AVAILABLE
noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
-gdk-win32-$(GTK_API_VERSION).lib: libgdk-3.la gdk.def
+gdk-win32-$(GTK_API_VERSION).lib: libgdk-4.la gdk.def
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll
-def:gdk.def -out:$@
install-ms-lib:
@@ -406,7 +406,7 @@ install-ms-lib:
uninstall-ms-lib:
endif
-lib_LTLIBRARIES = libgdk-3.la
+lib_LTLIBRARIES = libgdk-4.la
MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
EXTRA_DIST += \
@@ -415,7 +415,7 @@ EXTRA_DIST += \
install-exec-hook:
if DISABLE_EXPLICIT_DEPS
- $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.la
+ $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-4.la
endif
BUILT_SOURCES = \
@@ -495,50 +495,50 @@ gdkresources.c: gdk.gresource.xml $(resource_files)
--sourcedir=$(srcdir) --c-name _gdk --generate-source --manual-register
# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gdk-3
+MSVCPROJS = gdk-4
-gdk_3_FILES = $(libgdk_3_la_SOURCES)
-gdk_3_EXCLUDES = dummy
-gdk_3_HEADERS_DIR = $(gdkincludedir)
+gdk_4_FILES = $(libgdk_4_la_SOURCES)
+gdk_4_EXCLUDES = dummy
+gdk_4_HEADERS_DIR = $(gdkincludedir)
-gdk_3_HEADERS_INST = \
+gdk_4_HEADERS_INST = \
$(gdkinclude_HEADERS) \
$(deprecatedinclude_HEADERS) \
$(nodist_gdkinclude_HEADERS)
-gdk_3_HEADERS_EXCLUDES = dummy
+gdk_4_HEADERS_EXCLUDES = dummy
include $(top_srcdir)/build/Makefile.msvcproj
if HAVE_INTROSPECTION
# Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Gdk-3.0.gir GdkWin32-3.0.gir
+MSVC_INTROSPECT_GIRS = Gdk-4.0.gir GdkWin32-4.0.gir
BASE_MSVC_GIR_CFLAGS = \
$(GDK_CFLAGS_DEFINES) \
-I../.. -I../../gdk -I.../../gdk/win32
INTROSPECTION_INTERMEDIATE_ITEMS = \
- $(top_builddir)/build/win32/Gdk-3.0.gir.msvc.introspect \
- $(top_builddir)/build/win32/Gdk_3_0_gir_list \
- $(top_builddir)/build/win32/GdkWin32-3.0.gir.msvc.introspect \
- $(top_builddir)/build/win32/GdkWin32_3_0_gir_list
-
-Gdk_3_0_gir_MSVC_FILES = $(introspection_files)
-Gdk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_3_0_gir_EXPORT_PACKAGES)
-Gdk_3_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_3_0_gir_INCLUDES)
-Gdk_3_0_gir_MSVC_LIBS = gdk-3.0
-Gdk_3_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-Gdk_3_0_gir_MSVC_SCANNERFLAGS = $(Gdk_3_0_gir_SCANNERFLAGS)
-
-GdkWin32_3_0_gir_MSVC_FILES = $(w32_introspection_files)
-GdkWin32_3_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_3_0_gir_INCLUDES)
-GdkWin32_3_0_gir_MSVC_LIBS = $(Gdk_3_0_gir_MSVC_LIBS)
-GdkWin32_3_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-GdkWin32_3_0_gir_MSVC_SCANNERFLAGS = \
+ $(top_builddir)/build/win32/Gdk-4.0.gir.msvc.introspect \
+ $(top_builddir)/build/win32/Gdk_4_0_gir_list \
+ $(top_builddir)/build/win32/GdkWin32-4.0.gir.msvc.introspect \
+ $(top_builddir)/build/win32/GdkWin32_4_0_gir_list
+
+Gdk_4_0_gir_MSVC_FILES = $(introspection_files)
+Gdk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_4_0_gir_EXPORT_PACKAGES)
+Gdk_4_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_4_0_gir_INCLUDES)
+Gdk_4_0_gir_MSVC_LIBS = gdk-4.0
+Gdk_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
+Gdk_4_0_gir_MSVC_SCANNERFLAGS = $(Gdk_4_0_gir_SCANNERFLAGS)
+
+GdkWin32_4_0_gir_MSVC_FILES = $(w32_introspection_files)
+GdkWin32_4_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_4_0_gir_INCLUDES)
+GdkWin32_4_0_gir_MSVC_LIBS = $(Gdk_4_0_gir_MSVC_LIBS)
+GdkWin32_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
+GdkWin32_4_0_gir_MSVC_SCANNERFLAGS = \
--identifier-prefix=Gdk \
--c-include="gdk/gdkwin32.h" \
- --include-uninstalled=./Gdk-3.0.gir
+ --include-uninstalled=./Gdk-4.0.gir
include $(top_srcdir)/build/Makefile.msvc-introspection
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index f1c3923..ff793a7 100644
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -2,8 +2,8 @@
include $(top_srcdir)/Makefile.decl
NULL =
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkbroadwayincludedir = $(includedir)/gtk-3.0/gdk/broadway
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkbroadwayincludedir = $(includedir)/gtk-4.0/gdk/broadway
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \
diff --git a/gdk/mir/Makefile.am b/gdk/mir/Makefile.am
index 71b6e37..654b8f9 100644
--- a/gdk/mir/Makefile.am
+++ b/gdk/mir/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkmirincludedir = $(includedir)/gtk-3.0/gdk/mir
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkmirincludedir = $(includedir)/gtk-4.0/gdk/mir
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \
diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index 18fdbd3..9bd34ef 100644
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -1,7 +1,7 @@
include $(top_srcdir)/Makefile.decl
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkquartzincludedir = $(includedir)/gtk-3.0/gdk/quartz
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkquartzincludedir = $(includedir)/gtk-4.0/gdk/quartz
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \
diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
index 5b2e64e..127e091 100644
--- a/gdk/wayland/Makefile.am
+++ b/gdk/wayland/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkwaylandincludedir = $(includedir)/gtk-3.0/gdk/wayland
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkwaylandincludedir = $(includedir)/gtk-4.0/gdk/wayland
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 991bf70..8d73e22 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkwin32includedir = $(includedir)/gtk-3.0/gdk/win32
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkwin32includedir = $(includedir)/gtk-4.0/gdk/win32
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 6289f3a..c233520 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkx11includedir = $(includedir)/gtk-3.0/gdk/x11
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkx11includedir = $(includedir)/gtk-4.0/gdk/x11
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 3b76b82..75bc6f5 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -48,7 +48,7 @@ gtk-win32.rc: gtk-win32.rc.body
cat $< >>$@
echo "ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST libgtk3.manifest" >>$@
-gtk.def: libgtk-3.la
+gtk.def: libgtk-4.la
echo "LIBRARY libgtk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@
echo "EXPORTS" >>$@
objdump -p .libs/libgtk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e
's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
@@ -79,11 +79,11 @@ uninstall-ms-lib:
endif
libadd = \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GMODULE_LIBS) \
$(GTK_DEP_LIBS)
deps = \
- $(top_builddir)/gdk/libgdk-3.la
+ $(top_builddir)/gdk/libgdk-4.la
# libtool stuff: set version and export symbols for resolving
# since automake doesn't support conditionalized libsomething_la_LDFLAGS
@@ -1081,7 +1081,7 @@ gtk_use_quartz_private_h_sources = \
gtkquartz.h
if USE_QUARTZ
gtk_c_sources += $(gtk_use_quartz_c_sources)
-libgtk_3_la_CFLAGS = "-xobjective-c"
+libgtk_4_la_CFLAGS = "-xobjective-c"
gtk_private_h_sources += $(gtk_use_quartz_private_h_sources)
endif
@@ -1390,43 +1390,43 @@ gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_src
gtktestutils.c: gtktypefuncs.c
# target platform:
-lib_LTLIBRARIES = libgtk-3.la
+lib_LTLIBRARIES = libgtk-4.la
-gtkincludedir = $(includedir)/gtk-3.0/gtk
+gtkincludedir = $(includedir)/gtk-4.0/gtk
gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources)
gtkversion.h
-a11yincludedir = $(includedir)/gtk-3.0/gtk/a11y
+a11yincludedir = $(includedir)/gtk-4.0/gtk/a11y
a11yinclude_HEADERS= $(a11y_h_sources)
-deprecatedincludedir = $(includedir)/gtk-3.0/gtk/deprecated
+deprecatedincludedir = $(includedir)/gtk-4.0/gtk/deprecated
deprecatedinclude_HEADERS= $(deprecated_h_sources)
-gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
+gtkunixprintincludedir = $(includedir)/gtk-4.0/unix-print/gtk
gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
-nodist_libgtk_3_la_SOURCES = $(nodist_gtk_c_sources)
-libgtk_3_la_SOURCES = $(gtk_c_sources)
-libgtk_3_la_LDFLAGS = $(libtool_opts)
-libgtk_3_la_LIBADD = $(libadd)
-libgtk_3_la_DEPENDENCIES = $(deps)
+nodist_libgtk_4_la_SOURCES = $(nodist_gtk_c_sources)
+libgtk_4_la_SOURCES = $(gtk_c_sources)
+libgtk_4_la_LDFLAGS = $(libtool_opts)
+libgtk_4_la_LIBADD = $(libadd)
+libgtk_4_la_DEPENDENCIES = $(deps)
if USE_WIN32
-libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
-libgtk_3_la_LDFLAGS += -Wl,-luuid $(gtk_win32_res_ldflag)
-libgtk_3_la_DEPENDENCIES += $(gtk_win32_res)
+libgtk_4_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+libgtk_4_la_LDFLAGS += -Wl,-luuid $(gtk_win32_res_ldflag)
+libgtk_4_la_DEPENDENCIES += $(gtk_win32_res)
endif
install-exec-hook:
if DISABLE_EXPLICIT_DEPS
- $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.la
+ $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-4.la
endif
if USE_QUARTZ
install-mac-key-theme:
- $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0
- $(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
+ $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0
+ $(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0/gtk-keys.css
uninstall-mac-key-theme:
- rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
+ rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0/gtk-keys.css
else
install-mac-key-theme:
uninstall-mac-key-theme:
@@ -1435,27 +1435,27 @@ endif
# ------------------- MSVC Build Items ----------------
MSVCPROJS = gtk-3
-gtk_3_FILES = \
+gtk_4_FILES = \
$(gtk_base_c_sources) \
$(gtk_os_win32_c_sources) \
$(gtk_use_win32_c_sources) \
$(gtk_dbus_built_sources)
-gtk_3_EXCLUDES = dummy
-gtk_3_HEADERS_DIR = $(gtkincludedir)
+gtk_4_EXCLUDES = dummy
+gtk_4_HEADERS_DIR = $(gtkincludedir)
-gtk_3_HEADERS_INST = \
+gtk_4_HEADERS_INST = \
$(gtkinclude_HEADERS) \
$(a11y_h_sources) \
$(deprecated_h_sources)
-gtk_3_HEADERS_EXCLUDES = dummy
+gtk_4_HEADERS_EXCLUDES = dummy
include $(top_srcdir)/build/Makefile.msvcproj
if HAVE_INTROSPECTION
# Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Gtk-3.0.gir
+MSVC_INTROSPECT_GIRS = Gtk-4.0.gir
GTK_MSVC_GIR_CFLAGS = \
$(GTK_BASE_CFLAGS_DEFINES) \
@@ -1480,21 +1480,21 @@ GTK_MSVC_GIR_CFLAGS = \
-I../.. -I../../gtk -I../../gdk
INTROSPECTION_INTERMEDIATE_ITEMS = \
- $(top_builddir)/build/win32/Gtk-3.0.gir.msvc.introspect \
- $(top_builddir)/build/win32/Gtk_3_0_gir_list
+ $(top_builddir)/build/win32/Gtk-4.0.gir.msvc.introspect \
+ $(top_builddir)/build/win32/Gtk-4_0_gir_list
-Gtk_3_0_gir_MSVC_FILES = \
+Gtk_4_0_gir_MSVC_FILES = \
$(introspected_pub_headers) \
$(gtk_base_c_sources) \
$(gtk_os_win32_c_sources) \
gtktypebuiltins.h \
gtktypebuiltins.c
-Gtk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gtk_3_0_gir_EXPORT_PACKAGES)
-Gtk_3_0_gir_MSVC_INCLUDE_GIRS = Atk-1.0
-Gtk_3_0_gir_MSVC_LIBS = gtk-3.0 gdk-3.0
-Gtk_3_0_gir_MSVC_CFLAGS = $(GTK_MSVC_GIR_CFLAGS)
-Gtk_3_0_gir_MSVC_SCANNERFLAGS = --warn-all --add-include-path=. --include-uninstalled=./Gdk-3.0.gir
+Gtk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gtk_4_0_gir_EXPORT_PACKAGES)
+Gtk_4_0_gir_MSVC_INCLUDE_GIRS = Atk-1.0
+Gtk_4_0_gir_MSVC_LIBS = gtk-4.0 gdk-4.0
+Gtk_4_0_gir_MSVC_CFLAGS = $(GTK_MSVC_GIR_CFLAGS)
+Gtk_4_0_gir_MSVC_SCANNERFLAGS = --warn-all --add-include-path=. --include-uninstalled=./Gdk-4.0.gir
include $(top_srcdir)/build/Makefile.msvc-introspection
@@ -1510,14 +1510,14 @@ dist-hook: \
# Install a RC file for the default GTK+ theme, and key themes
install-data-local: install-ms-lib install-def-file install-mac-key-theme
- $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
- $(INSTALL_DATA) $(srcdir)/gtk-keys.css.default
$(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
- $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
- $(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
+ $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-4.0
+ $(INSTALL_DATA) $(srcdir)/gtk-keys.css.default
$(DESTDIR)$(datadir)/themes/Default/gtk-4.0/gtk-keys.css
+ $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0
+ $(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0/gtk-keys.css
uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
- rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
- rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
+ rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-4.0/gtk-keys.css
+ rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0/gtk-keys.css
# if srcdir!=builddir, clean out maintainer-clean files from builddir
# this allows dist to pass.
@@ -1549,23 +1549,23 @@ INTROSPECTION_COMPILER_ARGS = \
--includedir=. \
--includedir=../gdk
-Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
-Gtk_3_0_gir_SCANNERFLAGS = \
+Gtk-4.0.gir: $(INTROSPECTION_SCANNER) libgtk-4.la $(top_builddir)/gdk/Gdk-4.0.gir Makefile
+Gtk_4_0_gir_SCANNERFLAGS = \
--warn-all \
--add-include-path=$(top_builddir)/gdk \
- --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
-Gtk_3_0_gir_INCLUDES = Atk-1.0
+ --include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir
+Gtk_4_0_gir_INCLUDES = Atk-1.0
if USE_X11
-Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
-Gtk_3_0_gir_INCLUDES += xlib-2.0
+Gtk_4_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
+Gtk_4_0_gir_INCLUDES += xlib-2.0
endif
-Gtk_3_0_gir_CFLAGS = \
+Gtk_4_0_gir_CFLAGS = \
$(AM_CPPFLAGS) \
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-Gtk_3_0_gir_FILES = $(introspection_files)
-Gtk_3_0_gir_LIBS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
-Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0
-INTROSPECTION_GIRS = Gtk-3.0.gir
+Gtk_4_0_gir_FILES = $(introspection_files)
+Gtk_4_0_gir_LIBS = libgtk-4.la $(top_builddir)/gdk/libgdk-4.la
+Gtk_4_0_gir_EXPORT_PACKAGES = gtk+-4.0
+INTROSPECTION_GIRS = Gtk-4.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
@@ -1580,17 +1580,17 @@ endif
# Installed tools
#
bin_PROGRAMS = \
- gtk-query-immodules-3.0 \
+ gtk-query-immodules-4.0 \
gtk-update-icon-cache \
gtk-encode-symbolic-svg \
gtk-builder-tool \
gtk-query-settings \
gtk-launch
-gtk_query_immodules_3_0_SOURCES = queryimmodules.c gtkutils.c
-gtk_query_immodules_3_0_LDADD = \
- libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+gtk_query_immodules_4_0_SOURCES = queryimmodules.c gtkutils.c
+gtk_query_immodules_4_0_LDADD = \
+ libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GMODULE_LIBS) \
$(GTK_DEP_LIBS)
@@ -1600,25 +1600,25 @@ gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
gtk_encode_symbolic_svg_LDADD = \
$(GDK_PIXBUF_LIBS) \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
gtk_builder_tool_SOURCES = gtk-builder-tool.c
gtk_builder_tool_LDADD = \
- libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
gtk_query_settings_SOURCES = gtk-query-settings.c
gtk_query_settings_LDADD= \
- libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
gtk_launch_SOURCES = gtk-launch.c
gtk_launch_LDADD = \
- libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
if OS_WIN32
diff --git a/libgail-util/Makefile.am b/libgail-util/Makefile.am
index 048fe33..c471e7a 100644
--- a/libgail-util/Makefile.am
+++ b/libgail-util/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
EXTRA_DIST += gailutil.def
if OS_WIN32
export_symbols = -export-symbols $(srcdir)/gailutil.def
-gailutil.def: libgailutil-3.la
+gailutil.def: libgailutil-4.la
echo "LIBRARY libgailutil-$(GTK_MAJOR_VERSION)-$(GAIL_LT_CURRENT_MINUS_AGE)" >$@
echo "EXPORTS" >>$@
objdump -p .libs/libgailutil-$(GTK_MAJOR_VERSION)-$(GAIL_LT_CURRENT_MINUS_AGE).dll | sed -n -e
's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
@@ -30,26 +30,26 @@ uninstall-ms-lib:
endif
-lib_LTLIBRARIES = libgailutil-3.la
+lib_LTLIBRARIES = libgailutil-4.la
util_c_sources = \
gailmisc.c \
gailtextutil.c
-libgailutilincludedir=$(includedir)/gail-3.0/libgail-util
+libgailutilincludedir=$(includedir)/gail-4.0/libgail-util
util_public_h_sources = \
gailmisc.h \
gailtextutil.h \
gail-util.h
-libgailutil_3_la_SOURCES = \
+libgailutil_4_la_SOURCES = \
$(util_c_sources)
libgailutilinclude_HEADERS = \
$(util_public_h_sources)
-libgailutil_3_la_CPPFLAGS = \
+libgailutil_4_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
@@ -59,39 +59,39 @@ libgailutil_3_la_CPPFLAGS = \
-DGDK_DISABLE_DEPRECATED\
-DGTK_DISABLE_DEPRECATED
-libgailutil_3_la_CFLAGS = \
+libgailutil_4_la_CFLAGS = \
$(GTK_DEP_CFLAGS) \
$(GTK_DEBUG_FLAGS) \
$(AM_CFLAGS)
-libgailutil_3_la_LIBADD = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+libgailutil_4_la_LIBADD = \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
-libgailutil_3_la_LDFLAGS = \
+libgailutil_4_la_LDFLAGS = \
-version-info $(GAIL_LT_VERSION_INFO) \
$(no_undefined) \
$(LDFLAGS)
-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:$@
+gailutil.lib: libgailutil-4.la gailutil.def
+ lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-4.0-$(GAIL_LT_CURRENT_MINUS_AGE).dll
-def:gailutil.def -out:$@
install-data-local: install-ms-lib install-def-file
uninstall-local: uninstall-ms-lib uninstall-def-file
# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gailutil-3
+MSVCPROJS = gailutil-4
-gailutil_3_FILES = $(libgailutil_3_la_SOURCES)
+gailutil_4_FILES = $(libgailutil_4_la_SOURCES)
-gailutil_3_EXCLUDES = dummy
-gailutil_3_HEADERS_DIR = $(libgailutilincludedir)
+gailutil_4_EXCLUDES = dummy
+gailutil_4_HEADERS_DIR = $(libgailutilincludedir)
-gailutil_3_HEADERS_INST = $(libgailutilinclude_HEADERS)
+gailutil_4_HEADERS_INST = $(libgailutilinclude_HEADERS)
-gailutil_3_HEADERS_EXCLUDES = dummy
+gailutil_4_HEADERS_EXCLUDES = dummy
include $(top_srcdir)/build/Makefile.msvcproj
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index c20b5bb..eb73699 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -13,13 +13,13 @@ AM_CPPFLAGS = \
$(INCLUDED_IMMODULE_DEFINE)
DEPS = \
- $(top_builddir)/gtk/libgtk-3.la
+ $(top_builddir)/gtk/libgtk-4.la
LDADDS = \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(GTK_DEP_LIBS)
-moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules
+moduledir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/immodules
im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
im_xim_la_SOURCES = \
@@ -190,7 +190,7 @@ else
MULTIPRESS_MODULE = im-multipress.la
endif
-imconffiledir = $(sysconfdir)/gtk-3.0
+imconffiledir = $(sysconfdir)/gtk-4.0
dist_imconffile_DATA = im-multipress.conf
if CROSS_COMPILING
@@ -207,21 +207,21 @@ endif
# after the libraries are installed in their final locations.
install-data-hook:
$(AM_V_GEN) if $(RUN_QUERY_IMMODULES_TEST) ; then \
- echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \
- $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \
- echo "$(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) >
$(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache" ; \
- $(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) >
$(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache ; \
+ echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-4.0/4.0.0 ; \
+ $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-4.0/4.0.0 ; \
+ echo "$(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) >
$(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache" ; \
+ $(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) >
$(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache ; \
else \
echo "***" ; \
echo "*** Warning: immodules.cache not built" ; \
echo "***" ; \
echo "*** Generate this file manually on host" ; \
- echo "*** system using gtk-query-immodules-3.0" ; \
+ echo "*** system using gtk-query-immodules-4.0" ; \
echo "***" ; \
fi
uninstall-local:
- rm -f $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache
+ rm -f $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache
if BUILD_DYNAMIC_MODULES
@@ -262,7 +262,7 @@ noinst_LTLIBRARIES = \
included-modules: $(noinst_LTLIBRARIES)
immodules.cache: Makefile.am $(module_LTLIBRARIES)
- $(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) $(module_LTLIBRARIES) >
immodules.cache
+ $(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) $(module_LTLIBRARIES) >
immodules.cache
EXTRA_DIST += README.multipress
diff --git a/modules/printbackends/cloudprint/Makefile.am b/modules/printbackends/cloudprint/Makefile.am
index d2d434f..2a1811f 100644
--- a/modules/printbackends/cloudprint/Makefile.am
+++ b/modules/printbackends/cloudprint/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
backend_LTLIBRARIES = libprintbackend-cloudprint.la
@@ -32,7 +32,7 @@ libprintbackend_cloudprint_la_LDFLAGS = \
-avoid-version -module $(no_undefined)
libprintbackend_cloudprint_la_LIBADD = \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(REST_LIBS) \
$(JSON_GLIB_LIBS) \
$(GTK_DEP_LIBS)
diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am
index 09a9f89..8f36a87 100644
--- a/modules/printbackends/cups/Makefile.am
+++ b/modules/printbackends/cups/Makefile.am
@@ -14,11 +14,11 @@ AM_CPPFLAGS = \
$(GTK_DEBUG_FLAGS)
LDADDS = \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(COLORD_LIBS) \
$(GTK_DEP_LIBS)
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
backend_LTLIBRARIES = libprintbackend-cups.la
diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am
index 9b51bf4..ffdd816 100644
--- a/modules/printbackends/file/Makefile.am
+++ b/modules/printbackends/file/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
backend_LTLIBRARIES = libprintbackend-file.la
@@ -25,7 +25,7 @@ libprintbackend_file_la_LDFLAGS = \
-avoid-version -module $(no_undefined)
libprintbackend_file_la_LIBADD = \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(GTK_DEP_LIBS)
noinst_HEADERS = \
diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am
index 5a75170..79345ed 100644
--- a/modules/printbackends/lpr/Makefile.am
+++ b/modules/printbackends/lpr/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
$(GTK_DEBUG_FLAGS)
LDADDS = \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(GTK_DEP_LIBS)
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
backend_LTLIBRARIES = libprintbackend-lpr.la
diff --git a/modules/printbackends/papi/Makefile.am b/modules/printbackends/papi/Makefile.am
index 7176eba..48ae2ca 100644
--- a/modules/printbackends/papi/Makefile.am
+++ b/modules/printbackends/papi/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
$(GTK_DEBUG_FLAGS)
LDADDS = \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(GTK_DEP_LIBS)
-backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
backend_LTLIBRARIES = libprintbackend-papi.la
diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am
index bff5e93..876ef0f 100644
--- a/modules/printbackends/test/Makefile.am
+++ b/modules/printbackends/test/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
backend_LTLIBRARIES = libprintbackend-test.la
@@ -24,7 +24,7 @@ libprintbackend_test_la_LDFLAGS = \
-avoid-version -module $(no_undefined)
libprintbackend_test_la_LIBADD = \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(GTK_DEP_LIBS)
noinst_HEADERS = \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 649981f..1380131 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,11 +12,11 @@ AM_CPPFLAGS = \
$(GDK_DEP_CFLAGS)
DEPS = \
- $(top_builddir)/gtk/libgtk-3.la
+ $(top_builddir)/gtk/libgtk-4.la
LDADD = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS) \
$(GDK_DEP_LIBS) \
-lm
diff --git a/tests/visuals/Makefile.am b/tests/visuals/Makefile.am
index 8250de6..43dfa68 100644
--- a/tests/visuals/Makefile.am
+++ b/tests/visuals/Makefile.am
@@ -9,11 +9,11 @@ AM_CPPFLAGS = \
AM_CXXFLAGS = $(AM_CPPFLAGS)
DEPS = \
- $(top_builddir)/gtk/libgtk-3.la
+ $(top_builddir)/gtk/libgtk-4.la
LDADDS = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS) \
-lm
diff --git a/testsuite/a11y/Makefile.am b/testsuite/a11y/Makefile.am
index 9fd1fc0..39f1eb7 100644
--- a/testsuite/a11y/Makefile.am
+++ b/testsuite/a11y/Makefile.am
@@ -16,8 +16,8 @@ AM_CPPFLAGS = \
$(GTK_DEP_CFLAGS)
LDADD = \
- $(top_builddir)/gdk/libgdk-3.la \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gdk/libgdk-4.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(GTK_DEP_LIBS)
# work around random file systems showing up in the file chooser,
diff --git a/testsuite/a11y/state/Makefile.am b/testsuite/a11y/state/Makefile.am
index 2861d4d..42baceb 100644
--- a/testsuite/a11y/state/Makefile.am
+++ b/testsuite/a11y/state/Makefile.am
@@ -13,8 +13,8 @@ AM_CPPFLAGS = \
$(GTK_DEP_CFLAGS)
LDADD = \
- $(top_builddir)/gdk/libgdk-3.la \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gdk/libgdk-4.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(GTK_DEP_LIBS)
TESTS_ENVIRONMENT = \
diff --git a/testsuite/css/Makefile.am b/testsuite/css/Makefile.am
index 091591a..61e68d5 100644
--- a/testsuite/css/Makefile.am
+++ b/testsuite/css/Makefile.am
@@ -18,8 +18,8 @@ AM_CPPFLAGS = \
$(GTK_DEP_CFLAGS)
LDADD = \
- $(top_builddir)/gdk/libgdk-3.la \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gdk/libgdk-4.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(GTK_DEP_LIBS)
TEST_PROGS += api
diff --git a/testsuite/css/nodes/Makefile.am b/testsuite/css/nodes/Makefile.am
index 339c47e..9c24c2a 100644
--- a/testsuite/css/nodes/Makefile.am
+++ b/testsuite/css/nodes/Makefile.am
@@ -18,8 +18,8 @@ test_css_nodes_CFLAGS = \
$(NULL)
test_css_nodes_LDADD = \
- $(top_builddir)/gdk/libgdk-3.la \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gdk/libgdk-4.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(GTK_DEP_LIBS) \
$(NULL)
diff --git a/testsuite/css/parser/Makefile.am b/testsuite/css/parser/Makefile.am
index bd79891..9f803e6 100644
--- a/testsuite/css/parser/Makefile.am
+++ b/testsuite/css/parser/Makefile.am
@@ -19,8 +19,8 @@ test_css_parser_CFLAGS = \
$(GTK_DEP_CFLAGS)
test_css_parser_LDADD = \
- $(top_builddir)/gdk/libgdk-3.la \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gdk/libgdk-4.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(GTK_DEP_LIBS)
test_css_parser_SOURCES = \
diff --git a/testsuite/css/style/Makefile.am b/testsuite/css/style/Makefile.am
index bfdb22b..5340de0 100644
--- a/testsuite/css/style/Makefile.am
+++ b/testsuite/css/style/Makefile.am
@@ -18,8 +18,8 @@ test_css_style_CFLAGS = \
$(NULL)
test_css_style_LDADD = \
- $(top_builddir)/gdk/libgdk-3.la \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gdk/libgdk-4.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(GTK_DEP_LIBS) \
$(NULL)
diff --git a/testsuite/gdk/Makefile.am b/testsuite/gdk/Makefile.am
index 73b4beb..ce67755 100644
--- a/testsuite/gdk/Makefile.am
+++ b/testsuite/gdk/Makefile.am
@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
LDADD = \
$(GDK_DEP_LIBS) \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(NULL)
#TEST_PROGS += check-gdk-cairo
diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
index a0f290d..3dde3a0 100644
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@@ -17,11 +17,11 @@ AM_CPPFLAGS += -DHAVE_UNIX_PRINT_WIDGETS
endif
DEPS = \
- $(top_builddir)/gtk/libgtk-3.la
+ $(top_builddir)/gtk/libgtk-4.la
LDADD = \
- $(top_builddir)/gtk/libgtk-3.la \
- $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gtk/libgtk-4.la \
+ $(top_builddir)/gdk/libgdk-4.la \
$(GTK_DEP_LIBS)
noinst_PROGRAMS = $(TEST_PROGS)
diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index 068d9f8..5d2961b 100644
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -24,8 +24,8 @@ gtk_reftest_CFLAGS = \
gtk_reftest_LDADD = \
libgtkreftestprivate.la \
- $(top_builddir)/gdk/libgdk-3.la \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gdk/libgdk-4.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(GTK_DEP_LIBS) \
$(GMODULE_LIBS) \
$(NULL)
@@ -44,8 +44,8 @@ endif
libgtkreftestprivate_la_CFLAGS = $(gtk_reftest_CFLAGS)
libgtkreftestprivate_la_LDFLAGS = $(no_undefined)
libgtkreftestprivate_la_LIBADD = \
- $(top_builddir)/gdk/libgdk-3.la \
- $(top_builddir)/gtk/libgtk-3.la \
+ $(top_builddir)/gdk/libgdk-4.la \
+ $(top_builddir)/gtk/libgtk-4.la \
$(GTK_DEP_LIBS) \
$(GMODULE_LIBS) \
$(NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
