Further cleanup for recent JSON-related commits.

Add overlooked .gitignore entries.

Fix test_json_parser/Makefile to use the pgxs.mk clean rule
instead of fighting it.  Suppresses a warning from make,
at least for me.

diff --git a/src/interfaces/ecpg/test/sql/.gitignore b/src/interfaces/ecpg/test/sql/.gitignore
index 057480a8f897c6a4c77af1463f53e8c7baa4678b..46adc571b482978cfca4e2bb1bd629eea133bad9 100644 (file)
--- a/src/interfaces/ecpg/test/sql/.gitignore
+++ b/src/interfaces/ecpg/test/sql/.gitignore
@@ -48,5 +48,7 @@
 /sqlda.c
 /sqljson
 /sqljson.c
+/sqljson_jsontable
+/sqljson_jsontable.c
 /twophase
 /twophase.c

diff --git a/src/test/modules/test_json_parser/Makefile b/src/test/modules/test_json_parser/Makefile
index a717b6f7addc454ca1c4628290f266b846253ff1..628256b6bbd6c11b606003944764a7dd8ca2bd18 100644 (file)
--- a/src/test/modules/test_json_parser/Makefile
+++ b/src/test/modules/test_json_parser/Makefile
@@ -6,6 +6,8 @@ TAP_TESTS = 1
 
 OBJS = test_json_parser_incremental.o test_json_parser_perf.o
 
+EXTRA_CLEAN = test_json_parser_incremental$(X) test_json_parser_perf$(X)
+
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -17,8 +19,6 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
-.PHONY: clean
-
 all: test_json_parser_incremental$(X) test_json_parser_perf$(X)
 
 %.o: $(top_srcdir)/$(subdir)/%.c
@@ -36,6 +36,3 @@ speed-check: test_json_parser_perf$(X)
    time ./test_json_parser_perf 10000 $(top_srcdir)/$(subdir)/tiny.json
    @echo Incremental parser:
    time ./test_json_parser_perf -i 10000 $(top_srcdir)/$(subdir)/tiny.json
-
-clean:
-   rm -rf test_json_parser_perf test_json_parser_incremental tmp_check $(OBJS)