From 44ad6d4bf604b6dba097c950dd1a875337290d39 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Mon, 24 May 2010 18:58:31 +0000 Subject: [PATCH] Update copyrights and grab version in configure. --- configure | 3 +++ src/dhcpcd-gtk/dhcpcd-gtk.h | 3 +-- src/dhcpcd-gtk/main.c | 2 +- src/dhcpcd-gtk/menu.c | 5 +++-- src/dhcpcd-gtk/prefs.c | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configure b/configure index e1c3541..5bfc7d9 100755 --- 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 2f8fcad..610b14e 100644 --- a/src/dhcpcd-gtk/dhcpcd-gtk.h +++ b/src/dhcpcd-gtk/dhcpcd-gtk.h @@ -1,6 +1,6 @@ /* * dhcpcd-gtk - * Copyright 2009 Roy Marples + * Copyright 2009-2010 Roy Marples * * 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 bd2a432..3957e67 100644 --- a/src/dhcpcd-gtk/main.c +++ b/src/dhcpcd-gtk/main.c @@ -1,6 +1,6 @@ /* * dhcpcd-gtk - * Copyright 2009 Roy Marples + * Copyright 2009-2010 Roy Marples * * 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 f80f755..0d28188 100644 --- a/src/dhcpcd-gtk/menu.c +++ b/src/dhcpcd-gtk/menu.c @@ -1,6 +1,6 @@ /* * dhcpcd-gtk - * Copyright 2009 Roy Marples + * Copyright 2009-2010 Roy Marples * * 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 ", NULL }; static void diff --git a/src/dhcpcd-gtk/prefs.c b/src/dhcpcd-gtk/prefs.c index 2f6fc6d..5c38e86 100644 --- a/src/dhcpcd-gtk/prefs.c +++ b/src/dhcpcd-gtk/prefs.c @@ -1,6 +1,6 @@ /* * dhcpcd-gtk - * Copyright 2009 Roy Marples + * Copyright 2009-2010 Roy Marples * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions -- 1.7.1