packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Don't scan ostree-remote.h for introspection if !experimental-api 

It's a bit unfortunate that the scanner doesn't error on this, but
anyways

Closes: https://github.com/ostreedev/ostree/issues/966

Closes: #967
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-06-27 12:57:47 -04:00 committed by Atomic Bot
parent c2b6afe5b9
commit 54db9ecab3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile-libostree.am
View File

@ -150,8 +150,7 @@ libostree_1_la_SOURCES += \
src/libostree/ostree-tls-cert-interaction.h \ src/libostree/ostree-tls-cert-interaction.h \
$(NULL) $(NULL)
endif endif
if !ENABLE_EXPERIMENTAL_API libostree_experimental_headers = \
libostree_1_la_SOURCES += \
src/libostree/ostree-ref.h \ src/libostree/ostree-ref.h \
src/libostree/ostree-remote.h \ src/libostree/ostree-remote.h \
src/libostree/ostree-repo-finder.h \ src/libostree/ostree-repo-finder.h \
@ -159,6 +158,8 @@ libostree_1_la_SOURCES += \
src/libostree/ostree-repo-finder-config.h \ src/libostree/ostree-repo-finder-config.h \
src/libostree/ostree-repo-finder-mount.h \ src/libostree/ostree-repo-finder-mount.h \
$(NULL) $(NULL)
if !ENABLE_EXPERIMENTAL_API
libostree_1_la_SOURCES += $(libostree_experimental_headers)
else # if ENABLE_EXPERIMENTAL_API else # if ENABLE_EXPERIMENTAL_API
libostree_1_la_SOURCES += \ libostree_1_la_SOURCES += \
src/libostree/ostree-bloom.c \ src/libostree/ostree-bloom.c \
@ -257,7 +258,7 @@ OSTree_1_0_gir_INCLUDES = Gio-2.0
OSTree_1_0_gir_CFLAGS = $(libostree_1_la_CFLAGS) OSTree_1_0_gir_CFLAGS = $(libostree_1_la_CFLAGS)
OSTree_1_0_gir_LIBS = libostree-1.la 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_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 %/ostree-repo-finder.h %/ostree-repo-finder-avahi.h %/ostree-repo-finder-config.h %/ostree-repo-finder-mount.h,$(libostree_1_la_SOURCES)) OSTree_1_0_gir_FILES = $(libostreeinclude_HEADERS) $(filter-out %-private.h %/ostree-soup-uri.h $(libostree_experimental_headers),$(libostree_1_la_SOURCES))
INTROSPECTION_GIRS += OSTree-1.0.gir INTROSPECTION_GIRS += OSTree-1.0.gir
gir_DATA += OSTree-1.0.gir gir_DATA += OSTree-1.0.gir
typelib_DATA += OSTree-1.0.typelib typelib_DATA += OSTree-1.0.typelib