From fcbc59051841c6e76a6737acf8ccaac4afd98666 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 Jun 2011 13:58:06 +0100
Subject: [PATCH] cleanup: move declaration of version[] into secnet.h

Also, #include secnet.h in the autogenerated version.c.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 Makefile.in | 4 +++-
 secnet.c    | 2 --
 secnet.h    | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index dd94837..fba1202 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -136,7 +136,9 @@ secnet:	$(OBJECTS)
 	$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) $(LDLIBS)
 
 version.c: Makefile
-	echo "char version[]=\"secnet $(VERSION)\";" >version.c
+	echo "#include \"secnet.h\"" >$@.new
+	echo "char version[]=\"secnet $(VERSION)\";" >>$@.new
+	mv -f $@.new $@
 
 install: all
 	$(INSTALL) -d $(prefix)/share/secnet $(sbindir)
diff --git a/secnet.c b/secnet.c
index 4c3ec8f..16fa198 100644
--- a/secnet.c
+++ b/secnet.c
@@ -1,5 +1,3 @@
-extern char version[];
-
 #include "secnet.h"
 #include <stdio.h>
 #include <string.h>
diff --git a/secnet.h b/secnet.h
index 656c86d..ede3ffc 100644
--- a/secnet.h
+++ b/secnet.h
@@ -34,6 +34,10 @@ typedef enum {False,True} bool_t;
 #define ASSERT(x) do { if (!(x)) { fatal("assertion failed line %d file " \
 					 __FILE__,__LINE__); } } while(0)
 
+/* from version.c */
+
+extern char version[];
+
 /* from logmsg.c */
 extern uint32_t message_level;
 extern bool_t secnet_is_daemon;
-- 
2.30.2