diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile-libostree.am | 4 | ||||
| -rw-r--r-- | Makefile-ostree.am | 2 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rwxr-xr-x | autogen.sh | 3 | ||||
| m--------- | bsdiff | 0 |
6 files changed, 14 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index e5084aff..afac1fd4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "libglnx"] path = libglnx url = https://git.gnome.org/browse/libglnx +[submodule "bsdiff"] + path = bsdiff + url = https://github.com/giuseppe/bsdiff.git diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 5d653f7f..7a1b64e1 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -109,10 +109,10 @@ libostree_1_la_SOURCES += \ $(NULL) endif -libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libglnx -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree \ +libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/bsdiff -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 libbupsplit.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 libbsdiff.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) diff --git a/Makefile-ostree.am b/Makefile-ostree.am index 1bdc5f34..78ef2141 100644 --- a/Makefile-ostree.am +++ b/Makefile-ostree.am @@ -76,7 +76,7 @@ ostree_SOURCES += \ ostree_bin_shared_cflags = $(AM_CFLAGS) -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -I$(srcdir)/src/ostree \ $(NULL) -ostree_bin_shared_ldadd = libglnx.la libotutil.la libostree-kernel-args.la libostree-1.la +ostree_bin_shared_ldadd = libglnx.la libbsdiff.la libotutil.la libostree-kernel-args.la libostree-1.la ostree_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS) -I$(srcdir)/libglnx ostree_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS) diff --git a/Makefile.am b/Makefile.am index b5b43d6e..c69a7328 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,6 +52,12 @@ libglnx_libs := $(OT_DEP_GIO_UNIX_LIBS) include libglnx/Makefile-libglnx.am.inc noinst_LTLIBRARIES += libglnx.la +libbsdiff_srcpath := $(srcdir)/bsdiff +libbsdiff_cflags := $(OT_DEP_GIO_UNIX_CFLAGS) "-I$(bsdiff_srcpath)" +libbsdiff_libs := $(OT_DEP_GIO_UNIX_LIBS) +include bsdiff/Makefile-bsdiff.am.inc +noinst_LTLIBRARIES += libbsdiff.la + include Makefile-otutil.am include Makefile-libostree.am include Makefile-ostree.am @@ -29,11 +29,12 @@ else fi cd $olddir -if ! test -f libglnx/README.md; then +if ! test -f libglnx/README.md -o bsdiff/README.md; then git submodule update --init fi # Workaround automake bug with subdir-objects and computed paths sed -e 's,$(libglnx_srcpath),'${srcdir}/libglnx, < libglnx/Makefile-libglnx.am >libglnx/Makefile-libglnx.am.inc +sed -e 's,$(libbsdiff_srcpath),'${srcdir}/bsdiff, < bsdiff/Makefile-bsdiff.am >bsdiff/Makefile-bsdiff.am.inc autoreconf --force --install --verbose diff --git a/bsdiff b/bsdiff new file mode 160000 +Subproject 2c5d65bce531b7ce56e5a1d18f9369618074b6e |