summaryrefslogtreecommitdiff
blob: 1ccaa3a9a903194980e9bab97c6a2006679ee2e1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2b17d47..d8f967d 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -23,7 +23,6 @@ installdirs uninstall distprep:
 	$(MAKE) -C src $@
 
 install-all-headers:
-	$(MAKE) -C src $@
 
 # clean, distclean, etc should apply to contrib too, even though
 # it's not built by default
diff --git a/contrib/Makefile b/contrib/Makefile
index 66753e8..6066a33 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -14,7 +14,6 @@ WANTED_DIRS = \
 		dbmirror	\
 		dbsize		\
 		earthdistance	\
-		findoidjoins	\
 		fulltextindex	\
 		fuzzystrmatch	\
 		intagg		\
@@ -24,10 +23,7 @@ WANTED_DIRS = \
 		ltree		\
 		miscutil	\
 		noupdate	\
-		oid2name	\
-		pg_dumplo	\
 		pg_logger	\
-		pgbench		\
 		pgcrypto	\
 		pgstattuple	\
 		rserv		\
@@ -38,8 +34,7 @@ WANTED_DIRS = \
 		tablefunc	\
 		tips		\
 		tsearch		\
-		userlock	\
-		vacuumlo
+		userlock
 
 # Missing:
 #		ipc_check	\ (does not have a makefile)
diff --git a/src/Makefile b/src/Makefile
index cd6e5e6..49672db 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,13 +17,10 @@ all install installdirs uninstall dep de
 	$(MAKE) -C port $@
 	$(MAKE) -C backend $@
 	$(MAKE) -C backend/utils/mb/conversion_procs $@
-	$(MAKE) -C include $@
-	$(MAKE) -C interfaces $@
 	$(MAKE) -C bin $@
 	$(MAKE) -C pl $@
 
 install-all-headers:
-	$(MAKE) -C include $@
 
 clean:
 	$(MAKE) -C port $@
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index e0fd91d..f8a3430 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -286,10 +286,10 @@ libpq_builddir = $(top_builddir)/src/int
 libpq = -L$(libpq_builddir) -lpq
 
 submake-libpq:
-	$(MAKE) -C $(libpq_builddir) all
+	@true $(MAKE) -C $(libpq_builddir) all
 
 submake-libpgport:
-	$(MAKE) -C $(top_builddir)/src/port all
+	@true $(MAKE) -C $(top_builddir)/src/port all
 
 .PHONY: submake-libpq submake-libpgport
 
diff --git a/src/bin/Makefile b/src/bin/Makefile
index 3035f61..90b357d 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -13,9 +13,8 @@ subdir = src/bin
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
-	psql scripts pg_config pg_controldata pg_resetxlog \
-	pg_encoding
+DIRS := initdb initlocation ipcclean pg_ctl pg_id \
+	pg_controldata pg_resetxlog
 
 ifeq ($(with_tcl), yes)
 	DIRS += pgtclsh