Merging upstream version 1.1~rc2.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
24e2ea3a41
commit
e13f4df619
26 changed files with 1151 additions and 583 deletions
24
Makefile.in
24
Makefile.in
|
@ -7,9 +7,9 @@ INSTALL_DATA = $(INSTALL) -p -m 644
|
|||
INSTALL_DIR = $(INSTALL) -d -m 755
|
||||
SHELL = /bin/sh
|
||||
|
||||
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
|
||||
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
|
||||
scripts = zcat zegrep zfgrep zgrep ztest
|
||||
|
||||
|
||||
|
@ -57,6 +57,9 @@ main.o : main.cc
|
|||
zdiff.o : zdiff.cc
|
||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DDIFF=\"$(DIFF)\" -c -o $@ $<
|
||||
|
||||
rc.o : rc.cc
|
||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DSYSCONFDIR=\"$(sysconfdir)\" -c -o $@ $<
|
||||
|
||||
zutils.o : zutils.cc
|
||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<
|
||||
|
||||
|
@ -66,10 +69,11 @@ zutils.o : zutils.cc
|
|||
$(objs) : Makefile
|
||||
$(scripts) : Makefile
|
||||
arg_parser.o : arg_parser.h
|
||||
main.o : arg_parser.h zutils.h zcat.cc zgrep.cc ztest.cc
|
||||
zcmp.o : arg_parser.h zutils.h zcmpdiff.cc Makefile
|
||||
zdiff.o : arg_parser.h zutils.h zcmpdiff.cc Makefile
|
||||
zutils.o : zutils.h
|
||||
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
|
||||
zutils.o : zutils.h rc.h
|
||||
|
||||
|
||||
doc : info man
|
||||
|
@ -120,6 +124,10 @@ install-bin : all
|
|||
$(INSTALL_SCRIPT) ./zfgrep "$(DESTDIR)$(bindir)/zfgrep"
|
||||
$(INSTALL_SCRIPT) ./zgrep "$(DESTDIR)$(bindir)/zgrep"
|
||||
$(INSTALL_SCRIPT) ./ztest "$(DESTDIR)$(bindir)/ztest"
|
||||
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" ; \
|
||||
fi
|
||||
|
||||
install-info :
|
||||
if [ ! -d "$(DESTDIR)$(infodir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(infodir)" ; fi
|
||||
|
@ -148,6 +156,7 @@ uninstall-bin :
|
|||
-rm -f "$(DESTDIR)$(bindir)/zfgrep"
|
||||
-rm -f "$(DESTDIR)$(bindir)/zgrep"
|
||||
-rm -f "$(DESTDIR)$(bindir)/ztest"
|
||||
-rm -f "$(DESTDIR)$(sysconfdir)/$(pkgname)rc"
|
||||
|
||||
uninstall-info :
|
||||
-install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$(pkgname).info"
|
||||
|
@ -177,6 +186,7 @@ dist : doc
|
|||
$(DISTNAME)/testsuite/check.sh \
|
||||
$(DISTNAME)/testsuite/test.txt \
|
||||
$(DISTNAME)/testsuite/test.txt.tar \
|
||||
$(DISTNAME)/$(pkgname)rc \
|
||||
$(DISTNAME)/*.h \
|
||||
$(DISTNAME)/*.cc \
|
||||
$(DISTNAME)/z*.in
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue