Merge branch 'master' into zpaq

Makefile.am

@@ -35,7 +35,6 @@ libtmplrzip_la_SOURCES = \
   zpipe.h \
   lrzip_private.h \
   liblrzip_private.h \
-  Lrzip.h \
   lrzip.c \
   lrzip.h \
   rzip.h \
@@ -94,6 +93,9 @@ dist_doc_DATA = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = lrzip.pc
 
+lrzip_HEADERS = Lrzip.h
+lrzipdir = $(includedir)
+
 EXTRA_DIST = \
 		lrzip.pc.in \
 		lrztar \

lzma/C/Makefile.am

@@ -1,5 +1,11 @@
 MAINTAINERCLEANFILES = Makefile.in
 
+AM_CFLAGS = \
+  -DCOMPRESS_MF_MT \
+  -D_REENTRANT \
+  -I@top_builddir@ \
+  -I@top_srcdir@
+
 ASM_LIBS =
 ASM_S =
 if USE_ASM
@@ -33,11 +39,6 @@ liblzma_la_SOURCES = \
 	MyGuidDef.h
 liblzma_so_LIBS = $(ASM_LIBS)
 
-liblzma_so_CFLAGS = \
-  -DCOMPRESS_MF_MT \
-  -D_REENTRANT \
-  -I@top_builddir@
-
 7zCrcT8U.o: @top_srcdir@/lzma/ASM/x86/7zCrcT8U.s
 	@ASM_CMD@ -o 7zCrcT8U.o @top_srcdir@/lzma/ASM/x86/7zCrcT8U.s