@@ -9,9 +9,9 @@ include $(top_builddir)/src/Makefile.global
9
9
10
10
OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \
11
11
option.o parallel.o pg_upgrade.o relfilenode.o server.o \
12
- tablespace.o util.o version.o wchar.o $(WIN32RES )
12
+ tablespace.o util.o version.o $(WIN32RES )
13
13
14
- override CPPFLAGS := -DDLSUFFIX=\"$(DLSUFFIX ) \" -DFRONTEND - I$(srcdir ) -I$(libpq_srcdir ) $(CPPFLAGS )
14
+ override CPPFLAGS := -DDLSUFFIX=\"$(DLSUFFIX ) \" -I$(srcdir ) -I$(libpq_srcdir ) $(CPPFLAGS )
15
15
override LDFLAGS := -L$(top_builddir ) /src/fe_utils -lpgfeutils $(libpq_pgport ) $(ICU_LIBS ) $(LDFLAGS )
16
16
17
17
@@ -20,13 +20,6 @@ all: pg_upgrade
20
20
pg_upgrade : $(OBJS ) | submake-libpq submake-libpgport submake-libpgfeutils
21
21
$(CC ) $(CFLAGS ) $^ $(LDFLAGS ) $(LDFLAGS_EX ) $(LIBS ) -o $@ $(X )
22
22
23
- # Pull in wchar.c from src/backend/utils/mb. That exposes us to
24
- # risks of version skew if we link to a shared library. Do it the
25
- # hard way, instead, so that we're statically linked.
26
-
27
- wchar.c : % : $(top_srcdir ) /src/backend/utils/mb/%
28
- rm -f $@ && $(LN_S ) $< .
29
-
30
23
install : all installdirs
31
24
$(INSTALL_PROGRAM ) pg_upgrade$(X ) ' $(DESTDIR)$(bindir)/pg_upgrade$(X)'
32
25
@@ -42,7 +35,6 @@ clean distclean maintainer-clean:
42
35
loadable_libraries.txt reindex_hash.sql \
43
36
pg_upgrade_dump_globals.sql \
44
37
pg_upgrade_dump_* .custom pg_upgrade_* .log
45
- rm -f wchar.c
46
38
47
39
check : test.sh all
48
40
MAKE=$(MAKE ) bindir=$(bindir ) libdir=$(libdir ) EXTRA_REGRESS_OPTS=" $( EXTRA_REGRESS_OPTS) " $(SHELL ) $< --install
0 commit comments