Commit version string files.

Allows for platforms with a rubbish build system.

diff --git a/.gitignore b/.gitignore
index dabe04b5544a42240029921f4867ea0740e1fae2..3cbcedb4e4eecbb63990ec172f85f75c7249b727 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -130,8 +130,6 @@ lib/index.html
 server/index.html
 .DS_Store
 tests/disorder-udplog
 server/index.html
 .DS_Store
 tests/disorder-udplog

-lib/version-string
-lib/versionstring.h

 scripts/setup
 examples/disorder.rc
 scripts/teardown
 scripts/setup
 examples/disorder.rc
 scripts/teardown

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4f7be92daf7a7d9929533add79d91c7719203ff0..f2f15f75f941f13bb1acf38024be67768005bbd7 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -96,6 +96,7 @@ libdisorder_a_SOURCES=charset.c charsetf.c charset.h  \
        validity.c validity.h                           \
        vector.c vector.h                               \
        version.c version.h                             \
        validity.c validity.h                           \
        vector.c vector.h                               \
        version.c version.h                             \

+       versionstring.c                                 \

        wav.h wav.c                                     \
        wstat.c wstat.h                                 \
        disorder.h
        wav.h wav.c                                     \
        wstat.c wstat.h                                 \
        disorder.h


@@ -106,7 +107,7 @@ version-string: ../config.status ${top_srcdir}/scripts/make-version-string
                echo rm -f $@.new; rm -f $@.new; else \
                echo mv $@.new $@; mv $@.new $@; fi
 
                echo rm -f $@.new; rm -f $@.new; else \
                echo mv $@.new $@; mv $@.new $@; fi
 

-versionstring.h: version-string ${top_srcdir}/scripts/text2c
+versionstring.c: version-string ${top_srcdir}/scripts/text2c

        ${top_srcdir}/scripts/text2c -extern disorder_version_string \
                version-string > $@.new
        @if cmp $@.new $@; then \
        ${top_srcdir}/scripts/text2c -extern disorder_version_string \
                version-string > $@.new
        @if cmp $@.new $@; then \


@@ -132,8 +133,8 @@ definitions.h: Makefile
        @if cmp $@.new $@; then \
                echo rm -f $@.new; rm -f $@.new; else \
                echo mv $@.new $@; mv $@.new $@; fi
        @if cmp $@.new $@; then \
                echo rm -f $@.new; rm -f $@.new; else \
                echo mv $@.new $@; mv $@.new $@; fi

-defs.o: definitions.h versionstring.h
-defs.lo: definitions.h versionstring.h
+defs.o: definitions.h
+defs.lo: definitions.h

 
 client.o: client-stubs.c
 
 
 client.o: client-stubs.c
 

diff --git a/lib/defs.c b/lib/defs.c
index f0e35b2cd74af9a4ae6dfa4f0f93608a7c833d5f..5ff3101a35c0f4fbefe03f6f21399e67a03e121a 100644 (file)
--- a/lib/defs.c
+++ b/lib/defs.c
@@ -59,8 +59,6 @@ const char sendmail_binary[] = SENDMAIL;
  */
 const char finkbindir[] = FINKBINDIR;
 
  */
 const char finkbindir[] = FINKBINDIR;
 

-#include "versionstring.h"
-

 /*
 Local Variables:
 c-basic-offset:2
 /*
 Local Variables:
 c-basic-offset:2

diff --git a/lib/version-string b/lib/version-string
new file mode 100644 (file)
index 0000000..5dc0de3
--- /dev/null
+++ b/lib/version-string
@@ -0,0 +1,6 @@
+%s (DisOrder) 5.1.1
+Copyright (C) 2003-2011 Richard Kettlewell et al
+License GPLv3+: GNU GPL version 3 or later:
+        http://www.gnu.org/licenses/gpl-3.0.html
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.

diff --git a/lib/versionstring.c b/lib/versionstring.c
new file mode 100644 (file)
index 0000000..006badf
--- /dev/null
+++ b/lib/versionstring.c
@@ -0,0 +1,10 @@
+/* autogenerated file, do not edit */
+
+ const char disorder_version_string[] = 
+  "%s (DisOrder) 5.1.1\n"
+  "Copyright (C) 2003-2011 Richard Kettlewell et al\n"
+  "License GPLv3+: GNU GPL version 3 or later:\n"
+  "        http://www.gnu.org/licenses/gpl-3.0.html\n"
+  "This is free software: you are free to change and redistribute it.\n"
+  "There is NO WARRANTY, to the extent permitted by law.\n"
+;