Merging upstream version 0.4.

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

1 files changed, 67 insertions, 24 deletions

diff --git a/Makefile.in b/Makefile.in
index c93cf1a..23330c1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 
-DISTNAME = $(pkgname)-$(pkgversion)
+DISTNAME = $(progname)-$(progversion)
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL) -p -m 755
 INSTALL_SCRIPT = $(INSTALL) -p -m 755
@@ -7,17 +7,24 @@ INSTALL_DATA = $(INSTALL) -p -m 644
 INSTALL_DIR = $(INSTALL) -d -m 755
 SHELL = /bin/sh
 
-scripts = zcat zcmp zdiff zgrep
+objs = arg_parser.o main.o
+scripts = zcat zcmp zdiff zegrep zfgrep zgrep
 
 
 .PHONY : all install install-info install-man install-strip \
          uninstall uninstall-info uninstall-man \
          doc info man check dist clean distclean
 
-all : $(scripts)
+all : $(progname) $(scripts)
+
+$(progname) : $(objs)
+	$(CXX) $(LDFLAGS) -o $(progname) $(objs)
+
+$(progname)_profiled : $(objs)
+	$(CXX) $(LDFLAGS) -pg -o $(progname)_profiled $(objs)
 
 zcat : zcat.in
-	sed -e 's|VERSION|$(pkgversion)|g' $(VPATH)/zcat.in > zcat
+	sed -e 's,VERSION,$(progversion),g' $(VPATH)/zcat.in > zcat
 	chmod a+x zcat
 
 zcmp : zcmp.in
@@ -25,23 +32,44 @@ zcmp : zcmp.in
 	chmod a+x zcmp
 
 zdiff : zdiff.in
-	sed -e 's|VERSION|$(pkgversion)|g' $(VPATH)/zdiff.in > zdiff
+	sed -e 's,VERSION,$(progversion),g' $(VPATH)/zdiff.in > zdiff
 	chmod a+x zdiff
 
+zegrep : zegrep.in
+	cat $(VPATH)/zegrep.in > zegrep
+	chmod a+x zegrep
+
+zfgrep : zfgrep.in
+	cat $(VPATH)/zfgrep.in > zfgrep
+	chmod a+x zfgrep
+
 zgrep : zgrep.in
-	sed -e 's|VERSION|$(pkgversion)|g' $(VPATH)/zgrep.in > zgrep
+	sed -e 's,VERSION,$(progversion),g' $(VPATH)/zgrep.in > zgrep
 	chmod a+x zgrep
 
-$(scripts) : Makefile
+main.o : main.cc
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(progversion)\" -c -o $@ $<
+
+%.o : %.cc
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+
+$(objs)      : Makefile
+$(scripts)   : Makefile
+arg_parser.o : arg_parser.h
+main.o       : arg_parser.h
 
 doc : info man
 
-info : $(VPATH)/doc/$(pkgname).info
+info : $(VPATH)/doc/$(progname).info
 
-$(VPATH)/doc/$(pkgname).info : $(VPATH)/doc/$(pkgname).texinfo
-	cd $(VPATH)/doc && makeinfo $(pkgname).texinfo
+$(VPATH)/doc/$(progname).info : $(VPATH)/doc/$(progname).texinfo
+	cd $(VPATH)/doc && makeinfo $(progname).texinfo
 
-man : $(VPATH)/doc/zcat.1 $(VPATH)/doc/zdiff.1 $(VPATH)/doc/zgrep.1
+man : $(VPATH)/doc/$(progname).1 $(VPATH)/doc/zcat.1 $(VPATH)/doc/zdiff.1 \
+      $(VPATH)/doc/zgrep.1
+
+$(VPATH)/doc/$(progname).1 : $(progname)
+	help2man -o $(VPATH)/doc/$(progname).1 ./$(progname)
 
 $(VPATH)/doc/zcat.1 : zcat
 	help2man -o $(VPATH)/doc/zcat.1 --no-info ./zcat
@@ -60,38 +88,55 @@ check : all $(VPATH)/testsuite/check.sh
 
 install : all install-info install-man
 	if test ! -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-info :
 	if test ! -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_DATA) $(VPATH)/doc/$(progname).info $(DESTDIR)$(infodir)/$(progname).info
+	-install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$(progname).info
 
 install-man :
 	if test ! -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/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-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
 
 uninstall-info :
-	-install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$(pkgname).info
-	-rm -f $(DESTDIR)$(infodir)/$(pkgname).info
+	-install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$(progname).info
+	-rm -f $(DESTDIR)$(infodir)/$(progname).info
 
 uninstall-man :
+	-rm -f $(DESTDIR)$(mandir)/man1/$(progname).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
 
 dist :
@@ -105,20 +150,18 @@ dist :
 	  $(DISTNAME)/NEWS \
 	  $(DISTNAME)/README \
 	  $(DISTNAME)/configure \
-	  $(DISTNAME)/doc/zcat.1 \
-	  $(DISTNAME)/doc/zdiff.1 \
-	  $(DISTNAME)/doc/zgrep.1 \
-	  $(DISTNAME)/doc/$(pkgname).info \
-	  $(DISTNAME)/doc/$(pkgname).texinfo \
+	  $(DISTNAME)/doc/*.1 \
+	  $(DISTNAME)/doc/$(progname).info \
+	  $(DISTNAME)/doc/$(progname).texinfo \
 	  $(DISTNAME)/testsuite/check.sh \
-	  $(DISTNAME)/zcat.in \
-	  $(DISTNAME)/zcmp.in \
-	  $(DISTNAME)/zdiff.in \
-	  $(DISTNAME)/zgrep.in
+	  $(DISTNAME)/*.h \
+	  $(DISTNAME)/*.cc \
+	  $(DISTNAME)/z*.in
 	rm -f $(DISTNAME)
 	lzip -v -9 $(DISTNAME).tar
 
 clean :
+	-rm -f $(progname) $(progname)_profiled $(objs)
 	-rm -f $(scripts)
 
 distclean : clean