Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 59bfb19

Browse files
committed
Add missed "make clean" logic in src/interfaces/libpq/Makefile.
Commit 818fd4a 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.
1 parent be6c3d1 commit 59bfb19

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/interfaces/libpq/Makefile

+5-8
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,17 @@ backend_src = $(top_srcdir)/src/backend
101101
# Instead, symlink the source files in here and build our own object files.
102102
# For some libpgport modules, this only happens if configure decides
103103
# the module is needed (see filter hack in OBJS, above).
104+
# When you add a file here, remember to add it in the "clean" target below.
104105

105106
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/%
106107
rm -f $@ && $(LN_S) $< .
107108

108-
ip.c md5.c: % : $(top_srcdir)/src/common/%
109+
ip.c md5.c base64.c scram-common.c sha2.c sha2_openssl.c: % : $(top_srcdir)/src/common/%
109110
rm -f $@ && $(LN_S) $< .
110111

111112
encnames.c wchar.c: % : $(backend_src)/utils/mb/%
112113
rm -f $@ && $(LN_S) $< .
113114

114-
base64.c scram-common.c sha2.c sha2_openssl.c: % : $(top_srcdir)/src/common/%
115-
rm -f $@ && $(LN_S) $< .
116-
117115

118116
distprep: libpq-dist.rc
119117

@@ -156,10 +154,9 @@ clean distclean: clean-lib
156154
rm -f $(OBJS) pthread.h libpq.rc
157155
# Might be left over from a Win32 client-only build
158156
rm -f pg_config_paths.h
159-
rm -f inet_net_ntop.c noblock.c pgstrcasecmp.c pqsignal.c thread.c
160-
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
161-
rm -f pgsleep.c
162-
rm -f md5.c ip.c
157+
# Remove files we (may have) symlinked in from src/port and other places
158+
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
159+
rm -f md5.c ip.c base64.c scram-common.c sha2.c sha2_openssl.c
163160
rm -f encnames.c wchar.c
164161

165162
maintainer-clean: distclean maintainer-clean-lib

0 commit comments

Comments
 (0)