aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2017-03-20 12:51:45 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2017-03-20 12:51:45 -0400
commit59bfb190f7a8c377a94822ffd4276fcb09650ff7 (patch)
tree851b38af665a6fe125636da8e515b13b6f092da5 /src
parentbe6c3d19fd454359f05176eb1add82d4fc6e7758 (diff)
downloadpostgresql-59bfb190f7a8c377a94822ffd4276fcb09650ff7.tar.gz
postgresql-59bfb190f7a8c377a94822ffd4276fcb09650ff7.zip
Add missed "make clean" logic in src/interfaces/libpq/Makefile.
Commit 818fd4a67 missed cleaning up the symlinks it added for various .c files imported from src/port and src/common. Neatnik-ishly make the file lists in the "clean" target look exactly like the earlier lists of what to symlink in.
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/libpq/Makefile13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 792232db495..36b57268a7a 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -101,19 +101,17 @@ backend_src = $(top_srcdir)/src/backend
# Instead, symlink the source files in here and build our own object files.
# For some libpgport modules, this only happens if configure decides
# the module is needed (see filter hack in OBJS, above).
+# When you add a file here, remember to add it in the "clean" target below.
chklocale.c crypt.c erand48.c getaddrinfo.c getpeereid.c inet_aton.c inet_net_ntop.c noblock.c open.c system.c pgsleep.c pg_strong_random.c pgstrcasecmp.c pqsignal.c snprintf.c strerror.c strlcpy.c thread.c win32error.c win32setlocale.c: % : $(top_srcdir)/src/port/%
rm -f $@ && $(LN_S) $< .
-ip.c md5.c: % : $(top_srcdir)/src/common/%
+ip.c md5.c base64.c scram-common.c sha2.c sha2_openssl.c: % : $(top_srcdir)/src/common/%
rm -f $@ && $(LN_S) $< .
encnames.c wchar.c: % : $(backend_src)/utils/mb/%
rm -f $@ && $(LN_S) $< .
-base64.c scram-common.c sha2.c sha2_openssl.c: % : $(top_srcdir)/src/common/%
- rm -f $@ && $(LN_S) $< .
-
distprep: libpq-dist.rc
@@ -156,10 +154,9 @@ clean distclean: clean-lib
rm -f $(OBJS) pthread.h libpq.rc
# Might be left over from a Win32 client-only build
rm -f pg_config_paths.h
- rm -f inet_net_ntop.c noblock.c pgstrcasecmp.c pqsignal.c thread.c
- rm -f chklocale.c crypt.c getaddrinfo.c getpeereid.c inet_aton.c open.c system.c snprintf.c strerror.c strlcpy.c win32error.c win32setlocale.c
- rm -f pgsleep.c
- rm -f md5.c ip.c
+# Remove files we (may have) symlinked in from src/port and other places
+ rm -f chklocale.c crypt.c erand48.c getaddrinfo.c getpeereid.c inet_aton.c inet_net_ntop.c noblock.c open.c system.c pgsleep.c pg_strong_random.c pgstrcasecmp.c pqsignal.c snprintf.c strerror.c strlcpy.c thread.c win32error.c win32setlocale.c
+ rm -f md5.c ip.c base64.c scram-common.c sha2.c sha2_openssl.c
rm -f encnames.c wchar.c
maintainer-clean: distclean maintainer-clean-lib