Removed unsigned/signed mismatches.

[pg-rex/syncrep.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 521b47b..56a42ad 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,7 +1,7 @@
 #
 # PostgreSQL top level makefile
 #
-# $PostgreSQL: pgsql/GNUmakefile.in,v 1.44 2006/04/06 18:54:36 petere Exp $
+# $PostgreSQL: pgsql/GNUmakefile.in,v 1.50 2009/01/15 01:53:49 momjian Exp $
 #
 
 subdir =
@@ -44,17 +44,17 @@ clean:
 # Important: distclean `src' last, otherwise Makefile.global
 # will be gone too soon.
 distclean maintainer-clean:
-       -$(MAKE) -C doc $@
-       -$(MAKE) -C contrib $@
-       -$(MAKE) -C config $@
-       -$(MAKE) -C src $@
-       -rm -f config.cache config.log config.status GNUmakefile
+       $(MAKE) -C doc $@
+       $(MAKE) -C contrib $@
+       $(MAKE) -C config $@
+       $(MAKE) -C src $@
+       rm -f config.cache config.log config.status GNUmakefile
 # Garbage from autoconf:
        @rm -rf autom4te.cache/
 
 check: all
 
-check installcheck:
+check installcheck installcheck-parallel:
        $(MAKE) -C src/test $@
 
 GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
@@ -63,25 +63,44 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
 
 ##########################################################################
 
-distdir        := postgresql-$(VERSION)
-dummy  := =install=
-garbage := =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
+coverage:
+       $(MAKE) -C src/backend $@
+
+.PHONY: coverage-html
+coverage-html: coverage
+       rm -rf coverage
+       mkdir coverage
+       $(GENHTML) --show-details --legend --output-directory=coverage --title=PostgreSQL --num-spaces=4 --prefix=$(abs_top_srcdir)/src `find src/backend -name lcov.info -print`
+
+ifeq ($(enable_coverage),yes)
+clean distclean maintainer-clean: clean-coverage-local
+.PHONY: clean-coverage-local
+clean-coverage-local:
+       rm -rf coverage
+endif
+
+
+##########################################################################
+
+distdir        = postgresql-$(VERSION)
+dummy  = =install=
+garbage = =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
 
 dist: $(distdir).tar.gz 
 ifeq ($(split-dist), yes)
 dist: postgresql-base-$(VERSION).tar.gz postgresql-docs-$(VERSION).tar.gz postgresql-opt-$(VERSION).tar.gz postgresql-test-$(VERSION).tar.gz 
 endif
 dist:
-       -rm -rf $(distdir)
+       rm -rf $(distdir)
 
 $(distdir).tar: distdir
        $(TAR) chf $@ $(distdir)
 
-opt_files := \
+opt_files = \
        src/tools src/tutorial \
        $(addprefix src/pl/, plperl plpython tcl)
 
-docs_files := doc/postgres.tar.gz doc/src doc/TODO.detail
+docs_files = doc/postgres.tar.gz doc/src doc/TODO.detail
 
 postgresql-base-$(VERSION).tar: distdir
        $(TAR) -c $(addprefix --exclude $(distdir)/, $(docs_files) $(opt_files) src/test) \
@@ -97,8 +116,8 @@ postgresql-test-$(VERSION).tar: distdir
        $(TAR) cf $@ $(distdir)/src/test
 
 distdir:
-       -rm -rf $(distdir)* $(dummy)
-       for x in `cd $(top_srcdir) && find . -name CVS -prune -o -print`; do \
+       rm -rf $(distdir)* $(dummy)
+       for x in `cd $(top_srcdir) && find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -print`; do \
          file=`expr X$$x : 'X\./\(.*\)'`; \
          if test -d "$(top_srcdir)/$$file" ; then \
            mkdir "$(distdir)/$$file" && chmod 777 "$(distdir)/$$file"; \
@@ -116,7 +135,7 @@ distdir:
        rm -f $(distdir)/README.CVS
 
 distcheck: $(distdir).tar.gz
-       -rm -rf $(dummy)
+       rm -rf $(dummy)
        mkdir $(dummy)
        $(GZIP) -d -c $< | $(TAR) xf -
        install_prefix=`cd $(dummy) && pwd`; \
@@ -131,7 +150,7 @@ distcheck: $(distdir).tar.gz
        $(MAKE) -C $(distdir) dist
 # Room for improvement: Check here whether this distribution tarball
 # is sufficiently similar to the original one.
-       -rm -rf $(distdir) $(dummy)
+       rm -rf $(distdir) $(dummy)
        @echo "Distribution integrity checks out."
 
 .PHONY: dist distdir distcheck