diff options
| author | Colin Walters <walters@verbum.org> | 2023-03-17 11:36:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-17 11:36:22 -0400 |
| commit | d49632faa6cbcda7b2891d5aab9f5a9a68348160 (patch) | |
| tree | aee8b97032921b1a10ff20395daf5e35dcf48a65 | |
| parent | 28731ab0e9dd94a10cf3907b4962b934c9d99207 (diff) | |
| parent | 518c5977e9c022c73f63a4cce4998a31cb8093d5 (diff) | |
| download | ostree-d49632faa6cbcda7b2891d5aab9f5a9a68348160.tar.gz | |
Merge pull request #2812 from tintou/tintou/g-ir-fix
build: Do not include private headers in the introspection
| -rw-r--r-- | Makefile-libostree.am | 3 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 12f1ffb4..52ea49d4 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -267,10 +267,11 @@ if BUILDOPT_INTROSPECTION OSTree-1.0.gir: libostree-1.la Makefile OSTree_1_0_gir_EXPORT_PACKAGES = ostree-1 OSTree_1_0_gir_INCLUDES = Gio-2.0 +OSTree_1_0_gir_C_INCLUDES = ostree.h OSTree_1_0_gir_CFLAGS = $(libostree_1_la_CFLAGS) OSTree_1_0_gir_LIBS = libostree-1.la OSTree_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Ostree --symbol-prefix=ostree $(GI_SCANNERFLAGS) -OSTree_1_0_gir_FILES = $(libostreeinclude_HEADERS) $(filter-out %-private.h %/ostree-soup-uri.h,$(libostree_1_la_SOURCES)) +OSTree_1_0_gir_FILES = $(libostreeinclude_HEADERS) $(filter-out %.h,$(libostree_1_la_SOURCES)) INTROSPECTION_GIRS += OSTree-1.0.gir gir_DATA += OSTree-1.0.gir typelib_DATA += OSTree-1.0.typelib diff --git a/configure.ac b/configure.ac index 433d5354..350df344 100644 --- a/configure.ac +++ b/configure.ac @@ -207,7 +207,7 @@ AS_IF([test x$with_curl != xno || test x$with_soup != xno], AS_IF([test x$with_curl = xyes], [fetcher_backend=curl], [test x$with_soup = xyes], [fetcher_backend=libsoup], [fetcher_backend=none]) m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [ - GOBJECT_INTROSPECTION_CHECK([1.34.0]) + GOBJECT_INTROSPECTION_CHECK([1.51.5]) ]) AM_CONDITIONAL(BUILDOPT_INTROSPECTION, test "x$found_introspection" = xyes) |