From: Tom Lane Date: Thu, 4 Apr 2024 17:39:12 +0000 (-0400) Subject: Further cleanup for recent JSON-related commits. X-Git-Tag: REL_17_BETA1~404 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=332d406140632d352145443b725a206b73ce2167;p=thirdparty%2Fpostgresql.git Further cleanup for recent JSON-related commits. The link commands in test_json_parser/Makefile were a long way shy of a load, as evidenced by buildfarm failures. Model them on pgxs.mk's PROGRAM rule. (Probably we should have put these two test programs in different subdirectories so we could actually use the PROGRAM rule. But I won't question that decision today.) --- diff --git a/src/test/modules/test_json_parser/Makefile b/src/test/modules/test_json_parser/Makefile index 628256b6bbd..6f438629d8c 100644 --- a/src/test/modules/test_json_parser/Makefile +++ b/src/test/modules/test_json_parser/Makefile @@ -23,13 +23,11 @@ all: test_json_parser_incremental$(X) test_json_parser_perf$(X) %.o: $(top_srcdir)/$(subdir)/%.c -PARSER_LIBS = $(top_builddir)/src/common/libpgcommon.a $(top_builddir)/src/port/libpgport.a +test_json_parser_incremental$(X): test_json_parser_incremental.o + $(CC) $(CFLAGS) $^ $(PG_LIBS_INTERNAL) $(LDFLAGS) $(LDFLAGS_EX) $(PG_LIBS) $(LIBS) -o $@ -test_json_parser_incremental$(X): test_json_parser_incremental.o $(PARSER_LIBS) - $(CC) $(CFLAGS) $^ -o $@ - -test_json_parser_perf$(X): test_json_parser_perf.o $(PARSER_LIBS) - $(CC) $(CFLAGS) $^ -o $@ +test_json_parser_perf$(X): test_json_parser_perf.o + $(CC) $(CFLAGS) $^ $(PG_LIBS_INTERNAL) $(LDFLAGS) $(LDFLAGS_EX) $(PG_LIBS) $(LIBS) -o $@ speed-check: test_json_parser_perf$(X) @echo Standard parser: