Skip to content

Commit

Permalink
Add new make targets "world", "install-world" and "installcheck-world…
Browse files Browse the repository at this point in the history
…" to build, install and check just about everything.

In addition to everything built installed and tested by all, install and installcheck targets, these build HTML Docs,
build and test contrib, and test PLs and ECPG.
  • Loading branch information
adunstan committed Jan 28, 2010
1 parent e7b3349 commit 7523960
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 6 deletions.
22 changes: 21 additions & 1 deletion GNUmakefile.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# PostgreSQL top level makefile
#
# $PostgreSQL: pgsql/GNUmakefile.in,v 1.55 2009/11/03 21:28:10 petere Exp $
# $PostgreSQL: pgsql/GNUmakefile.in,v 1.56 2010/01/28 23:59:52 adunstan Exp $
#

subdir =
Expand All @@ -14,6 +14,13 @@ all:
$(MAKE) -C config all
@echo "All of PostgreSQL successfully made. Ready to install."

world:
$(MAKE) -C doc html
$(MAKE) -C src all
$(MAKE) -C config all
$(MAKE) -C contrib all
@echo "PostgreSQL, contrib and HTML documentation successfully made. Ready to install."

html man:
$(MAKE) -C doc $@

Expand All @@ -23,6 +30,13 @@ install:
$(MAKE) -C config $@
@echo "PostgreSQL installation complete."

install-world:
$(MAKE) -C doc install
$(MAKE) -C src install
$(MAKE) -C config install
$(MAKE) -C contrib install
@echo "PostgreSQL and contrib installation complete."

installdirs uninstall coverage:
$(MAKE) -C doc $@
$(MAKE) -C src $@
Expand Down Expand Up @@ -60,6 +74,12 @@ check: all
check installcheck installcheck-parallel:
$(MAKE) -C src/test $@

installcheck-world:
$(MAKE) -C src/test installcheck
$(MAKE) -C src/pl installcheck
$(MAKE) -C interfaces/ecpg installcheck
$(MAKE) -C contrib installcheck

GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
./config.status $@

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# GNUmakefile won't exist yet, so we catch that case as well.


all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean dist distcheck:
all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean dist distcheck world install-world installcheck-world:
@if [ ! -f GNUmakefile ] ; then \
echo "You need to run the 'configure' program first. See the file"; \
echo "'INSTALL' for installation instructions." ; \
Expand Down
6 changes: 4 additions & 2 deletions doc/src/sgml/contrib.sgml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/contrib.sgml,v 1.15 2009/11/18 21:57:56 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/contrib.sgml,v 1.16 2010/01/28 23:59:52 adunstan Exp $ -->

<appendix id="contrib">
<title>Additional Supplied Modules</title>
Expand All @@ -16,7 +16,9 @@

<para>
When building from the source distribution, these modules are not built
automatically. You can build and install all of them by running:
automatically, unless you build the "world" target
(see <xref linkend="build">).
You can build and install all of them by running:
<screen>
<userinput>gmake</userinput>
<userinput>gmake install</userinput>
Expand Down
23 changes: 21 additions & 2 deletions doc/src/sgml/installation.sgml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.339 2010/01/22 22:50:03 momjian Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.340 2010/01/28 23:59:52 adunstan Exp $ -->

<chapter id="installation">
<title><![%standalone-include[<productname>PostgreSQL</>]]>
Expand Down Expand Up @@ -1526,7 +1526,7 @@ su - postgres
</para>
</step>

<step>
<step id="build">
<title>Build</title>

<para>
Expand All @@ -1539,6 +1539,18 @@ su - postgres
hardware. The last line displayed should be:
<screen>
All of PostgreSQL is successfully made. Ready to install.
</screen>
</para>

<para>
If you want to build everything that can be built, including the HTML
documentation and the Additional Modules, type instead:
<screen>
<userinput>gmake world</userinput>
</screen>
The last line displayed should be:
<screen>
PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
</screen>
</para>
</step>
Expand Down Expand Up @@ -1594,6 +1606,13 @@ All of PostgreSQL is successfully made. Ready to install.
be granted.
</para>

<para>
If you built the world above, type instead:
<screen>
<userinput>gmake install-world</userinput>
</screen>
</para>

<para>
You can use <literal>gmake install-strip</literal> instead of
<literal>gmake install</literal> to strip the executable files and
Expand Down

0 comments on commit 7523960

Please sign in to comment.