diff --git a/Makefile.am b/Makefile.am index e53cb6a875..2d10b20520 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,40 +36,40 @@ MAINTAINERCLEANFILES = \ ## Copy .pc files to target-specific names -gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc gtk+-mir-3.0.pc: gtk+-3.0.pc +gtk+-x11-4.0.pc gtk+-win32-4.0.pc gtk+-quartz-4.0.pc gtk+-broadway-4.0.pc gtk+-wayland-4.0.pc gtk+-mir-4.0.pc: gtk+-4.0.pc rm -f $@ && \ - cp gtk+-3.0.pc $@ + cp gtk+-4.0.pc $@ -gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc gdk-mir-3.0.pc: gdk-3.0.pc +gdk-x11-4.0.pc gdk-win32-4.0.pc gdk-quartz-4.0.pc gdk-broadway-4.0.pc gdk-wayland-4.0.pc gdk-mir-4.0.pc: gdk-4.0.pc rm -f $@ && \ - cp gdk-3.0.pc $@ + cp gdk-4.0.pc $@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc -pkgconfig_DATA += ${GDK_BACKENDS:%=gtk+-%-3.0.pc} -pkgconfig_DATA += ${GDK_BACKENDS:%=gdk-%-3.0.pc} +pkgconfig_DATA = gdk-4.0.pc gtk+-4.0.pc gail-4.0.pc +pkgconfig_DATA += ${GDK_BACKENDS:%=gtk+-%-4.0.pc} +pkgconfig_DATA += ${GDK_BACKENDS:%=gdk-%-4.0.pc} if OS_UNIX -pkgconfig_DATA += gtk+-unix-print-3.0.pc +pkgconfig_DATA += gtk+-unix-print-4.0.pc endif DISTCLEANFILES = \ - gtk+-unix-print-3.0.pc \ - gtk+-3.0.pc \ - gtk+-x11-3.0.pc \ - gtk+-win32-3.0.pc \ - gtk+-quartz-3.0.pc \ - gtk+-broadway-3.0.pc \ - gtk+-wayland-3.0.pc \ - gtk+-mir-3.0.pc \ - gdk-3.0.pc \ - gdk-x11-3.0.pc \ - gdk-win32-3.0.pc \ - gdk-quartz-3.0.pc \ - gdk-broadway-3.0.pc \ - gdk-wayland-3.0.pc \ - gdk-mir-3.0.pc \ - gail-3.0.pc \ + gtk+-unix-print-4.0.pc \ + gtk+-4.0.pc \ + gtk+-x11-4.0.pc \ + gtk+-win32-4.0.pc \ + gtk+-quartz-4.0.pc \ + gtk+-broadway-4.0.pc \ + gtk+-wayland-4.0.pc \ + gtk+-mir-4.0.pc \ + gdk-4.0.pc \ + gdk-x11-4.0.pc \ + gdk-win32-4.0.pc \ + gdk-quartz-4.0.pc \ + gdk-broadway-4.0.pc \ + gdk-wayland-4.0.pc \ + gdk-mir-4.0.pc \ + gail-4.0.pc \ config.lt distclean-local: @@ -93,7 +93,7 @@ ChangeLog: .PHONY: ChangeLog uninstall-local: - rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc + rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-4.0.pc AM_DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ diff --git a/configure.ac b/configure.ac index a0999a29d6..b0e35e686e 100644 --- a/configure.ac +++ b/configure.ac @@ -1891,10 +1891,10 @@ INSTALL config.h.win32 gtk-zip.sh Makefile -gdk-3.0.pc -gtk+-3.0.pc -gtk+-unix-print-3.0.pc -gail-3.0.pc +gdk-4.0.pc +gtk+-4.0.pc +gtk+-unix-print-4.0.pc +gail-4.0.pc m4macros/Makefile po/Makefile.in po-properties/Makefile.in diff --git a/gail-3.0.pc.in b/gail-4.0.pc.in similarity index 66% rename from gail-3.0.pc.in rename to gail-4.0.pc.in index 9777545c02..e60f430242 100644 --- a/gail-3.0.pc.in +++ b/gail-4.0.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: Gail Description: GNOME Accessibility Implementation Library Version: @VERSION@ -Requires: atk gtk+-3.0 -Libs: -L${libdir} -lgailutil-3 -Cflags: -I${includedir}/gail-3.0 +Requires: atk gtk+-4.0 +Libs: -L${libdir} -lgailutil-4 +Cflags: -I${includedir}/gail-4.0 diff --git a/gdk-3.0.pc.in b/gdk-4.0.pc.in similarity index 87% rename from gdk-3.0.pc.in rename to gdk-4.0.pc.in index 97b0537291..6862697370 100644 --- a/gdk-3.0.pc.in +++ b/gdk-4.0.pc.in @@ -9,5 +9,5 @@ Description: GTK+ Drawing Kit Version: @VERSION@ Requires: @GDK_PACKAGES@ Requires.private: @GDK_PRIVATE_PACKAGES@ -Libs: -L${libdir} -lgdk-3 @GDK_EXTRA_LIBS@ +Libs: -L${libdir} -lgdk-4 @GDK_EXTRA_LIBS@ Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GDK_EXTRA_CFLAGS@ diff --git a/gtk+-3.0.pc.in b/gtk+-4.0.pc.in similarity index 89% rename from gtk+-3.0.pc.in rename to gtk+-4.0.pc.in index cf5d3be677..cc5b53c7ef 100644 --- a/gtk+-3.0.pc.in +++ b/gtk+-4.0.pc.in @@ -12,5 +12,5 @@ Description: GTK+ Graphical UI Library Version: @VERSION@ Requires: gdk-@GTK_API_VERSION@ @GTK_PACKAGES@ Requires.private: @GTK_PRIVATE_PACKAGES@ -Libs: -L${libdir} -lgtk-3 @GTK_EXTRA_LIBS@ +Libs: -L${libdir} -lgtk-4 @GTK_EXTRA_LIBS@ Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@ diff --git a/gtk+-unix-print-3.0.pc.in b/gtk+-unix-print-4.0.pc.in similarity index 100% rename from gtk+-unix-print-3.0.pc.in rename to gtk+-unix-print-4.0.pc.in