Merge branch 'release/v1.2'

opensourcecobol · Apr 19, 2019 · 44ba99e · 44ba99e
2 parents ca469c0 + caa9927
commit 44ba99e
Show file tree

Hide file tree

Showing 30 changed files with 14,783 additions and 14,451 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2019-04-19  TOKYO SYSTEM HOUSE Co., Ltd. <[email protected]>
+
+	* Open Cobol ESQL (Ocesql) 1.2.0 released
+
+
 2015-03-31  TOKYO SYSTEM HOUSE Co., Ltd. <[email protected]>
 
 	* Open Cobol ESQL (Ocesql) 1.1.0 released

diff --git a/Makefile.am b/Makefile.am
@@ -1 +1,7 @@
-SUBDIRS = dblib ocesql
+if DISABLE_OCESQL
+  OCESQL = 
+else
+  OCESQL = ocesql
+endif
+
+SUBDIRS = dblib $(OCESQL)