From fff2c850541fa0887e91fd1093cadca8ce96878e Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 24 Aug 2011 12:52:00 +0930
Subject: [PATCH 1/1] tools: reorder object files into alphabetical order.

Simplifies future patches.
---
 tools/Makefile          | 11 ++++++++++-
 tools/ccanlint/Makefile | 33 ++++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index 63d474fb..3ee60f7c 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,6 +1,15 @@
 ALL_TOOLS = tools/configurator/configurator tools/ccan_depends tools/doc_extract tools/namespacize tools/ccanlint/ccanlint
 
-DEP_OBJS = tools/depends.o tools/compile.o tools/tools.o ccan/str_talloc/str_talloc.o ccan/str/str.o ccan/str/debug.o ccan/grab_file/grab_file.o ccan/talloc/talloc.o ccan/noerr/noerr.o ccan/read_write_all/read_write_all.o
+DEP_OBJS = ccan/grab_file/grab_file.o \
+	ccan/noerr/noerr.o \
+	ccan/read_write_all/read_write_all.o \
+	ccan/str/debug.o \
+	ccan/str/str.o \
+	ccan/str_talloc/str_talloc.o \
+	ccan/talloc/talloc.o \
+	tools/compile.o \
+	tools/depends.o \
+	tools/tools.o
 
 .PHONY: tools
 tools: $(ALL_TOOLS)
diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile
index 6bec8c4a..d7bd338b 100644
--- a/tools/ccanlint/Makefile
+++ b/tools/ccanlint/Makefile
@@ -2,23 +2,30 @@ COMPULSORY_TEST_CFILES := $(wildcard tools/ccanlint/compulsory_tests/*.c)
 NORMAL_TEST_CFILES := $(wildcard tools/ccanlint/tests/*.c)
 TEST_OBJS := $(NORMAL_TEST_CFILES:.c=.o) $(COMPULSORY_TEST_CFILES:.c=.o)
 
-CORE_OBJS := tools/ccanlint/ccanlint.o \
-	tools/ccanlint/file_analysis.o \
-	tools/ccanlint/licenses.o \
-	tools/doc_extract-core.o \
-	tools/depends.o \
-	tools/tools.o \
-	tools/compile.o \
-	ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o \
-	ccan/str/str.o ccan/str/debug.o \
+CORE_OBJS := \
 	ccan/asort/asort.o \
 	ccan/btree/btree.o \
-	ccan/talloc/talloc.o ccan/noerr/noerr.o \
-	ccan/talloc_link/talloc_link.o ccan/noerr/noerr.o \
 	ccan/foreach/foreach.o \
-	ccan/hash/hash.o ccan/htable/htable.o \
+	ccan/grab_file/grab_file.o \
+	ccan/hash/hash.o \
+	ccan/htable/htable.o \
+	ccan/noerr/noerr.o \
+	ccan/opt/helpers.o \
+	ccan/opt/opt.o \
+	ccan/opt/parse.o \
+	ccan/opt/usage.o \
 	ccan/read_write_all/read_write_all.o \
-	ccan/opt/opt.o ccan/opt/usage.o ccan/opt/helpers.o ccan/opt/parse.o
+	ccan/str/str.o ccan/str/debug.o \
+	ccan/str_talloc/str_talloc.o \
+	ccan/talloc/talloc.o \
+	ccan/talloc_link/talloc_link.o \
+	tools/ccanlint/ccanlint.o \
+	tools/ccanlint/file_analysis.o \
+	tools/ccanlint/licenses.o \
+	tools/compile.o \
+	tools/depends.o \
+	tools/doc_extract-core.o \
+	tools/tools.o
 
 OBJS := $(CORE_OBJS) $(TEST_OBJS)
 
-- 
2.39.2