Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7523960

Browse files
committed
Add new make targets "world", "install-world" and "installcheck-world" 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.
1 parent e7b3349 commit 7523960

File tree

4 files changed

+47
-6
lines changed

4 files changed

+47
-6
lines changed

GNUmakefile.in

+21-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# PostgreSQL top level makefile
33
#
4-
# $PostgreSQL: pgsql/GNUmakefile.in,v 1.55 2009/11/03 21:28:10 petere Exp $
4+
# $PostgreSQL: pgsql/GNUmakefile.in,v 1.56 2010/01/28 23:59:52 adunstan Exp $
55
#
66

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

17+
world:
18+
$(MAKE) -C doc html
19+
$(MAKE) -C src all
20+
$(MAKE) -C config all
21+
$(MAKE) -C contrib all
22+
@echo "PostgreSQL, contrib and HTML documentation successfully made. Ready to install."
23+
1724
html man:
1825
$(MAKE) -C doc $@
1926

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

33+
install-world:
34+
$(MAKE) -C doc install
35+
$(MAKE) -C src install
36+
$(MAKE) -C config install
37+
$(MAKE) -C contrib install
38+
@echo "PostgreSQL and contrib installation complete."
39+
2640
installdirs uninstall coverage:
2741
$(MAKE) -C doc $@
2842
$(MAKE) -C src $@
@@ -60,6 +74,12 @@ check: all
6074
check installcheck installcheck-parallel:
6175
$(MAKE) -C src/test $@
6276

77+
installcheck-world:
78+
$(MAKE) -C src/test installcheck
79+
$(MAKE) -C src/pl installcheck
80+
$(MAKE) -C interfaces/ecpg installcheck
81+
$(MAKE) -C contrib installcheck
82+
6383
GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
6484
./config.status $@
6585

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# GNUmakefile won't exist yet, so we catch that case as well.
1212

1313

14-
all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean dist distcheck:
14+
all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean dist distcheck world install-world installcheck-world:
1515
@if [ ! -f GNUmakefile ] ; then \
1616
echo "You need to run the 'configure' program first. See the file"; \
1717
echo "'INSTALL' for installation instructions." ; \

doc/src/sgml/contrib.sgml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/contrib.sgml,v 1.15 2009/11/18 21:57:56 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/contrib.sgml,v 1.16 2010/01/28 23:59:52 adunstan Exp $ -->
22

33
<appendix id="contrib">
44
<title>Additional Supplied Modules</title>
@@ -16,7 +16,9 @@
1616

1717
<para>
1818
When building from the source distribution, these modules are not built
19-
automatically. You can build and install all of them by running:
19+
automatically, unless you build the "world" target
20+
(see <xref linkend="build">).
21+
You can build and install all of them by running:
2022
<screen>
2123
<userinput>gmake</userinput>
2224
<userinput>gmake install</userinput>

doc/src/sgml/installation.sgml

+21-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.339 2010/01/22 22:50:03 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.340 2010/01/28 23:59:52 adunstan Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -1526,7 +1526,7 @@ su - postgres
15261526
</para>
15271527
</step>
15281528

1529-
<step>
1529+
<step id="build">
15301530
<title>Build</title>
15311531

15321532
<para>
@@ -1539,6 +1539,18 @@ su - postgres
15391539
hardware. The last line displayed should be:
15401540
<screen>
15411541
All of PostgreSQL is successfully made. Ready to install.
1542+
</screen>
1543+
</para>
1544+
1545+
<para>
1546+
If you want to build everything that can be built, including the HTML
1547+
documentation and the Additional Modules, type instead:
1548+
<screen>
1549+
<userinput>gmake world</userinput>
1550+
</screen>
1551+
The last line displayed should be:
1552+
<screen>
1553+
PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
15421554
</screen>
15431555
</para>
15441556
</step>
@@ -1594,6 +1606,13 @@ All of PostgreSQL is successfully made. Ready to install.
15941606
be granted.
15951607
</para>
15961608

1609+
<para>
1610+
If you built the world above, type instead:
1611+
<screen>
1612+
<userinput>gmake install-world</userinput>
1613+
</screen>
1614+
</para>
1615+
15971616
<para>
15981617
You can use <literal>gmake install-strip</literal> instead of
15991618
<literal>gmake install</literal> to strip the executable files and

0 commit comments

Comments
 (0)