From 0a7a70ed674377ad914f15b0d32f49d83d2624cb Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 23 Feb 2015 12:44:47 +0100 Subject: [PATCH] build: build libbupsplit separately It avoids gobject-introspection warnings: src/libostree/bupsplit.h:42: Warning: OSTree: symbol='bupsplit_find_ofs': Unknown namespace for symbol 'bupsplit_find_ofs' src/libostree/bupsplit.h:43: Warning: OSTree: symbol='bupsplit_selftest': Unknown namespace for symbol 'bupsplit_selftest' src/libostree/bupsplit.h:33: Warning: OSTree: symbol='BUP_BLOBBITS': Unknown namespace for symbol 'BUP_BLOBBITS' src/libostree/bupsplit.h:34: Warning: OSTree: symbol='BUP_BLOBSIZE': Unknown namespace for symbol 'BUP_BLOBSIZE' src/libostree/bupsplit.h:35: Warning: OSTree: symbol='BUP_WINDOWBITS': Unknown namespace for symbol 'BUP_WINDOWBITS' src/libostree/bupsplit.h:36: Warning: OSTree: symbol='BUP_WINDOWSIZE': Unknown namespace for symbol 'BUP_WINDOWSIZE' Signed-off-by: Giuseppe Scrivano --- Makefile-libostree.am | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 1b265055..5d653f7f 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -19,7 +19,7 @@ include Makefile-libostree-defines.am -noinst_LTLIBRARIES += libostree-kernel-args.la +noinst_LTLIBRARIES += libostree-kernel-args.la libbupsplit.la libostree_kernel_args_la_SOURCES = \ src/libostree/ostree-kernel-args.h \ @@ -33,6 +33,11 @@ lib_LTLIBRARIES += libostree-1.la libostreeincludedir = $(includedir)/ostree-1 libostreeinclude_HEADERS = $(libostree_public_headers) +libbupsplit_la_SOURCES = \ + src/libostree/bupsplit.h \ + src/libostree/bupsplit.c \ + $(NULL) + libostree_1_la_SOURCES = \ src/libostree/ostree-async-progress.c \ src/libostree/ostree-cmdprivate.h \ @@ -49,8 +54,6 @@ libostree_1_la_SOURCES = \ src/libostree/ostree-lzma-compressor.h \ src/libostree/ostree-lzma-decompressor.c \ src/libostree/ostree-lzma-decompressor.h \ - src/libostree/bupsplit.h \ - src/libostree/bupsplit.c \ src/libostree/ostree-rollsum.h \ src/libostree/ostree-rollsum.c \ src/libostree/ostree-varint.h \ @@ -109,7 +112,7 @@ endif libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libglnx -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree \ $(OT_INTERNAL_GIO_UNIX_CFLAGS) $(OT_DEP_LZMA_CFLAGS) $(OT_DEP_ZLIB_CFLAGS) libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions -export-symbols-regex '^ostree_' -libostree_1_la_LIBADD = libotutil.la libglnx.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_DEP_LZMA_LIBS) $(OT_DEP_ZLIB_LIBS) +libostree_1_la_LIBADD = libotutil.la libbupsplit.la libglnx.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_DEP_LZMA_LIBS) $(OT_DEP_ZLIB_LIBS) if USE_LIBARCHIVE libostree_1_la_CFLAGS += $(OT_DEP_LIBARCHIVE_CFLAGS)