Merge branch '0.3.x' into 0.4.x
Conflicts: configure.ac
This commit is contained in:
@@ -12,7 +12,8 @@ libblkmaker_@LIBBLKMAKER_API_VERSION@_la_SOURCES = \
|
||||
base58.c \
|
||||
blkmaker.c \
|
||||
blktemplate.c \
|
||||
hex.c
|
||||
hex.c \
|
||||
private.h
|
||||
|
||||
libblkmaker_@LIBBLKMAKER_API_VERSION@_la_LDFLAGS = -version-info $(LIBBLKMAKER_SO_VERSION) -no-undefined
|
||||
|
||||
@@ -40,3 +41,7 @@ pkgconfig_DATA = \
|
||||
libblkmaker_jansson-$(LIBBLKMAKER_API_VERSION).pc
|
||||
|
||||
dist_noinst_SCRIPTS = autogen.sh
|
||||
dist_noinst_DATA = \
|
||||
AUTHORS COPYING README \
|
||||
example.c \
|
||||
testinput.c
|
||||
|
||||
Reference in New Issue
Block a user