# HG changeset patch
# User William Astle <lost@l-w.ca>
# Date 1519965110 25200
# Node ID 7577bfee48bb725c0bb60be13a89f3b01bd74300
# Parent  51bed8c8dc5334c5308f16894043ba2379367638# Parent  a6c9129e594838fc38a964d630c3d86ce856a932
Merge changeset a6c9129e5948 from lwasm5 development branch

diff -r 51bed8c8dc53 -r 7577bfee48bb Makefile
--- a/Makefile	Wed Feb 28 23:35:12 2018 -0700
+++ b/Makefile	Thu Mar 01 21:31:50 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
diff -r 51bed8c8dc53 -r 7577bfee48bb common/version.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/version.h	Thu Mar 01 21:31:50 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___ */
diff -r 51bed8c8dc53 -r 7577bfee48bb lwar/main.c
--- a/lwar/main.c	Wed Feb 28 23:35:12 2018 -0700
+++ b/lwar/main.c	Thu Mar 01 21:31:50 2018 -0700
@@ -29,7 +29,7 @@
 #include <sys/stat.h>
 
 #include <lw_cmdline.h>
-#include <lw_version.h>
+#include <version.h>
 
 #include "lwar.h"
 
diff -r 51bed8c8dc53 -r 7577bfee48bb lwasm/lwasm.h
--- a/lwasm/lwasm.h	Wed Feb 28 23:35:12 2018 -0700
+++ b/lwasm/lwasm.h	Thu Mar 01 21:31:50 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
diff -r 51bed8c8dc53 -r 7577bfee48bb lwlib/lw_version.h
--- a/lwlib/lw_version.h	Wed Feb 28 23:35:12 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___ */
diff -r 51bed8c8dc53 -r 7577bfee48bb lwlink/main.c
--- a/lwlink/main.c	Wed Feb 28 23:35:12 2018 -0700
+++ b/lwlink/main.c	Thu Mar 01 21:31:50 2018 -0700
@@ -28,7 +28,8 @@
 #include <string.h>
 
 #include <lw_cmdline.h>
-#include <lw_version.h>
+
+#include <version.h>
 
 #include "lwlink.h"