Update copyrights and grab version in configure.

diff --git a/configure b/configure
index e1c35412c3d4363fd8fd331e923ec58b0431dc9b..5bfc7d97e52acfbc13f4c244b9a82d36865964e9 100755 (executable)
--- a/configure
+++ b/configure
@@ -102,6 +102,9 @@ rm -f $CONFIG_H $CONFIG_MK
 echo "# $OS" >$CONFIG_MK
 echo "/* $OS */" >$CONFIG_H
 
+VERSION=$($SED -ne 's/VERSION= //p' Makefile)
+echo "#define VERSION \"$VERSION\"" >>$CONFIG_H
+
 for x in PREFIX SYSCONFDIR BINDIR ICONDIR; do
        eval v=\$$x
        # Make files look nice for import

diff --git a/src/dhcpcd-gtk/dhcpcd-gtk.h b/src/dhcpcd-gtk/dhcpcd-gtk.h
index 2f8fcad554f23af9dc129d51fe7a5d77146f9747..610b14eed0e954055c08d9bb9e7d5dfa9171cf68 100644 (file)
--- a/src/dhcpcd-gtk/dhcpcd-gtk.h
+++ b/src/dhcpcd-gtk/dhcpcd-gtk.h
@@ -1,6 +1,6 @@
 /*
  * dhcpcd-gtk
- * Copyright 2009 Roy Marples <roy@marples.name>
+ * Copyright 2009-2010 Roy Marples <roy@marples.name>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -39,7 +39,6 @@
 #include "libdhcpcd.h"
 
 #define PACKAGE "dhcpcd-gtk"
-#define VERSION "0.4.0"
 
 /* Work out if we have a private address or not
  * 10/8

diff --git a/src/dhcpcd-gtk/main.c b/src/dhcpcd-gtk/main.c
index bd2a432a40096117897f0d0fa43cd5d112f7de0f..3957e676ae6e99e0a7b53cd7208d6b7623b1934c 100644 (file)
--- a/src/dhcpcd-gtk/main.c
+++ b/src/dhcpcd-gtk/main.c
@@ -1,6 +1,6 @@
 /*
  * dhcpcd-gtk
- * Copyright 2009 Roy Marples <roy@marples.name>
+ * Copyright 2009-2010 Roy Marples <roy@marples.name>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/src/dhcpcd-gtk/menu.c b/src/dhcpcd-gtk/menu.c
index f80f75587d9e2153ba61e8b9ec4f3cd7d508f4f6..0d2818823bf3ec65642852187bbbc0a1cf298bd1 100644 (file)
--- a/src/dhcpcd-gtk/menu.c
+++ b/src/dhcpcd-gtk/menu.c
@@ -1,6 +1,6 @@
 /*
  * dhcpcd-gtk
- * Copyright 2009 Roy Marples <roy@marples.name>
+ * Copyright 2009-2010 Roy Marples <roy@marples.name>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,9 +24,10 @@
  * SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "dhcpcd-gtk.h"
 
-static const char *copyright = "Copyright (c) 2009 Roy Marples";
+static const char *copyright = "Copyright (c) 2009-2010 Roy Marples";
 static const char *authors[] = { "Roy Marples <roy@marples.name>", NULL };
 
 static void

diff --git a/src/dhcpcd-gtk/prefs.c b/src/dhcpcd-gtk/prefs.c
index 2f6fc6d7e4a164c28b25fc5db22cd6e67207f1a4..5c38e86c1e38983280d2bd06d28d0e76c2515629 100644 (file)
--- a/src/dhcpcd-gtk/prefs.c
+++ b/src/dhcpcd-gtk/prefs.c
@@ -1,6 +1,6 @@
 /*
  * dhcpcd-gtk
- * Copyright 2009 Roy Marples <roy@marples.name>
+ * Copyright 2009-2010 Roy Marples <roy@marples.name>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions