From b4e85477b84918c0fb9da281cebe4eff2a50f002 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 8 Nov 2015 05:30:25 +0100 Subject: Merging upstream version 1.2~pre3. Signed-off-by: Daniel Baumann --- Makefile.in | 76 +++++++++++++++++++++++++++---------------------------------- 1 file changed, 34 insertions(+), 42 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 68b2e6b..98d2f24 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,28 +7,26 @@ INSTALL_DATA = $(INSTALL) -p -m 644 INSTALL_DIR = $(INSTALL) -d -m 755 SHELL = /bin/sh -objs = arg_parser.o rc.o zutils.o main.o +objs = arg_parser.o rc.o zutils.o \ + zcat.o zcmp.o zdiff.o zgrep.o ztest.o zupdate.o +zcat_objs = arg_parser.o rc.o zutils.o zcat.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 +zgrep_objs = arg_parser.o rc.o zutils.o zgrep.o +ztest_objs = arg_parser.o rc.o zutils.o ztest.o +zupdate_objs = arg_parser.o rc.o zupdate.o +programs = zcat zcmp zdiff zgrep ztest zupdate +scripts = zegrep zfgrep .PHONY : all install install-bin install-info install-man install-strip \ uninstall uninstall-bin uninstall-info uninstall-man \ doc info man check dist clean distclean -all : $(progname) zcmp zdiff zupdate $(scripts) +all : $(programs) $(scripts) -$(progname) : $(objs) - $(CXX) $(LDFLAGS) -o $@ $(objs) - -$(progname)_profiled : $(objs) - $(CXX) $(LDFLAGS) -pg -o $@ $(objs) - -zcat : zcat.in - cat $(VPATH)/zcat.in > $@ - chmod a+x zcat +zcat : $(zcat_objs) + $(CXX) $(LDFLAGS) -o $@ $(zcat_objs) zcmp : $(zcmp_objs) $(CXX) $(LDFLAGS) -o $@ $(zcmp_objs) @@ -44,28 +42,23 @@ zfgrep : zfgrep.in cat $(VPATH)/zfgrep.in > $@ chmod a+x zfgrep -zgrep : zgrep.in - cat $(VPATH)/zgrep.in > $@ - chmod a+x zgrep +zgrep : $(zgrep_objs) + $(CXX) $(LDFLAGS) -o $@ $(zgrep_objs) -ztest : ztest.in - cat $(VPATH)/ztest.in > $@ - chmod a+x ztest +ztest : $(ztest_objs) + $(CXX) $(LDFLAGS) -o $@ $(ztest_objs) zupdate : $(zupdate_objs) $(CXX) $(LDFLAGS) -o $@ $(zupdate_objs) -main.o : main.cc - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DGREP=\"$(GREP)\" -c -o $@ $< +rc.o : rc.cc + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -DSYSCONFDIR=\"$(sysconfdir)\" -c -o $@ $< 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 $@ $< +zgrep.o : zgrep.cc + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DGREP=\"$(GREP)\" -c -o $@ $< %.o : %.cc $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< @@ -73,12 +66,14 @@ zutils.o : zutils.cc $(objs) : Makefile $(scripts) : Makefile arg_parser.o : arg_parser.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 -zupdate.o : arg_parser.h zutils.h rc.h Makefile -zutils.o : zutils.h rc.h +rc.o : arg_parser.h rc.h +zcat.o : arg_parser.h rc.h zutils.h recursive.cc +zcmp.o : arg_parser.h rc.h zutils.h zcmpdiff.cc +zdiff.o : arg_parser.h rc.h zutils.h zcmpdiff.cc +zgrep.o : arg_parser.h rc.h zutils.h recursive.cc +ztest.o : arg_parser.h rc.h zutils.h recursive.cc +zupdate.o : arg_parser.h rc.h recursive.cc +zutils.o : rc.h zutils.h doc : info man @@ -91,7 +86,7 @@ $(VPATH)/doc/$(pkgname).info : $(VPATH)/doc/$(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/zupdate.1 -$(VPATH)/doc/zcat.1 : $(progname) zcat +$(VPATH)/doc/zcat.1 : zcat help2man -n 'decompress and concatenate files to standard output' \ -o $@ --no-info ./zcat @@ -103,11 +98,11 @@ $(VPATH)/doc/zdiff.1 : zdiff help2man -n 'decompress and compare two files line by line' \ -o $@ --no-info ./zdiff -$(VPATH)/doc/zgrep.1 : $(progname) zgrep +$(VPATH)/doc/zgrep.1 : zgrep help2man -n 'search compressed files for a regular expression' \ -o $@ --no-info ./zgrep -$(VPATH)/doc/ztest.1 : $(progname) ztest +$(VPATH)/doc/ztest.1 : ztest help2man -n 'verify integrity of compressed files' \ -o $@ --no-info ./ztest @@ -125,14 +120,13 @@ install : install-bin install-info install-man install-bin : all if [ ! -d "$(DESTDIR)$(bindir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ; fi - $(INSTALL_PROGRAM) ./$(progname) "$(DESTDIR)$(bindir)/$(progname)" - $(INSTALL_SCRIPT) ./zcat "$(DESTDIR)$(bindir)/zcat" + $(INSTALL_PROGRAM) ./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_PROGRAM) ./zgrep "$(DESTDIR)$(bindir)/zgrep" + $(INSTALL_PROGRAM) ./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 ; \ @@ -159,7 +153,6 @@ install-strip : all uninstall : uninstall-bin uninstall-info uninstall-man uninstall-bin : - -rm -f "$(DESTDIR)$(bindir)/$(progname)" -rm -f "$(DESTDIR)$(bindir)/zcat" -rm -f "$(DESTDIR)$(bindir)/zcmp" -rm -f "$(DESTDIR)$(bindir)/zdiff" @@ -207,8 +200,7 @@ dist : doc lzip -v -9 $(DISTNAME).tar clean : - -rm -f $(progname) $(progname)_profiled $(objs) - -rm -f zcmp zcmp.o zdiff zdiff.o zupdate zupdate.o $(scripts) + -rm -f $(programs) $(scripts) $(objs) distclean : clean -rm -f Makefile config.status *.tar *.tar.lz -- cgit v1.2.3