Merging upstream version 0.8.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
98e6c48a6e
commit
b0726a989b
32 changed files with 3798 additions and 1551 deletions
159
Makefile.in
159
Makefile.in
|
@ -1,5 +1,5 @@
|
|||
|
||||
DISTNAME = $(progname)-$(progversion)
|
||||
DISTNAME = $(pkgname)-$(pkgversion)
|
||||
INSTALL = install
|
||||
INSTALL_PROGRAM = $(INSTALL) -p -m 755
|
||||
INSTALL_SCRIPT = $(INSTALL) -p -m 755
|
||||
|
@ -7,33 +7,33 @@ INSTALL_DATA = $(INSTALL) -p -m 644
|
|||
INSTALL_DIR = $(INSTALL) -d -m 755
|
||||
SHELL = /bin/sh
|
||||
|
||||
objs = arg_parser.o main.o
|
||||
scripts = zcat zcmp zdiff zegrep zfgrep zgrep ztest
|
||||
objs = arg_parser.o zutils.o main.o
|
||||
zcmp_objs = arg_parser.o zutils.o zcmp.o
|
||||
zdiff_objs = arg_parser.o zutils.o zdiff.o
|
||||
scripts = zcat zegrep zfgrep zgrep ztest
|
||||
|
||||
|
||||
.PHONY : all install install-info install-man install-strip \
|
||||
uninstall uninstall-info uninstall-man \
|
||||
doc info man check dist clean distclean
|
||||
|
||||
all : $(progname) $(scripts)
|
||||
all : $(progname) zcmp zdiff $(scripts)
|
||||
|
||||
$(progname) : $(objs)
|
||||
$(CXX) $(LDFLAGS) -o $(progname) $(objs)
|
||||
$(CXX) $(LDFLAGS) -o $@ $(objs)
|
||||
|
||||
$(progname)_profiled : $(objs)
|
||||
$(CXX) $(LDFLAGS) -pg -o $(progname)_profiled $(objs)
|
||||
$(CXX) $(LDFLAGS) -pg -o $@ $(objs)
|
||||
|
||||
zcat : zcat.in
|
||||
sed -e 's,VERSION,$(progversion),g' $(VPATH)/zcat.in > zcat
|
||||
cat $(VPATH)/zcat.in > zcat
|
||||
chmod a+x zcat
|
||||
|
||||
zcmp : zcmp.in
|
||||
cat $(VPATH)/zcmp.in > zcmp
|
||||
chmod a+x zcmp
|
||||
zcmp : $(zcmp_objs)
|
||||
$(CXX) $(LDFLAGS) -o $@ $(zcmp_objs)
|
||||
|
||||
zdiff : zdiff.in
|
||||
sed -e 's,VERSION,$(progversion),g' $(VPATH)/zdiff.in > zdiff
|
||||
chmod a+x zdiff
|
||||
zdiff : $(zdiff_objs)
|
||||
$(CXX) $(LDFLAGS) -o $@ $(zdiff_objs)
|
||||
|
||||
zegrep : zegrep.in
|
||||
cat $(VPATH)/zegrep.in > zegrep
|
||||
|
@ -44,15 +44,15 @@ zfgrep : zfgrep.in
|
|||
chmod a+x zfgrep
|
||||
|
||||
zgrep : zgrep.in
|
||||
sed -e 's,VERSION,$(progversion),g' $(VPATH)/zgrep.in > zgrep
|
||||
cat $(VPATH)/zgrep.in > zgrep
|
||||
chmod a+x zgrep
|
||||
|
||||
ztest : ztest.in
|
||||
sed -e 's,VERSION,$(progversion),g' $(VPATH)/ztest.in > ztest
|
||||
cat $(VPATH)/ztest.in > ztest
|
||||
chmod a+x ztest
|
||||
|
||||
main.o : main.cc
|
||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(progversion)\" -c -o $@ $<
|
||||
zutils.o : zutils.cc
|
||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<
|
||||
|
||||
%.o : %.cc
|
||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
|
||||
|
@ -60,96 +60,100 @@ main.o : main.cc
|
|||
$(objs) : Makefile
|
||||
$(scripts) : Makefile
|
||||
arg_parser.o : arg_parser.h
|
||||
main.o : arg_parser.h
|
||||
main.o : arg_parser.h zutils.h zcat.cc zgrep.cc ztest.cc
|
||||
zcmp.o : arg_parser.h zutils.h Makefile
|
||||
zdiff.o : arg_parser.h zutils.h Makefile
|
||||
zutils.o : zutils.h
|
||||
|
||||
doc : info man
|
||||
|
||||
info : $(VPATH)/doc/$(progname).info
|
||||
info : $(VPATH)/doc/$(pkgname).info
|
||||
|
||||
$(VPATH)/doc/$(progname).info : $(VPATH)/doc/$(progname).texinfo
|
||||
cd $(VPATH)/doc && makeinfo $(progname).texinfo
|
||||
$(VPATH)/doc/$(pkgname).info : $(VPATH)/doc/$(pkgname).texinfo
|
||||
cd $(VPATH)/doc && makeinfo $(pkgname).texinfo
|
||||
|
||||
man : $(VPATH)/doc/zcat.1 $(VPATH)/doc/zdiff.1 \
|
||||
man : $(VPATH)/doc/zcat.1 $(VPATH)/doc/zcmp.1 $(VPATH)/doc/zdiff.1 \
|
||||
$(VPATH)/doc/zgrep.1 $(VPATH)/doc/ztest.1
|
||||
|
||||
$(VPATH)/doc/zcat.1 : zcat
|
||||
help2man -n 'concatenate compressed files to stdout' \
|
||||
-o $(VPATH)/doc/zcat.1 --no-info ./zcat
|
||||
$(VPATH)/doc/zcat.1 : $(progname) zcat
|
||||
help2man -n 'decompress and concatenate files to standard output' \
|
||||
-o $@ --no-info ./zcat
|
||||
|
||||
$(VPATH)/doc/zcmp.1 : zcmp
|
||||
help2man -n 'decompress and compare two files byte by byte' \
|
||||
-o $@ --no-info ./zcmp
|
||||
|
||||
$(VPATH)/doc/zdiff.1 : zdiff
|
||||
help2man -n 'compare compressed files' \
|
||||
-o $(VPATH)/doc/zdiff.1 --no-info ./zdiff
|
||||
help2man -n 'decompress and compare two files line by line' \
|
||||
-o $@ --no-info ./zdiff
|
||||
|
||||
$(VPATH)/doc/zgrep.1 : zgrep
|
||||
$(VPATH)/doc/zgrep.1 : $(progname) zgrep
|
||||
help2man -n 'search compressed files for a regular expression' \
|
||||
-o $(VPATH)/doc/zgrep.1 --no-info ./zgrep
|
||||
-o $@ --no-info ./zgrep
|
||||
|
||||
$(VPATH)/doc/ztest.1 : ztest
|
||||
$(VPATH)/doc/ztest.1 : $(progname) ztest
|
||||
help2man -n 'verify integrity of compressed files' \
|
||||
-o $(VPATH)/doc/ztest.1 --no-info ./ztest
|
||||
-o $@ --no-info ./ztest
|
||||
|
||||
Makefile : $(VPATH)/configure $(VPATH)/Makefile.in
|
||||
./config.status
|
||||
|
||||
check : all $(VPATH)/testsuite/check.sh
|
||||
@$(VPATH)/testsuite/check.sh $(VPATH)/testsuite
|
||||
check : all
|
||||
@$(VPATH)/testsuite/check.sh $(VPATH)/testsuite $(pkgversion)
|
||||
|
||||
install : all install-info install-man
|
||||
if [ ! -d $(DESTDIR)$(bindir) ] ; then $(INSTALL_DIR) $(DESTDIR)$(bindir) ; fi
|
||||
$(INSTALL_PROGRAM) ./$(progname) $(DESTDIR)$(bindir)/$(progname)
|
||||
$(INSTALL_SCRIPT) zcat $(DESTDIR)$(bindir)/zcat
|
||||
$(INSTALL_SCRIPT) zcmp $(DESTDIR)$(bindir)/zcmp
|
||||
$(INSTALL_SCRIPT) zdiff $(DESTDIR)$(bindir)/zdiff
|
||||
$(INSTALL_SCRIPT) zegrep $(DESTDIR)$(bindir)/zegrep
|
||||
$(INSTALL_SCRIPT) zfgrep $(DESTDIR)$(bindir)/zfgrep
|
||||
$(INSTALL_SCRIPT) zgrep $(DESTDIR)$(bindir)/zgrep
|
||||
$(INSTALL_SCRIPT) ztest $(DESTDIR)$(bindir)/ztest
|
||||
if [ ! -d "$(DESTDIR)$(bindir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ; fi
|
||||
$(INSTALL_PROGRAM) ./$(progname) "$(DESTDIR)$(bindir)/$(progname)"
|
||||
$(INSTALL_SCRIPT) ./zcat "$(DESTDIR)$(bindir)/zcat"
|
||||
$(INSTALL_PROGRAM) ./zcmp "$(DESTDIR)$(bindir)/zcmp"
|
||||
$(INSTALL_PROGRAM) ./zdiff "$(DESTDIR)$(bindir)/zdiff"
|
||||
$(INSTALL_SCRIPT) ./zegrep "$(DESTDIR)$(bindir)/zegrep"
|
||||
$(INSTALL_SCRIPT) ./zfgrep "$(DESTDIR)$(bindir)/zfgrep"
|
||||
$(INSTALL_SCRIPT) ./zgrep "$(DESTDIR)$(bindir)/zgrep"
|
||||
$(INSTALL_SCRIPT) ./ztest "$(DESTDIR)$(bindir)/ztest"
|
||||
|
||||
install-info :
|
||||
if [ ! -d $(DESTDIR)$(infodir) ] ; then $(INSTALL_DIR) $(DESTDIR)$(infodir) ; fi
|
||||
$(INSTALL_DATA) $(VPATH)/doc/$(progname).info $(DESTDIR)$(infodir)/$(progname).info
|
||||
-install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$(progname).info
|
||||
if [ ! -d "$(DESTDIR)$(infodir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(infodir)" ; fi
|
||||
$(INSTALL_DATA) $(VPATH)/doc/$(pkgname).info "$(DESTDIR)$(infodir)/$(pkgname).info"
|
||||
-install-info --info-dir="$(DESTDIR)$(infodir)" $(DESTDIR)$(infodir)/$(pkgname).info
|
||||
|
||||
install-man :
|
||||
if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then $(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 ; fi
|
||||
$(INSTALL_DATA) $(VPATH)/doc/zcat.1 $(DESTDIR)$(mandir)/man1/zcat.1
|
||||
-rm -f $(DESTDIR)$(mandir)/man1/zcmp.1
|
||||
cd $(DESTDIR)$(mandir)/man1 && ln -s zdiff.1 zcmp.1
|
||||
$(INSTALL_DATA) $(VPATH)/doc/zdiff.1 $(DESTDIR)$(mandir)/man1/zdiff.1
|
||||
$(INSTALL_DATA) $(VPATH)/doc/zgrep.1 $(DESTDIR)$(mandir)/man1/zgrep.1
|
||||
-rm -f $(DESTDIR)$(mandir)/man1/zegrep.1
|
||||
-rm -f $(DESTDIR)$(mandir)/man1/zfgrep.1
|
||||
cd $(DESTDIR)$(mandir)/man1 && ln -s zgrep.1 zegrep.1
|
||||
cd $(DESTDIR)$(mandir)/man1 && ln -s zgrep.1 zfgrep.1
|
||||
$(INSTALL_DATA) $(VPATH)/doc/ztest.1 $(DESTDIR)$(mandir)/man1/ztest.1
|
||||
if [ ! -d "$(DESTDIR)$(mandir)/man1" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" ; fi
|
||||
$(INSTALL_DATA) $(VPATH)/doc/zcat.1 "$(DESTDIR)$(mandir)/man1/zcat.1"
|
||||
$(INSTALL_DATA) $(VPATH)/doc/zcmp.1 "$(DESTDIR)$(mandir)/man1/zcmp.1"
|
||||
$(INSTALL_DATA) $(VPATH)/doc/zdiff.1 "$(DESTDIR)$(mandir)/man1/zdiff.1"
|
||||
$(INSTALL_DATA) $(VPATH)/doc/zgrep.1 "$(DESTDIR)$(mandir)/man1/zgrep.1"
|
||||
-rm -f "$(DESTDIR)$(mandir)/man1/zegrep.1"
|
||||
-rm -f "$(DESTDIR)$(mandir)/man1/zfgrep.1"
|
||||
$(INSTALL_DATA) $(VPATH)/doc/ztest.1 "$(DESTDIR)$(mandir)/man1/ztest.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)/zcat
|
||||
-rm -f $(DESTDIR)$(bindir)/zcmp
|
||||
-rm -f $(DESTDIR)$(bindir)/zdiff
|
||||
-rm -f $(DESTDIR)$(bindir)/zegrep
|
||||
-rm -f $(DESTDIR)$(bindir)/zfgrep
|
||||
-rm -f $(DESTDIR)$(bindir)/zgrep
|
||||
-rm -f $(DESTDIR)$(bindir)/ztest
|
||||
-rm -f "$(DESTDIR)$(bindir)/$(progname)"
|
||||
-rm -f "$(DESTDIR)$(bindir)/zcat"
|
||||
-rm -f "$(DESTDIR)$(bindir)/zcmp"
|
||||
-rm -f "$(DESTDIR)$(bindir)/zdiff"
|
||||
-rm -f "$(DESTDIR)$(bindir)/zegrep"
|
||||
-rm -f "$(DESTDIR)$(bindir)/zfgrep"
|
||||
-rm -f "$(DESTDIR)$(bindir)/zgrep"
|
||||
-rm -f "$(DESTDIR)$(bindir)/ztest"
|
||||
|
||||
uninstall-info :
|
||||
-install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$(progname).info
|
||||
-rm -f $(DESTDIR)$(infodir)/$(progname).info
|
||||
-install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$(pkgname).info"
|
||||
-rm -f "$(DESTDIR)$(infodir)/$(pkgname).info"
|
||||
|
||||
uninstall-man :
|
||||
-rm -f $(DESTDIR)$(mandir)/man1/zcat.1
|
||||
-rm -f $(DESTDIR)$(mandir)/man1/zcmp.1
|
||||
-rm -f $(DESTDIR)$(mandir)/man1/zdiff.1
|
||||
-rm -f $(DESTDIR)$(mandir)/man1/zegrep.1
|
||||
-rm -f $(DESTDIR)$(mandir)/man1/zfgrep.1
|
||||
-rm -f $(DESTDIR)$(mandir)/man1/zgrep.1
|
||||
-rm -f $(DESTDIR)$(mandir)/man1/ztest.1
|
||||
-rm -f "$(DESTDIR)$(mandir)/man1/zcat.1"
|
||||
-rm -f "$(DESTDIR)$(mandir)/man1/zcmp.1"
|
||||
-rm -f "$(DESTDIR)$(mandir)/man1/zdiff.1"
|
||||
-rm -f "$(DESTDIR)$(mandir)/man1/zegrep.1"
|
||||
-rm -f "$(DESTDIR)$(mandir)/man1/zfgrep.1"
|
||||
-rm -f "$(DESTDIR)$(mandir)/man1/zgrep.1"
|
||||
-rm -f "$(DESTDIR)$(mandir)/man1/ztest.1"
|
||||
|
||||
dist :
|
||||
dist : doc
|
||||
ln -sf $(VPATH) $(DISTNAME)
|
||||
tar -cvf $(DISTNAME).tar \
|
||||
$(DISTNAME)/AUTHORS \
|
||||
|
@ -161,9 +165,10 @@ dist :
|
|||
$(DISTNAME)/README \
|
||||
$(DISTNAME)/configure \
|
||||
$(DISTNAME)/doc/*.1 \
|
||||
$(DISTNAME)/doc/$(progname).info \
|
||||
$(DISTNAME)/doc/$(progname).texinfo \
|
||||
$(DISTNAME)/doc/$(pkgname).info \
|
||||
$(DISTNAME)/doc/$(pkgname).texinfo \
|
||||
$(DISTNAME)/testsuite/check.sh \
|
||||
$(DISTNAME)/testsuite/test.txt \
|
||||
$(DISTNAME)/*.h \
|
||||
$(DISTNAME)/*.cc \
|
||||
$(DISTNAME)/z*.in
|
||||
|
@ -172,7 +177,7 @@ dist :
|
|||
|
||||
clean :
|
||||
-rm -f $(progname) $(progname)_profiled $(objs)
|
||||
-rm -f $(scripts)
|
||||
-rm -f zcmp zcmp.o zdiff zdiff.o $(scripts)
|
||||
|
||||
distclean : clean
|
||||
-rm -f Makefile config.status *.tar *.tar.lz
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue