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
97
98
99
100
101
102
103
104
105
|
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 16f9057..cbf1f91 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -9,19 +9,16 @@ top_builddir = .
include $(top_builddir)/src/Makefile.global
all:
- $(MAKE) -C doc all
$(MAKE) -C src all
$(MAKE) -C config all
@echo "All of PostgreSQL successfully made. Ready to install."
install:
- $(MAKE) -C doc $@
$(MAKE) -C src $@
$(MAKE) -C config $@
@echo "PostgreSQL installation complete."
installdirs uninstall:
- $(MAKE) -C doc $@
$(MAKE) -C src $@
$(MAKE) -C config $@
diff --git a/src/Makefile b/src/Makefile
index 6d9043a..3935983 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -15,15 +15,11 @@ include Makefile.global
all install installdirs uninstall dep depend distprep:
$(MAKE) -C port $@
- $(MAKE) -C timezone $@
$(MAKE) -C backend $@
- $(MAKE) -C backend/utils/mb/conversion_procs $@
$(MAKE) -C include $@
$(MAKE) -C interfaces $@
$(MAKE) -C bin $@
- $(MAKE) -C pl $@
$(MAKE) -C makefiles $@
- $(MAKE) -C test/regress $@
install: install-local
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 9329db0..abbb8f9 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -33,7 +33,7 @@ LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS)
##########################################################################
-all: submake-libpgport postgres $(POSTGRES_IMP)
+all: someheaders
ifneq ($(PORTNAME), cygwin)
ifneq ($(PORTNAME), win32)
@@ -105,8 +105,7 @@ $(SUBSYSOBJS): $(DIRS:%=%-recursive) ;
.PHONY: $(DIRS:%=%-recursive)
# Update the commonly used headers before building the subdirectories
-$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
- $(MAKE) -C $(subst -recursive,,$@) all
+someheaders $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
# The postgres.o target is needed by the rule in Makefile.global that
@@ -153,22 +152,7 @@ distprep:
##########################################################################
-install: all installdirs install-bin
-ifeq ($(PORTNAME), cygwin)
-ifeq ($(MAKE_DLL), true)
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
-endif
-endif
-ifeq ($(PORTNAME), win32)
-ifeq ($(MAKE_DLL), true)
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
-endif
-endif
- $(MAKE) -C catalog install-data
- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
+install:
install-bin: postgres $(POSTGRES_IMP) installdirs
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
diff --git a/src/bin/Makefile b/src/bin/Makefile
index 0d86213..b8e01fc 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -13,8 +13,7 @@ subdir = src/bin
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
-DIRS := initdb ipcclean pg_ctl pg_dump \
- psql scripts pg_config pg_controldata pg_resetxlog
+DIRS := pg_config
ifeq ($(PORTNAME), win32)
DIRS+=pgevent
endif
|
GitWeb