Merging upstream version 1.13~rc1.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 3 insertions, 21 deletions

diff --git a/Makefile.in b/Makefile.in
index 30aba74..98a9a98 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,6 @@ INSTALL_DIR = $(INSTALL) -d -m 755
 SHELL = /bin/sh
 
 objs = arg_parser.o decoder.o encoder.o fast_encoder.o main.o
-recobjs = arg_parser.o decoder.o lziprecover.o
 unzobjs = arg_parser.o unzcrash.o
 
 
@@ -15,7 +14,7 @@ unzobjs = arg_parser.o unzcrash.o
          uninstall uninstall-info uninstall-man \
          doc info man check dist clean distclean
 
-all : $(progname) lziprecover
+all : $(progname)
 
 $(progname) : $(objs)
 	$(CXX) $(LDFLAGS) -o $@ $(objs)
@@ -23,18 +22,12 @@ $(progname) : $(objs)
 $(progname)_profiled : $(objs)
 	$(CXX) $(LDFLAGS) -pg -o $@ $(objs)
 
-lziprecover : $(recobjs)
-	$(CXX) $(LDFLAGS) -o $@ $(recobjs)
-
 unzcrash : $(unzobjs)
 	$(CXX) $(LDFLAGS) -o $@ $(unzobjs)
 
 main.o : main.cc
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<
 
-lziprecover.o : lziprecover.cc
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<
-
 unzcrash.o : testsuite/unzcrash.cc
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<
 
@@ -47,7 +40,6 @@ decoder.o      : lzip.h decoder.h
 encoder.o      : lzip.h encoder.h
 fast_encoder.o : lzip.h encoder.h fast_encoder.h
 main.o         : arg_parser.h lzip.h decoder.h encoder.h fast_encoder.h
-lziprecover.o  : arg_parser.h lzip.h decoder.h Makefile
 unzcrash.o     : arg_parser.h Makefile
 
 
@@ -58,16 +50,12 @@ info : $(VPATH)/doc/$(pkgname).info
 $(VPATH)/doc/$(pkgname).info : $(VPATH)/doc/$(pkgname).texinfo
 	cd $(VPATH)/doc && makeinfo $(pkgname).texinfo
 
-man : $(VPATH)/doc/$(progname).1 $(VPATH)/doc/lziprecover.1
+man : $(VPATH)/doc/$(progname).1
 
 $(VPATH)/doc/$(progname).1 : $(progname)
 	help2man -n 'reduces the size of files' \
 	  -o $@ ./$(progname)
 
-$(VPATH)/doc/lziprecover.1 : lziprecover
-	help2man -n 'recovers data from damaged lzip files' \
-	  -o $@ --no-info ./lziprecover
-
 Makefile : $(VPATH)/configure $(VPATH)/Makefile.in
 	./config.status
 
@@ -77,7 +65,6 @@ check : all
 install : all install-info install-man
 	if [ ! -d "$(DESTDIR)$(bindir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ; fi
 	$(INSTALL_PROGRAM) ./$(progname) "$(DESTDIR)$(bindir)/$(progname)"
-	$(INSTALL_PROGRAM) ./lziprecover "$(DESTDIR)$(bindir)/lziprecover"
 
 install-info :
 	if [ ! -d "$(DESTDIR)$(infodir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(infodir)" ; fi
@@ -87,14 +74,12 @@ install-info :
 install-man :
 	if [ ! -d "$(DESTDIR)$(mandir)/man1" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" ; fi
 	$(INSTALL_DATA) $(VPATH)/doc/$(progname).1 "$(DESTDIR)$(mandir)/man1/$(progname).1"
-	$(INSTALL_DATA) $(VPATH)/doc/lziprecover.1 "$(DESTDIR)$(mandir)/man1/lziprecover.1"
 
 install-strip : all
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
 uninstall : uninstall-info uninstall-man
 	-rm -f "$(DESTDIR)$(bindir)/$(progname)"
-	-rm -f "$(DESTDIR)$(bindir)/lziprecover"
 
 uninstall-info :
 	-install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$(pkgname).info"
@@ -102,7 +87,6 @@ uninstall-info :
 
 uninstall-man :
 	-rm -f "$(DESTDIR)$(mandir)/man1/$(progname).1"
-	-rm -f "$(DESTDIR)$(mandir)/man1/lziprecover.1"
 
 dist : doc
 	ln -sf $(VPATH) $(DISTNAME)
@@ -116,12 +100,10 @@ dist : doc
 	  $(DISTNAME)/README \
 	  $(DISTNAME)/configure \
 	  $(DISTNAME)/doc/$(progname).1 \
-	  $(DISTNAME)/doc/lziprecover.1 \
 	  $(DISTNAME)/doc/$(pkgname).info \
 	  $(DISTNAME)/doc/$(pkgname).texinfo \
 	  $(DISTNAME)/testsuite/check.sh \
 	  $(DISTNAME)/testsuite/test.txt \
-	  $(DISTNAME)/testsuite/test_bad[1-5].lz \
 	  $(DISTNAME)/testsuite/test_sync.lz \
 	  $(DISTNAME)/testsuite/test_v[01].lz \
 	  $(DISTNAME)/testsuite/unzcrash.cc \
@@ -132,7 +114,7 @@ dist : doc
 
 clean :
 	-rm -f $(progname) $(progname)_profiled $(objs)
-	-rm -f lziprecover lziprecover.o unzcrash unzcrash.o
+	-rm -f unzcrash unzcrash.o
 
 distclean : clean
 	-rm -f Makefile config.status *.tar *.tar.lz