diff options
28 files changed, 84 insertions, 145 deletions
diff --git a/Makefile.am b/Makefile.am index e522392683..7ec4919ebc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,14 +40,9 @@ gtk+-x11-4.0.pc gtk+-win32-4.0.pc gtk+-quartz-4.0.pc gtk+-broadway-4.0.pc gtk+-w rm -f $@ && \ cp gtk+-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: gdk-4.0.pc - rm -f $@ && \ - cp gdk-4.0.pc $@ - pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gdk-4.0.pc gsk-4.0.pc gtk+-4.0.pc gail-4.0.pc +pkgconfig_DATA = 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-4.0.pc @@ -62,14 +57,6 @@ DISTCLEANFILES = \ gtk+-broadway-4.0.pc \ gtk+-wayland-4.0.pc \ gtk+-mir-4.0.pc \ - gsk-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 diff --git a/configure.ac b/configure.ac index e2425f22fb..ebe35b4782 100644 --- a/configure.ac +++ b/configure.ac @@ -1943,8 +1943,6 @@ INSTALL config.h.win32 gtk-zip.sh Makefile -gdk-4.0.pc -gsk-4.0.pc gtk+-4.0.pc gtk+-unix-print-4.0.pc gail-4.0.pc diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index 4e55169ebe..9a982d9a27 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -94,7 +94,6 @@ DEPS = \ LDADDS = \ $(top_builddir)/gtk/libgtk-4.la \ - $(top_builddir)/gdk/libgdk-4.la \ $(GTK_DEP_LIBS) \ $(GDK_DEP_LIBS) \ -lm diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am index 8a2722bfbd..03ba276913 100644 --- a/demos/icon-browser/Makefile.am +++ b/demos/icon-browser/Makefile.am @@ -7,7 +7,6 @@ AM_CPPFLAGS = \ LDADD = \ $(top_builddir)/gtk/libgtk-4.la \ - $(top_builddir)/gdk/libgdk-4.la \ $(GTK_DEP_LIBS) diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am index 3e8e6d2513..9a5de9d490 100644 --- a/demos/widget-factory/Makefile.am +++ b/demos/widget-factory/Makefile.am @@ -22,7 +22,6 @@ gtk4_widget_factory_CPPFLAGS = \ $(NULL) gtk4_widget_factory_LDADD = \ - $(top_builddir)/gdk/libgdk-4.la \ $(top_builddir)/gtk/libgtk-4.la \ $(GTK_DEP_LIBS) \ $(NULL) diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am index 4e62ea38eb..d8814f8ef9 100644 --- a/docs/reference/gdk/Makefile.am +++ b/docs/reference/gdk/Makefile.am @@ -61,7 +61,7 @@ AM_CPPFLAGS = \ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) -GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-4.la $(GDK_DEP_LIBS) +GTKDOC_LIBS = $(top_builddir)/gtk/libgtk-4.la $(GDK_DEP_LIBS) # Extra options to supply to gtkdoc-mkdb MKDB_OPTIONS=--output-format=xml --name-space=gdk diff --git a/docs/reference/gsk/Makefile.am b/docs/reference/gsk/Makefile.am index cfb7e19aef..27cc3acf33 100644 --- a/docs/reference/gsk/Makefile.am +++ b/docs/reference/gsk/Makefile.am @@ -31,7 +31,7 @@ AM_CPPFLAGS = \ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) -GTKDOC_LIBS = $(top_builddir)/gsk/libgsk-4.la $(GDK_DEP_LIBS) +GTKDOC_LIBS = $(top_builddir)/gtk/libgtk-4.la $(GDK_DEP_LIBS) MKDB_OPTIONS=--output-format=xml --name-space=gsk diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index adcfb7d146..9bc86ae454 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -265,7 +265,6 @@ CPPFLAGS += \ -UGTK_DISABLE_SINGLE_INCLUDES GTKDOC_LIBS = \ - $(top_builddir)/gdk/libgdk-4.la \ $(top_builddir)/gtk/libgtk-4.la \ $(GTK_DEP_LIBS) diff --git a/examples/Makefile.am b/examples/Makefile.am index 31abbc302d..ae6d51ca03 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -16,7 +16,6 @@ AM_CPPFLAGS = \ LDADD = \ $(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 1dc66df7fe..4f7c7f4fca 100644 --- a/examples/application1/Makefile.am +++ b/examples/application1/Makefile.am @@ -4,7 +4,6 @@ GTK_CFLAGS = \ GTK_LIBS = \ $(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 791335b63a..47b7a11edf 100644 --- a/examples/application10/Makefile.am +++ b/examples/application10/Makefile.am @@ -4,7 +4,6 @@ GTK_CFLAGS = \ GTK_LIBS = \ $(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 950b43ef7c..7f2a64c0fc 100644 --- a/examples/application2/Makefile.am +++ b/examples/application2/Makefile.am @@ -4,7 +4,6 @@ GTK_CFLAGS = \ GTK_LIBS = \ $(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 950b43ef7c..7f2a64c0fc 100644 --- a/examples/application3/Makefile.am +++ b/examples/application3/Makefile.am @@ -4,7 +4,6 @@ GTK_CFLAGS = \ GTK_LIBS = \ $(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 20c6b588b7..9515304ecf 100644 --- a/examples/application4/Makefile.am +++ b/examples/application4/Makefile.am @@ -4,7 +4,6 @@ GTK_CFLAGS = \ GTK_LIBS = \ $(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 e5417b4ea5..b5f35ca1e1 100644 --- a/examples/application5/Makefile.am +++ b/examples/application5/Makefile.am @@ -4,7 +4,6 @@ GTK_CFLAGS = \ GTK_LIBS = \ $(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 b8fa33c9ae..e043cd1074 100644 --- a/examples/application6/Makefile.am +++ b/examples/application6/Makefile.am @@ -4,7 +4,6 @@ GTK_CFLAGS = \ GTK_LIBS = \ $(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 b8fa33c9ae..e043cd1074 100644 --- a/examples/application7/Makefile.am +++ b/examples/application7/Makefile.am @@ -4,7 +4,6 @@ GTK_CFLAGS = \ GTK_LIBS = \ $(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 791335b63a..47b7a11edf 100644 --- a/examples/application8/Makefile.am +++ b/examples/application8/Makefile.am @@ -4,7 +4,6 @@ GTK_CFLAGS = \ GTK_LIBS = \ $(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 791335b63a..47b7a11edf 100644 --- a/examples/application9/Makefile.am +++ b/examples/application9/Makefile.am @@ -4,7 +4,6 @@ GTK_CFLAGS = \ GTK_LIBS = \ $(top_builddir)/gtk/libgtk-4.la \ - $(top_builddir)/gdk/libgdk-4.la \ $(GTK_DEP_LIBS) diff --git a/gdk-4.0.pc.in b/gdk-4.0.pc.in deleted file mode 100644 index 6862697370..0000000000 --- a/gdk-4.0.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ -targets=@GDK_BACKENDS@ - -Name: GDK -Description: GTK+ Drawing Kit -Version: @VERSION@ -Requires: @GDK_PACKAGES@ -Requires.private: @GDK_PRIVATE_PACKAGES@ -Libs: -L${libdir} -lgdk-4 @GDK_EXTRA_LIBS@ -Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GDK_EXTRA_CFLAGS@ diff --git a/gdk/Makefile.am b/gdk/Makefile.am index b31e7e264b..e17047c101 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -47,16 +47,6 @@ AM_CPPFLAGS = \ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) -# libtool stuff: set version and export symbols for resolving -# since automake doesn't support conditionalized libsomething_la_LDFLAGS -# we use the general approach here -LDADD = \ - $(GTK_LINK_FLAGS) \ - -version-info $(LT_VERSION_INFO) \ - -export-dynamic \ - -rpath $(libdir) \ - $(no_undefined) - # # setup source file variables # @@ -245,17 +235,17 @@ introspection_files = \ gdkenumtypes.c \ gdkenumtypes.h -Gdk-4.0.gir: libgdk-4.la Makefile -Gdk_4_0_gir_SCANNERFLAGS = \ +Gdk-noinst-4.0.gir: libgdk-4.la Makefile +Gdk_noinst_4_0_gir_SCANNERFLAGS = \ --c-include="gdk/gdk.h" -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 +Gdk_noinst_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0 +Gdk_noinst_4_0_gir_LIBS = libgdk-4.la +Gdk_noinst_4_0_gir_FILES = $(introspection_files) +Gdk_noinst_4_0_gir_CFLAGS = $(AM_CPPFLAGS) +Gdk_noinst_4_0_gir_EXPORT_PACKAGES = gdk-4.0 +INTROSPECTION_GIRS += Gdk-noinst-4.0.gir if OS_WIN32 -Gdk_4_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir) +Gdk_noinst_4_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir) endif if USE_X11 x11_introspection_files = \ @@ -305,17 +295,17 @@ x11_introspection_files = \ x11/gdkx11visual.h \ x11/gdkx11window.h -GdkX11-4.0.gir: libgdk-4.la Gdk-4.0.gir Makefile -GdkX11_4_0_gir_SCANNERFLAGS = \ +GdkX11-noinst-4.0.gir: libgdk-4.la Gdk-noinst-4.0.gir Makefile +GdkX11_noinst_4_0_gir_SCANNERFLAGS = \ --identifier-prefix=Gdk \ --c-include="gdk/gdkx.h" \ - --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 + --include-uninstalled=$(top_builddir)/gdk/Gdk-noinst-4.0.gir +GdkX11_noinst_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0 +GdkX11_noinst_4_0_gir_LIBS = libgdk-4.la +GdkX11_noinst_4_0_gir_FILES = $(x11_introspection_files) +GdkX11_noinst_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk +GdkX11_noinst_4_0_gir_EXPORT_PACKAGES = gdk-x11-4.0 +INTROSPECTION_GIRS += GdkX11-noinst-4.0.gir endif # USE_X11 @@ -350,26 +340,22 @@ w32_introspection_files = \ win32/gdkwindow-win32.c if OS_WIN32 -GdkWin32-4.0.gir: libgdk-3.la Gdk-4.0.gir Makefile -GdkWin32_4_0_gir_SCANNERFLAGS = \ +GdkWin32-noinst-4.0.gir: libgdk-3.la Gdk-noinst-4.0.gir Makefile +GdkWin32_noinst_4_0_gir_SCANNERFLAGS = \ --identifier-prefix=Gdk \ --c-include="gdk/gdkwin32.h" \ - --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 + --include-uninstalled=$(top_builddir)/gdk/Gdk-noinst-4.0.gir +GdkWin32_noinst_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 +GdkWin32_noinst_4_0_gir_LIBS = libgdk-4.la +GdkWin32_noinst_4_0_gir_FILES = $(w32_introspection_files) +GdkWin32_noinst_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -I$(srcdir)/win32 -I$(srcdir) +INTROSPECTION_GIRS += GdkWin32-noinst-4.0.gir endif # OS_WIN32 -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) +noinst_DATA = $(INTROSPECTION_GIRS) -CLEANFILES += $(gir_DATA) $(typelibs_DATA) +CLEANFILES += $(gir_DATA) endif # HAVE_INTROSPECTION @@ -405,7 +391,7 @@ install-ms-lib: uninstall-ms-lib: endif -lib_LTLIBRARIES = libgdk-4.la +noinst_LTLIBRARIES = libgdk-4.la MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h EXTRA_DIST += \ @@ -537,7 +523,7 @@ 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-4.0.gir + --include-uninstalled=./Gdk-noinst-4.0.gir include $(top_srcdir)/build/Makefile.msvc-introspection diff --git a/gsk-4.0.pc.in b/gsk-4.0.pc.in deleted file mode 100644 index a86e29fc4d..0000000000 --- a/gsk-4.0.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ -targets=@GDK_BACKENDS@ - -Name: GSK -Description: GTK+ Scene Graph Kit -Version: @VERSION@ -Requires: gdk-@GTK_API_VERSION@ @GSK_PACKAGES@ -Requires.private: @GSK_PRIVATE_PACKAGES@ -Libs: -L${libdir} -lgsk-3 @GSK_EXTRA_LIBS@ -Cflags: -I${includedir}/gsk-@GTK_API_VERSION@ @GSK_EXTRA_CFLAGS@ diff --git a/gsk/Makefile.am b/gsk/Makefile.am index 18dfca0511..cb51152023 100644 --- a/gsk/Makefile.am +++ b/gsk/Makefile.am @@ -20,7 +20,7 @@ BUILT_SOURCES = CLEANFILES = DISTCLEANFILES = -lib_LTLIBRARIES = +noinst_LTLIBRARIES = gsk_public_source_h = \ gskenums.h \ @@ -109,14 +109,8 @@ libgsk_4_la_SOURCES = $(all_sources) nodist_libgsk_4_la_SOURCES = $(gsk_built_source_h) $(gsk_built_source_c) libgsk_4_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS) libgsk_4_la_LIBADD = $(GSK_DEP_LIBS) $(top_builddir)/gdk/libgdk-4.la -libgsk_4_la_LDFLAGS = \ - $(GTK_LINK_FLAGS) \ - -version-info $(LT_VERSION_INFO) \ - -export-dynamic \ - -rpath $(libdir) \ - $(no_undefined) -lib_LTLIBRARIES += libgsk-4.la +noinst_LTLIBRARIES += libgsk-4.la gskincludedir = $(includedir)/gtk-4.0/gsk gskinclude_HEADERS = $(gsk_public_source_h) gskenumtypes.h gsk.h @@ -137,25 +131,21 @@ if HAVE_INTROSPECTION introspection_files = $(gsk_public_source_h) $(gsk_public_source_c) -Gsk-4.0.gir: libgsk-4.la Makefile -Gsk_4_0_gir_SCANNERFLAGS = \ +Gsk-4.0_noinst.gir: libgsk-4.la Makefile +Gsk_noinst_4_0_gir_SCANNERFLAGS = \ --add-include-path=$(top_builddir)/gdk \ - --include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir \ + --include-uninstalled=$(top_builddir)/gdk/Gdk-noinst-4.0.gir \ --c-include="gsk/gsk.h" -Gsk_4_0_gir_LIBS = libgsk-4.la $(top_builddir)/gdk/libgdk-4.la -Gsk_4_0_gir_FILES = $(introspection_files) -Gsk_4_0_gir_CFLAGS = $(AM_CPPFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS) -Gsk_4_0_gir_EXPORT_PACKAGES = gsk-4.0 -Gsk_4_0_gir_INCLUDES = GObject-2.0 cairo-1.0 Graphene-1.0 -INTROSPECTION_GIRS += Gsk-4.0.gir +Gsk_noinst_4_0_gir_LIBS = libgsk-4.la +Gsk_noinst_4_0_gir_FILES = $(introspection_files) +Gsk_noinst_4_0_gir_CFLAGS = $(AM_CPPFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS) +Gsk_noinst_4_0_gir_EXPORT_PACKAGES = gsk-4.0 +Gsk_noinst_4_0_gir_INCLUDES = GObject-2.0 cairo-1.0 Graphene-1.0 +INTROSPECTION_GIRS += Gsk-noinst-4.0.gir -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) +noinst_DATA = $(INTROSPECTION_GIRS) -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(gir_DATA) $(typelibs_DATA) +CLEANFILES += $(gir_DATA) endif @@ -196,11 +186,11 @@ INTROSPECTION_INTERMEDIATE_ITEMS = \ Gsk_4_0_gir_MSVC_FILES = $(introspection_files) Gsk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gsk_4_0_gir_EXPORT_PACKAGES) Gsk_4_0_gir_MSVC_INCLUDE_GIRS = $(Gsk_4_0_gir_INCLUDES) -Gsk_4_0_gir_MSVC_LIBS = gdk-4.0 +Gsk_4_0_gir_MSVC_LIBS = gsk-4.0 Gsk_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS) Gsk_4_0_gir_MSVC_SCANNERFLAGS = \ --add-include-path=. \ - --include-uninstalled=./Gdk-4.0.gir + --include-uninstalled=../gdk/Gdk-noinst-4.0.gir include $(top_srcdir)/build/Makefile.msvc-introspection diff --git a/gtk+-4.0.pc.in b/gtk+-4.0.pc.in index cc5b53c7ef..b5385b328f 100644 --- a/gtk+-4.0.pc.in +++ b/gtk+-4.0.pc.in @@ -10,7 +10,7 @@ gtk_host=@host@ Name: GTK+ Description: GTK+ Graphical UI Library Version: @VERSION@ -Requires: gdk-@GTK_API_VERSION@ @GTK_PACKAGES@ -Requires.private: @GTK_PRIVATE_PACKAGES@ -Libs: -L${libdir} -lgtk-4 @GTK_EXTRA_LIBS@ -Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@ +Requires: gdk-@GTK_API_VERSION@ @GDK_PACKAGES@ @GTK_PACKAGES@ +Requires.private: @GDK_PRIVATE_PACKAGES@ @GTK_PRIVATE_PACKAGES@ +Libs: -L${libdir} -lgtk-4 @GDK_EXTRA_LIBS@ @GSK_EXTRA_LIBS@ @GTK_EXTRA_LIBS@ +Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GDK_EXTRA_CFLAGS@ @GSK_EXTRA_CFLAGS@ @GTK_EXTRA_CFLAGS@ diff --git a/gtk/Makefile.am b/gtk/Makefile.am index b83cc3b949..9803d896fb 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -82,12 +82,10 @@ uninstall-ms-lib: endif libadd = \ - $(top_builddir)/gdk/libgdk-4.la \ $(top_builddir)/gsk/libgsk-4.la \ $(GMODULE_LIBS) \ $(GTK_DEP_LIBS) deps = \ - $(top_builddir)/gdk/libgdk-4.la \ $(top_builddir)/gsk/libgsk-4.la # libtool stuff: set version and export symbols for resolving @@ -1469,7 +1467,7 @@ 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 +Gtk_4_0_gir_MSVC_SCANNERFLAGS = --warn-all --add-include-path=. --include-uninstalled=./Gdk-4.0.gir --include-uninstalled=./Gsk-4.0.gir include $(top_srcdir)/build/Makefile.msvc-introspection @@ -1518,11 +1516,34 @@ INTROSPECTION_COMPILER_ARGS = \ --includedir=. \ --includedir=../gdk -Gtk-4.0.gir: $(INTROSPECTION_SCANNER) libgtk-4.la $(top_builddir)/gdk/Gdk-4.0.gir Makefile +Gdk-4.0.gir: $(top_builddir)/gdk/Gdk-noinst-4.0.gir + sed -e "s/shared-library=\"[^\"]*\"/shared-library=\"libgtk-4.so.0\"/" -e "s/noinst-4.0/4.0/" < $(top_builddir)/gdk/Gdk-noinst-4.0.gir > $@ +EXTRA_GIRS = Gdk-4.0.gir + +if USE_X11 +GdkX11-4.0.gir: $(top_builddir)/gdk/GdkX11-noinst-4.0.gir + sed -e "s/shared-library=\"[^\"]*\"/shared-library=\"libgtk-4.so.0\"/" -e "s/noinst-4.0/4.0/" < $(top_builddir)/gdk/GdkX11-noinst-4.0.gir > $@ +EXTRA_GIRS += GdkX11-4.0.gir +endif + +if OS_WIN32 + +GdkWin32-4.0.gir: $(top_builddir)/gdk/GdkX11-noinst-4.0.gir + sed "-e s/shared-library=\"[^\"]*\"/shared-library=\"libgtk-4.so.0\"/" -e "s/noinst-4.0/4.0/" < $(top_builddir)/gdk/GdkX11-noinst-4.0.gir > $@ +EXTRA_GIRS += GdkWin32-4.0.gir + +endif + +Gsk-4.0.gir: $(top_builddir)/gsk/Gsk-noinst-4.0.gir + sed -e "s/shared-library=\"[^\"]*\"/shared-library=\"libgtk-4.so.0\"/" -e "s/noinst-4.0/4.0/" < $(top_builddir)/gsk/Gsk-noinst-4.0.gir > $@ +EXTRA_GIRS += Gsk-4.0.gir + +Gtk-4.0.gir: $(INTROSPECTION_SCANNER) libgtk-4.la Gdk-4.0.gir Gsk-4.0.gir Makefile Gtk_4_0_gir_SCANNERFLAGS = \ --warn-all \ - --add-include-path=$(top_builddir)/gdk \ - --include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir + --add-include-path=./ \ + --include-uninstalled=Gdk-4.0.gir \ + --include-uninstalled=Gsk-4.0.gir Gtk_4_0_gir_INCLUDES = Atk-1.0 if USE_X11 Gtk_4_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11 @@ -1532,15 +1553,15 @@ Gtk_4_0_gir_CFLAGS = \ $(AM_CPPFLAGS) \ -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API Gtk_4_0_gir_FILES = $(introspection_files) -Gtk_4_0_gir_LIBS = libgtk-4.la $(top_builddir)/gsk/libgsk-4.la $(top_builddir)/gdk/libgdk-4.la +Gtk_4_0_gir_LIBS = libgtk-4.la $(top_builddir)/gsk/libgsk-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) +gir_DATA = $(INTROSPECTION_GIRS) $(EXTRA_GIRS) typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) +typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) $(EXTRA_GIRS:.gir=.typelib) CLEANFILES += $(gir_DATA) $(typelibs_DATA) endif diff --git a/tests/Makefile.am b/tests/Makefile.am index cb17e2875e..ab1fe0887b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,8 +13,7 @@ AM_CPPFLAGS = \ $(GTK_DEP_CFLAGS) \ $(GDK_DEP_CFLAGS) -DEPS = \ - $(top_builddir)/gtk/libgtk-4.la +DEPS = LDADD = \ $(top_builddir)/gtk/libgtk-4.la \ diff --git a/testsuite/gsk/Makefile.am b/testsuite/gsk/Makefile.am index 2873450625..c253b36aee 100644 --- a/testsuite/gsk/Makefile.am +++ b/testsuite/gsk/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS = \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) -LDADD = $(GTK_DEP_LIBS) $(top_builddir)/gsk/libgsk-4.la +LDADD = $(GTK_DEP_LIBS) TEST_PROGS += \ $(NULL) diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am index 06893bc40a..dc56cb7bff 100644 --- a/testsuite/reftests/Makefile.am +++ b/testsuite/reftests/Makefile.am @@ -24,7 +24,6 @@ gtk_reftest_CFLAGS = \ gtk_reftest_LDADD = \ libgtkreftestprivate.la \ - $(top_builddir)/gdk/libgdk-4.la \ $(top_builddir)/gtk/libgtk-4.la \ $(GTK_DEP_LIBS) \ $(GMODULE_LIBS) \ |