Fix failed build on make distdir.

This commit is contained in:
ckolivas 2011-03-08 13:06:24 +11:00
parent 59e5bc0492
commit 6e72b520a9
5 changed files with 30 additions and 5 deletions

View file

@ -21,7 +21,7 @@ m4/ltoptions.m4 \
m4/ltsugar.m4 \ m4/ltsugar.m4 \
m4/ltversion.m4 m4/ltversion.m4
SUBDIRS = lzma man SUBDIRS = lzma man doc
AM_CFLAGS = -I lzma/C -DNDEBUG AM_CFLAGS = -I lzma/C -DNDEBUG
@ -32,14 +32,15 @@ bin_PROGRAMS = lrzip
lrzip_SOURCES = \ lrzip_SOURCES = \
zpipe.cpp \ zpipe.cpp \
main.c \ main.c \
rzip.h \
rzip.c \ rzip.c \
runzip.c \ runzip.c \
stream.c \ stream.c \
util.c \ util.c \
md5.c md5.c \
md5.h
lrzip_LDADD = lzma/C/liblzma.la lrzip_LDADD = lzma/C/liblzma.la
dist_doc_DATA = \ dist_doc_DATA = \
AUTHORS \ AUTHORS \
BUGS \ BUGS \
@ -50,3 +51,10 @@ dist_doc_DATA = \
TODO \ TODO \
WHATS-NEW WHATS-NEW
EXTRA_DIST = \
lrztar \
regression_test.sh \
description-pak \
autogen.sh \
INSTALL \
$(dist_doc_DATA)

View file

@ -6,7 +6,7 @@ rm -f "${bs_dir}"/aclocal.m4 "${bs_dir}"/ltmain.sh
echo 'Running autoreconf -if...' echo 'Running autoreconf -if...'
autoreconf -if || exit 1 autoreconf -if || exit 1
if test -n "$NOCONFIGURE" ; then if test -z "$NOCONFIGURE" ; then
echo 'Configuring...' echo 'Configuring...'
cd "${bs_dir}" &> /dev/null cd "${bs_dir}" &> /dev/null
test "$?" = "0" || e=1 test "$?" = "0" || e=1

View file

@ -5,12 +5,25 @@ ASM_S =
if USE_ASM if USE_ASM
ASM_LIBS += @ASM_OBJ@ ASM_LIBS += @ASM_OBJ@
else else
ASM_S += 7zCrc.c ASM_S += 7zCrc.c 7zCrc.h
endif endif
noinst_LTLIBRARIES = liblzma.la noinst_LTLIBRARIES = liblzma.la
liblzma_la_SOURCES = \ liblzma_la_SOURCES = \
$(ASM_S) \ $(ASM_S) \
Alloc.h \
basetyps.h \
LzFind.h \
LzFindMt.h \
LzHash.h \
LzmaDec.h \
LzmaEnc.h \
LzmaLib.h \
MyGuidDef.h \
MyWindows.h \
Threads.h \
Types.h \
windows.h \
Threads.c \ Threads.c \
LzFind.c \ LzFind.c \
LzFindMt.c \ LzFindMt.c \

View file

@ -10,3 +10,5 @@ lzmadoc_DATA = \
lzma.txt \ lzma.txt \
README \ README \
README-Alloc README-Alloc
EXTRA_DIST = $(lzmadoc_DATA)

View file

@ -2,3 +2,5 @@ MAINTAINERCLEANFILES = Makefile.in lrunzip.1 lrztar.1 lrzuntar.1
man1_MANS = lrzip.1 lrunzip.1.pod lrztar.1.pod lrzuntar.1.pod man1_MANS = lrzip.1 lrunzip.1.pod lrztar.1.pod lrzuntar.1.pod
man5_MANS = lrzip.conf.5 man5_MANS = lrzip.conf.5
EXTRA_DIST = $(man1_MANS) $(man5_MANS)