From f4ecd19f404c806c33603dd5bcd508f4e5c80731 Mon Sep 17 00:00:00 2001
From: j8takagi <j8takagi@nifty.com>
Date: Wed, 20 Jun 2018 23:25:35 +0900
Subject: [PATCH] =?utf8?q?=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=83=95?=
 =?utf8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E5=85=B1=E9=80=9A=E3=81=AE=E3=83=98?=
 =?utf8?q?=E3=83=83=E3=83=80=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E8=A8=AD?=
 =?utf8?q?=E5=AE=9A=E3=82=92package.h=E3=81=AB=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                       |  1 +
 Makefile                                         |  2 +-
 include/.gitignore                               |  1 -
 include/package.h                                | 13 +++++++++++++
 include/{package.h.version => version.h.version} |  0
 src/casl2.c                                      | 10 +---------
 src/casl2rev.c                                   | 11 +----------
 src/comet2.c                                     |  9 +--------
 src/dumpword.c                                   |  7 +------
 9 files changed, 19 insertions(+), 35 deletions(-)
 delete mode 100644 include/.gitignore
 create mode 100644 include/package.h
 rename include/{package.h.version => version.h.version} (100%)

diff --git a/.gitignore b/.gitignore
index dfb9c09..a78ba84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.o.casl
 !as/sample/hello.o
 !as/sample/sum_10.o
+include/version.h
 *~
 GPATH
 GRTAGS
diff --git a/Makefile b/Makefile
index 7222401..a1921f4 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ VERSIONGITREF := $(shell $(GIT) show-ref -s --tags $(VERSION))
 
 MASTERGITREF := $(shell $(GIT) show-ref -s refs/heads/master)
 
-VERSIONFILES = include/package.h \
+VERSIONFILES = include/version.h \
         test/system/casl2_opt/opt_v/0.txt \
         test/system/comet2_opt/opt_v/0.txt \
         test/system/dumpword/opt_v/0.txt
diff --git a/include/.gitignore b/include/.gitignore
deleted file mode 100644
index 345821b..0000000
--- a/include/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-package.h
diff --git a/include/package.h b/include/package.h
new file mode 100644
index 0000000..2b560c5
--- /dev/null
+++ b/include/package.h
@@ -0,0 +1,13 @@
+#ifndef YACASL2_PACKAGE_H_INCLUDED
+#define YACASL2_PACKAGE_H_INCLUDED
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#define _GNU_SOURCE
+#include <getopt.h>
+#include "cmem.h"
+#include "cerr.h"
+#include "version.h"
+
+#endif
diff --git a/include/package.h.version b/include/version.h.version
similarity index 100%
rename from include/package.h.version
rename to include/version.h.version
diff --git a/src/casl2.c b/src/casl2.c
index 6a1d76f..a5943c0 100644
--- a/src/casl2.c
+++ b/src/casl2.c
@@ -1,14 +1,6 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#define _GNU_SOURCE
-#include <getopt.h>
-
-#include "cmem.h"
-#include "cerr.h"
+#include "package.h"
 #include "assemble.h"
 #include "exec.h"
-#include "package.h"
 
 /**
  * @brief CASL IIのエラーをエラーリストに追加
diff --git a/src/casl2rev.c b/src/casl2rev.c
index c849ecb..38bb16c 100644
--- a/src/casl2rev.c
+++ b/src/casl2rev.c
@@ -1,14 +1,5 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#define _GNU_SOURCE
-#include <getopt.h>
-#include <assert.h>
-
-#include "exec.h"
-#include "cmem.h"
-#include "cerr.h"
 #include "package.h"
+#include "exec.h"
 
 char *grstr(WORD word)
 {
diff --git a/src/comet2.c b/src/comet2.c
index 42ba4ba..1bef35e 100644
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -1,12 +1,5 @@
-#include <stdio.h>
-#include <stdlib.h>
-#define _GNU_SOURCE
-#include <getopt.h>
-
-#include "exec.h"
-#include "cmem.h"
-#include "cerr.h"
 #include "package.h"
+#include "exec.h"
 
 /**
  * comet2コマンドのオプション
diff --git a/src/dumpword.c b/src/dumpword.c
index ad3564e..1fca90e 100644
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -1,10 +1,5 @@
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include "word.h"
-#include "cerr.h"
 #include "package.h"
+#include "word.h"
 
 /**
  * @brief dumpwordコマンドのオプション
-- 
2.18.0