aboutsummaryrefslogtreecommitdiff
path: root/src/bin/initdb
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/initdb')
-rw-r--r--src/bin/initdb/.gitignore1
-rw-r--r--src/bin/initdb/Makefile9
-rw-r--r--src/bin/initdb/initdb.c1
3 files changed, 3 insertions, 8 deletions
diff --git a/src/bin/initdb/.gitignore b/src/bin/initdb/.gitignore
index c0ed2e8d169..0f74727d8f6 100644
--- a/src/bin/initdb/.gitignore
+++ b/src/bin/initdb/.gitignore
@@ -1,5 +1,4 @@
/encnames.c
-/pqsignal.c
/localtime.c
/initdb
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index 4a6037933e1..458b4553738 100644
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -23,23 +23,20 @@ ifneq (,$(with_system_tzdata))
override CPPFLAGS += '-DSYSTEMTZDIR="$(with_system_tzdata)"'
endif
-OBJS= initdb.o findtimezone.o localtime.o encnames.o pqsignal.o $(WIN32RES)
+OBJS= initdb.o findtimezone.o localtime.o encnames.o $(WIN32RES)
all: initdb
initdb: $(OBJS) | submake-libpgport
$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
-# We used to pull in all of libpq to get encnames and pqsignal, but that
+# We used to pull in all of libpq to get encnames.c, but that
# exposes us to risks of version skew if we link to a shared library.
# Do it the hard way, instead, so that we're statically linked.
encnames.c: % : $(top_srcdir)/src/backend/utils/mb/%
rm -f $@ && $(LN_S) $< .
-pqsignal.c: % : $(top_srcdir)/src/interfaces/libpq/%
- rm -f $@ && $(LN_S) $< .
-
# Likewise, pull in localtime.c from src/timezones
localtime.c: % : $(top_srcdir)/src/timezone/%
@@ -55,7 +52,7 @@ uninstall:
rm -f '$(DESTDIR)$(bindir)/initdb$(X)'
clean distclean maintainer-clean:
- rm -f initdb$(X) $(OBJS) encnames.c pqsignal.c localtime.c
+ rm -f initdb$(X) $(OBJS) encnames.c localtime.c
# ensure that changes in datadir propagate into object file
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index b0b346f72a1..e16f3e3c80a 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -56,7 +56,6 @@
#include <signal.h>
#include <time.h>
-#include "libpq/pqsignal.h"
#include "mb/pg_wchar.h"
#include "getaddrinfo.h"
#include "getopt_long.h"