changeset 467:a6c9129e5948

Move version header into a common direction to better reflect what it is. The version header isn't really associated with lwlib itself since that is intended to be some generic type routines that can be used by other programs. It is, however, directly associated with lwtools. Thus, it should be related to lwtools itself rather than the more generic lwlib.
author William Astle <lost@l-w.ca>
date Thu, 01 Mar 2018 21:25:51 -0700
parents 3948c874901b
children 7577bfee48bb
files Makefile common/version.h lwar/main.c lwasm/lwasm.h lwlib/lw_version.h lwlink/main.c
diffstat 6 files changed, 33 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sat Feb 17 00:13:46 2018 -0700
+++ b/Makefile	Thu Mar 01 21:25:51 2018 -0700
@@ -27,7 +27,7 @@
 RANLIB := $(BUILDTPREFIX)$(RANLIB)
 endif
 
-CPPFLAGS += -I lwlib
+CPPFLAGS += -I lwlib -Icommon
 LDFLAGS += -Llwlib -llw
 
 CFLAGS ?= -O3 -Wall -Wno-char-subscripts
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/version.h	Thu Mar 01 21:25:51 2018 -0700
@@ -0,0 +1,27 @@
+/*
+lw_version.h
+
+Copyright © 2018 William Astle
+
+This file is part of LWTOOLS.
+
+LWTOOLS is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation, either version 3 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef lw_version_h_seen___
+#define lw_version_h_seen___
+
+#define PACKAGE_STRING "lwtools 5.0beta"
+
+#endif /* lw_version_h_seen___ */
--- a/lwar/main.c	Sat Feb 17 00:13:46 2018 -0700
+++ b/lwar/main.c	Thu Mar 01 21:25:51 2018 -0700
@@ -29,7 +29,7 @@
 #include <sys/stat.h>
 
 #include <lw_cmdline.h>
-#include <lw_version.h>
+#include <version.h>
 
 #include "lwar.h"
 
--- a/lwasm/lwasm.h	Sat Feb 17 00:13:46 2018 -0700
+++ b/lwasm/lwasm.h	Thu Mar 01 21:25:51 2018 -0700
@@ -29,7 +29,8 @@
 #include <lw_expr.h>
 #include <lw_stringlist.h>
 #include <lw_stack.h>
-#include <lw_version.h>
+
+#include <version.h>
 
 // these are allowed chars BELOW 0x80 for symbols
 // first is symbol start chars, second is anywhere in symbol
--- a/lwlib/lw_version.h	Sat Feb 17 00:13:46 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-lw_version.h
-
-Copyright © 2015 William Astle
-
-This file is part of LWTOOLS.
-
-LWTOOLS is free software: you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation, either version 3 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-more details.
-
-You should have received a copy of the GNU General Public License along with
-this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef ___lw_version_h_seen___
-#define ___lw_version_h_seen___
-
-#define PACKAGE_STRING "lwtools 4.15+"
-
-#endif /* ___lw_version_h_seen___ */
--- a/lwlink/main.c	Sat Feb 17 00:13:46 2018 -0700
+++ b/lwlink/main.c	Thu Mar 01 21:25:51 2018 -0700
@@ -28,7 +28,8 @@
 #include <string.h>
 
 #include <lw_cmdline.h>
-#include <lw_version.h>
+
+#include <version.h>
 
 #include "lwlink.h"