Further cleanup for recent JSON-related commits.

tglsfdc · tglsfdc · commit 332d40614063 · 2024-04-04T13:39:12.000-04:00
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
@@ -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:
