From 84a179f4ca3485515e3f4baadcd1dfad0522a439 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Fri, 9 May 2014 12:58:33 +1000 Subject: [PATCH] Move json utilities to tools directory --- .gitignore | 3 --- Makefile.am | 26 +++++++++++++------------- tools/.gitignore | 3 +++ 3 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 tools/.gitignore diff --git a/.gitignore b/.gitignore index 590192dc..08a72b41 100644 --- a/.gitignore +++ b/.gitignore @@ -10,10 +10,7 @@ /Doxyfile /install-sh /ip.cpp -/json-clean /json.cpp -/json-schema -/json-validate /libgim-*.tar.* .libs /libtool diff --git a/Makefile.am b/Makefile.am index fe195424..09043e03 100644 --- a/Makefile.am +++ b/Makefile.am @@ -170,26 +170,26 @@ libutil_la_SOURCES = $(UTIL_FILES) libutil_la_CXXFLAGS = $(AM_CXXFLAGS) libutil_la_LIBADD = $(BOOST_SYSTEM_LIB) -bin_PROGRAMS = \ - json-clean \ - json-validate \ - json-schema +bin_PROGRAMS = \ + tools/json-clean \ + tools/json-validate \ + tools/json-schema -json_clean_SOURCES = json/clean.cpp -json_clean_DEPENDENCIES = $(top_builddir)/libutil.la -json_clean_LDFLAGS = \ +tools_json_clean_SOURCES = json/clean.cpp +tools_json_clean_DEPENDENCIES = $(top_builddir)/libutil.la +tools_json_clean_LDFLAGS = \ $(top_builddir)/.libs/libutil.a \ $(AM_LDFLAGS) -json_schema_SOURCES = json/schema.cpp -json_schema_DEPENDENCIES = $(top_builddir)/libutil.la -json_schema_LDFLAGS = \ +tools_json_schema_SOURCES = json/schema.cpp +tools_json_schema_DEPENDENCIES = $(top_builddir)/libutil.la +tools_json_schema_LDFLAGS = \ $(top_builddir)/.libs/libutil.a \ $(AM_LDFLAGS) -json_validate_SOURCES = json/validate.cpp -json_validate_DEPENDENCIES = $(top_builddir)/libutil.la -json_validate_LDFLAGS = \ +tools_json_validate_SOURCES = json/validate.cpp +tools_json_validate_DEPENDENCIES = $(top_builddir)/libutil.la +tools_json_validate_LDFLAGS = \ $(top_builddir)/.libs/libutil.a \ $(AM_LDFLAGS) diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 00000000..2a15467a --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1,3 @@ +json-clean +json-schema +json-validate