From ac019fa33fcb792ebdfa4237acb5416423eef2f0 Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Fri, 9 May 2014 13:08:50 +1000
Subject: [PATCH] toosl: add json prefix to json sources

---
 Makefile.am                                  | 29 +++++++++-----------
 json/clean.cpp => tools/json-clean.cpp       |  0
 json/schema.cpp => tools/json-schema.cpp     |  0
 json/validate.cpp => tools/json-validate.cpp |  0
 4 files changed, 13 insertions(+), 16 deletions(-)
 rename json/clean.cpp => tools/json-clean.cpp (100%)
 rename json/schema.cpp => tools/json-schema.cpp (100%)
 rename json/validate.cpp => tools/json-validate.cpp (100%)

diff --git a/Makefile.am b/Makefile.am
index 09043e03..63cf1a1b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -170,26 +170,23 @@ libutil_la_SOURCES  = $(UTIL_FILES)
 libutil_la_CXXFLAGS = $(AM_CXXFLAGS)
 libutil_la_LIBADD   = $(BOOST_SYSTEM_LIB)
 
+###############################################################################
+## Utility programs
+
+LDADD = $(top_builddir)/.libs/libutil.a
 bin_PROGRAMS = 				\
     tools/json-clean			\
     tools/json-validate			\
     tools/json-schema
 
-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)
+tools_json_clean_SOURCES    	= tools/json-clean.cpp
+tools_json_clean_DEPENDENCIES 	= $(top_builddir)/libutil.la
+tools_json_clean_LDFLAGS    	= $(AM_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)
+tools_json_schema_SOURCES 	= tools/json-schema.cpp
+tools_json_schema_DEPENDENCIES 	= $(top_builddir)/libutil.la
+tools_json_schema_LDFLAGS    	= $(AM_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)
+tools_json_validate_SOURCES 		= tools/json-validate.cpp
+tools_json_validate_DEPENDENCIES 	= $(top_builddir)/libutil.la
+tools_json_validate_LDFLAGS    		= $(AM_LDFLAGS)
diff --git a/json/clean.cpp b/tools/json-clean.cpp
similarity index 100%
rename from json/clean.cpp
rename to tools/json-clean.cpp
diff --git a/json/schema.cpp b/tools/json-schema.cpp
similarity index 100%
rename from json/schema.cpp
rename to tools/json-schema.cpp
diff --git a/json/validate.cpp b/tools/json-validate.cpp
similarity index 100%
rename from json/validate.cpp
rename to tools/json-validate.cpp