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>

diff --git a/Makefile.in b/Makefile.in
index dd94837cd3b1eaa212c19e48e1e43bc25631c73c..fba120258e564c79438e393c1ed3021c9fad19b9 100644 (file)
--- 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 4c3ec8fd4334eef7a1f1e51b67b091e868f3c5c1..16fa198161d414e3071842eb98f283ac7d8c2dbc 100644 (file)
--- 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 656c86d262a54e0910ca5dc580becf720236270c..ede3ffcf376e6f479404f88ae2bf1b554df5b8e0 100644 (file)
--- 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;