Merging upstream version 1.2~pre2.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
f9513766bb
commit
efa0d5eefe
22 changed files with 804 additions and 87 deletions
19
Makefile.in
19
Makefile.in
|
@ -10,6 +10,7 @@ SHELL = /bin/sh
|
|||
objs = arg_parser.o rc.o zutils.o main.o
|
||||
zcmp_objs = arg_parser.o rc.o zutils.o zcmp.o
|
||||
zdiff_objs = arg_parser.o rc.o zutils.o zdiff.o
|
||||
zupdate_objs = arg_parser.o rc.o zutils.o zupdate.o
|
||||
scripts = zcat zegrep zfgrep zgrep ztest
|
||||
|
||||
|
||||
|
@ -17,7 +18,7 @@ scripts = zcat zegrep zfgrep zgrep ztest
|
|||
uninstall uninstall-bin uninstall-info uninstall-man \
|
||||
doc info man check dist clean distclean
|
||||
|
||||
all : $(progname) zcmp zdiff $(scripts)
|
||||
all : $(progname) zcmp zdiff zupdate $(scripts)
|
||||
|
||||
$(progname) : $(objs)
|
||||
$(CXX) $(LDFLAGS) -o $@ $(objs)
|
||||
|
@ -51,6 +52,9 @@ ztest : ztest.in
|
|||
cat $(VPATH)/ztest.in > $@
|
||||
chmod a+x ztest
|
||||
|
||||
zupdate : $(zupdate_objs)
|
||||
$(CXX) $(LDFLAGS) -o $@ $(zupdate_objs)
|
||||
|
||||
main.o : main.cc
|
||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DGREP=\"$(GREP)\" -c -o $@ $<
|
||||
|
||||
|
@ -73,6 +77,7 @@ main.o : arg_parser.h zutils.h rc.h zcat.cc zgrep.cc ztest.cc
|
|||
rc.o : arg_parser.h zutils.h rc.h
|
||||
zcmp.o : arg_parser.h zutils.h rc.h zcmpdiff.cc Makefile
|
||||
zdiff.o : arg_parser.h zutils.h rc.h zcmpdiff.cc Makefile
|
||||
zupdate.o : arg_parser.h zutils.h rc.h Makefile
|
||||
zutils.o : zutils.h rc.h
|
||||
|
||||
|
||||
|
@ -84,7 +89,7 @@ $(VPATH)/doc/$(pkgname).info : $(VPATH)/doc/$(pkgname).texinfo
|
|||
cd $(VPATH)/doc && makeinfo $(pkgname).texinfo
|
||||
|
||||
man : $(VPATH)/doc/zcat.1 $(VPATH)/doc/zcmp.1 $(VPATH)/doc/zdiff.1 \
|
||||
$(VPATH)/doc/zgrep.1 $(VPATH)/doc/ztest.1
|
||||
$(VPATH)/doc/zgrep.1 $(VPATH)/doc/ztest.1 $(VPATH)/doc/zupdate.1
|
||||
|
||||
$(VPATH)/doc/zcat.1 : $(progname) zcat
|
||||
help2man -n 'decompress and concatenate files to standard output' \
|
||||
|
@ -106,6 +111,10 @@ $(VPATH)/doc/ztest.1 : $(progname) ztest
|
|||
help2man -n 'verify integrity of compressed files' \
|
||||
-o $@ --no-info ./ztest
|
||||
|
||||
$(VPATH)/doc/zupdate.1 : zupdate
|
||||
help2man -n 'recompress bzip2, gzip, xz files to lzip files' \
|
||||
-o $@ --no-info ./zupdate
|
||||
|
||||
Makefile : $(VPATH)/configure $(VPATH)/Makefile.in
|
||||
./config.status
|
||||
|
||||
|
@ -124,6 +133,7 @@ install-bin : all
|
|||
$(INSTALL_SCRIPT) ./zfgrep "$(DESTDIR)$(bindir)/zfgrep"
|
||||
$(INSTALL_SCRIPT) ./zgrep "$(DESTDIR)$(bindir)/zgrep"
|
||||
$(INSTALL_SCRIPT) ./ztest "$(DESTDIR)$(bindir)/ztest"
|
||||
$(INSTALL_PROGRAM) ./zupdate "$(DESTDIR)$(bindir)/zupdate"
|
||||
if [ ! -e "$(DESTDIR)$(sysconfdir)/$(pkgname)rc" ] ; then \
|
||||
if [ ! -d "$(DESTDIR)$(sysconfdir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(sysconfdir)" ; fi ; \
|
||||
$(INSTALL_DATA) $(VPATH)/$(pkgname)rc "$(DESTDIR)$(sysconfdir)/$(pkgname)rc" ; \
|
||||
|
@ -141,6 +151,7 @@ install-man :
|
|||
$(INSTALL_DATA) $(VPATH)/doc/zdiff.1 "$(DESTDIR)$(mandir)/man1/zdiff.1"
|
||||
$(INSTALL_DATA) $(VPATH)/doc/zgrep.1 "$(DESTDIR)$(mandir)/man1/zgrep.1"
|
||||
$(INSTALL_DATA) $(VPATH)/doc/ztest.1 "$(DESTDIR)$(mandir)/man1/ztest.1"
|
||||
$(INSTALL_DATA) $(VPATH)/doc/zupdate.1 "$(DESTDIR)$(mandir)/man1/zupdate.1"
|
||||
|
||||
install-strip : all
|
||||
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
|
||||
|
@ -156,6 +167,7 @@ uninstall-bin :
|
|||
-rm -f "$(DESTDIR)$(bindir)/zfgrep"
|
||||
-rm -f "$(DESTDIR)$(bindir)/zgrep"
|
||||
-rm -f "$(DESTDIR)$(bindir)/ztest"
|
||||
-rm -f "$(DESTDIR)$(bindir)/zupdate"
|
||||
-rm -f "$(DESTDIR)$(sysconfdir)/$(pkgname)rc"
|
||||
|
||||
uninstall-info :
|
||||
|
@ -168,6 +180,7 @@ uninstall-man :
|
|||
-rm -f "$(DESTDIR)$(mandir)/man1/zdiff.1"
|
||||
-rm -f "$(DESTDIR)$(mandir)/man1/zgrep.1"
|
||||
-rm -f "$(DESTDIR)$(mandir)/man1/ztest.1"
|
||||
-rm -f "$(DESTDIR)$(mandir)/man1/zupdate.1"
|
||||
|
||||
dist : doc
|
||||
ln -sf $(VPATH) $(DISTNAME)
|
||||
|
@ -195,7 +208,7 @@ dist : doc
|
|||
|
||||
clean :
|
||||
-rm -f $(progname) $(progname)_profiled $(objs)
|
||||
-rm -f zcmp zcmp.o zdiff zdiff.o $(scripts)
|
||||
-rm -f zcmp zcmp.o zdiff zdiff.o zupdate zupdate.o $(scripts)
|
||||
|
||||
distclean : clean
|
||||
-rm -f Makefile config.status *.tar *.tar.lz
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue