Commit e2714c55 authored by Jeremy Bicha's avatar Jeremy Bicha

Imported Upstream version 5.3.13

parent bbeaa7aa
Version 5.3.13 (19 Nov 2016)
* Fix fatal errors w/ zlib-dev and python dependencies.
Version 5.3.12: (17 Nov 2016)
* Fix bug in 'any' language (opencog/relex/issues/248).
* Preliminary support for common typos in English.
* Enable both python2 & python3 bindings by default.
* Fix locale_t use for the newly introduced Cygwin 2.6.0.
* Include in the distribution the missing make-check.py (for Windows).
* Minisat configuration improvements + fix a problem on Gentoo.
* When using the bundled minisat, link it statically, don't install it.
Version 5.3.11: (26 Sept 2016)
* Re-enable postscript header printing!
* Cleanup python API (in a non-backwards-compat fashion).
......
......@@ -33,6 +33,7 @@ EXTRA_DIST = \
docker/docker-parser/Dockerfile \
docker/docker-python/Dockerfile \
docker/docker-server/Dockerfile \
m4/varcheckpoint.m4
msvc14/LGlib-features.props \
msvc14/LinkGrammarExe.vcxproj \
msvc14/LinkGrammarExe.vcxproj.filters \
......@@ -49,6 +50,7 @@ EXTRA_DIST = \
msvc14/Python2.vcxproj.filters \
msvc14/Python3.vcxproj.filters \
msvc14/README \
msvc14/make-check.py \
mingw/README.Cygwin \
mingw/README.MSYS \
TODO
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -79,18 +89,15 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/link-grammar.pc.in $(srcdir)/link-grammar.spec.in \
AUTHORS ChangeLog NEWS README TODO compile config.guess \
config.sub depcomp install-sh missing py-compile ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
$(top_srcdir)/m4/varcheckpoint.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
......@@ -181,6 +188,10 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/link-grammar.pc.in \
$(srcdir)/link-grammar.spec.in AUTHORS ChangeLog NEWS README \
TODO compile config.guess config.sub install-sh ltmain.sh \
missing py-compile
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -267,6 +278,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JAVA_CPPFLAGS = @JAVA_CPPFLAGS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LG_PYDIR = @LG_PYDIR@
LIBEDIT_CFLAGS = @LIBEDIT_CFLAGS@
LIBEDIT_LIBS = @LIBEDIT_LIBS@
LIBGC_CFLAGS = @LIBGC_CFLAGS@
......@@ -281,6 +293,7 @@ LINK_MINOR_VERSION = @LINK_MINOR_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
......@@ -310,11 +323,18 @@ PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PYTHON = @PYTHON@
PYTHON2_CPPFLAGS = @PYTHON2_CPPFLAGS@
PYTHON2_LDFLAGS = @PYTHON2_LDFLAGS@
PYTHON2_LIBS = @PYTHON2_LIBS@
PYTHON3 = @PYTHON3@
PYTHON3_CPPFLAGS = @PYTHON3_CPPFLAGS@
PYTHON3_LDFLAGS = @PYTHON3_LDFLAGS@
PYTHON3_LIBS = @PYTHON3_LIBS@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
......@@ -334,6 +354,7 @@ VERSION = @VERSION@
VERSION_INFO = @VERSION_INFO@
WARN_CFLAGS = @WARN_CFLAGS@
WARN_CXXFLAGS = @WARN_CXXFLAGS@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......@@ -382,7 +403,10 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
pyexecdir = @pyexecdir@
python2dir = @python2dir@
python3dir = @python3dir@
pythondir = @pythondir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......@@ -425,25 +449,7 @@ EXTRA_DIST = \
docker/docker-parser/Dockerfile \
docker/docker-python/Dockerfile \
docker/docker-server/Dockerfile \
msvc14/LGlib-features.props \
msvc14/LinkGrammarExe.vcxproj \
msvc14/LinkGrammarExe.vcxproj.filters \
msvc14/LinkGrammarJava.vcxproj \
msvc14/LinkGrammarJava.vcxproj.filters \
msvc14/LinkGrammar.sln \
msvc14/LinkGrammar.vcxproj \
msvc14/LinkGrammar.vcxproj.filters \
msvc14/Local.props \
msvc14/confvar.bat \
msvc14/MSVC-common.props \
msvc14/post-build.bat \
msvc14/Python2.vcxproj \
msvc14/Python2.vcxproj.filters \
msvc14/Python3.vcxproj.filters \
msvc14/README \
mingw/README.Cygwin \
mingw/README.MSYS \
TODO
m4/varcheckpoint.m4
all: all-recursive
......@@ -463,7 +469,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -704,15 +709,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
......@@ -748,17 +753,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
mkdir $(distdir)/_build $(distdir)/_inst
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure \
&& $(am__cd) $(distdir)/_build/sub \
&& ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=.. --prefix="$$dc_install_base" \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
......@@ -938,6 +943,28 @@ uninstall-am: uninstall-pkgconfigDATA
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-pkgconfigDATA
.PRECIOUS: Makefile
msvc14/LGlib-features.props \
msvc14/LinkGrammarExe.vcxproj \
msvc14/LinkGrammarExe.vcxproj.filters \
msvc14/LinkGrammarJava.vcxproj \
msvc14/LinkGrammarJava.vcxproj.filters \
msvc14/LinkGrammar.sln \
msvc14/LinkGrammar.vcxproj \
msvc14/LinkGrammar.vcxproj.filters \
msvc14/Local.props \
msvc14/confvar.bat \
msvc14/MSVC-common.props \
msvc14/post-build.bat \
msvc14/Python2.vcxproj \
msvc14/Python2.vcxproj.filters \
msvc14/Python3.vcxproj.filters \
msvc14/README \
msvc14/make-check.py \
mingw/README.Cygwin \
mingw/README.MSYS \
TODO
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
Link Grammar Parser
-------------------
Version 5.3.10
Version 5.3.13
The Link Grammar Parser implements the Sleator/Temperley/Lafferty
......@@ -86,7 +86,7 @@ UNPACKING and signature verification:
no malicious changes were made to the code internals by third
parties. The signatures can be checked with the gpg command:
gpg --verify link-grammar-5.3.10.tar.gz.asc
gpg --verify link-grammar-5.3.13.tar.gz.asc
which should generate output identical to (except for the date):
......@@ -492,7 +492,7 @@ Using the Network Server
storeDiagramString:true, text: this is a test.
Spell Checking:
Spell Guessing:
---------------
The parser will run a spell-checker at an early stage, if it
encounters a word that it does not know, and cannot guess, based on
......@@ -500,7 +500,7 @@ Spell Checking:
spell-checkers; if the aspell devel environment is found, then
aspell is used, else hunspell is used.
Spell checking may be disabled at runtime, in the link-parser client
Spell guessing may be disabled at runtime, in the link-parser client
with the !spell=0 flag. Enter !help for more details.
......@@ -859,6 +859,18 @@ TODO -- Working Notes:
where it can be handled like any other language feature.
The tokenizer includes experimental code for that.
Corpus-statistics-based parse ranking:
The old for parse ranking via corpus statistics needs to be revived.
The issue can be illustrated with these example sentences:
"Please the customer, bring in the money"
"Please, turn off the lights"
In the first sentence, the comma acts as a conjunction of two
directives (imperatives). In the second sentence, it is much too
easy to mistake "please" for a verb, the comma for a conjunction,
and come to the conclusion that one should please some unstated
object, and then turn off the lights. (Perhaps one is pleasing
by turning off the lights?)
Punctuation, zero-copula, zero-that:
Poorly punctuated sentences cause problems: for example:
"Mike was not first, nor was he last."
......
This diff is collapsed.
......@@ -30,9 +30,13 @@ libtoolize --force --copy || {
# Produce aclocal.m4, so autoconf gets the automake macros it needs
#
echo "Creating aclocal.m4: aclocal $ACLOCAL_FLAGS"
case `uname` in
CYGWIN*)
include_dir='-I m4' # Needed for Cygwin only.
esac
echo "Creating aclocal.m4: aclocal $include_dir $ACLOCAL_FLAGS"
aclocal $ACLOCAL_FLAGS 2>> autogen.err
aclocal $include_dir $ACLOCAL_FLAGS 2>> autogen.err
# Produce all the `GNUmakefile.in's and create neat missing things
# like `install-sh', etc.
......
......@@ -18,14 +18,22 @@ if HAVE_PERL
SUBDIRS += perl
endif
if HAVE_PYTHON
SUBDIRS += python python-examples
if HAVE_PYTHON2
SUBDIRS += python
endif
if HAVE_PYTHON3
SUBDIRS += python3 python-examples
SUBDIRS += python3
endif
# Add python-examples only once - else make enters it twice.
if HAVE_PYTHON2
SUBDIRS += python-examples
else !HAVE_PYTHON2
if HAVE_PYTHON3
SUBDIRS += python-examples
endif HAVE_PYTHON3
endif !HAVE_PYTHON2
EXTRA_DIST = \
README \
......
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -18,7 +18,17 @@
# Automake file for programming language bindings to link-grammar
#
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -84,17 +94,21 @@ host_triplet = @host@
@HAVE_JAVA_TRUE@am__append_1 = java-jni
@HAVE_ANT_TRUE@am__append_2 = java
@HAVE_PERL_TRUE@am__append_3 = perl
@HAVE_PYTHON_TRUE@am__append_4 = python python-examples
@HAVE_PYTHON3_TRUE@am__append_5 = python3 python-examples
@HAVE_PYTHON2_TRUE@am__append_4 = python
@HAVE_PYTHON3_TRUE@am__append_5 = python3
# Add python-examples only once - else make enters it twice.
@HAVE_PYTHON2_TRUE@am__append_6 = python-examples
@HAVE_PYTHON2_FALSE@@HAVE_PYTHON3_TRUE@am__append_7 = python-examples
subdir = bindings
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
$(top_srcdir)/m4/varcheckpoint.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
......@@ -152,7 +166,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = java-jni java ocaml perl python python-examples python3
DIST_SUBDIRS = java-jni java ocaml perl python python3 python-examples
am__DIST_COMMON = $(srcdir)/Makefile.in README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
......@@ -223,6 +238,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JAVA_CPPFLAGS = @JAVA_CPPFLAGS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LG_PYDIR = @LG_PYDIR@
LIBEDIT_CFLAGS = @LIBEDIT_CFLAGS@
LIBEDIT_LIBS = @LIBEDIT_LIBS@
LIBGC_CFLAGS = @LIBGC_CFLAGS@
......@@ -237,6 +253,7 @@ LINK_MINOR_VERSION = @LINK_MINOR_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
......@@ -266,11 +283,18 @@ PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PYTHON = @PYTHON@
PYTHON2_CPPFLAGS = @PYTHON2_CPPFLAGS@
PYTHON2_LDFLAGS = @PYTHON2_LDFLAGS@
PYTHON2_LIBS = @PYTHON2_LIBS@
PYTHON3 = @PYTHON3@
PYTHON3_CPPFLAGS = @PYTHON3_CPPFLAGS@
PYTHON3_LDFLAGS = @PYTHON3_LDFLAGS@
PYTHON3_LIBS = @PYTHON3_LIBS@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
......@@ -290,6 +314,7 @@ VERSION = @VERSION@
VERSION_INFO = @VERSION_INFO@
WARN_CFLAGS = @WARN_CFLAGS@
WARN_CXXFLAGS = @WARN_CXXFLAGS@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......@@ -338,7 +363,10 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
pyexecdir = @pyexecdir@
python2dir = @python2dir@
python3dir = @python3dir@
pythondir = @pythondir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......@@ -348,7 +376,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = $(am__append_1) $(am__append_2) ocaml $(am__append_3) \
$(am__append_4) $(am__append_5)
$(am__append_4) $(am__append_5) $(am__append_6) \
$(am__append_7)
EXTRA_DIST = \
README \
autoit/_LGTest.au3 \
......@@ -372,7 +401,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -667,6 +695,8 @@ uninstall-am:
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags tags-am uninstall uninstall-am
.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -19,7 +19,17 @@
#
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -90,15 +100,14 @@ host_triplet = @host@
@WITH_CORPUS_TRUE@am__append_6 = $(top_builddir)/link-grammar/corpus/liblink-corpus.la ${SQLITE3_LIBS}
@WITH_PTHREADS_TRUE@am__append_7 = -lpthread
subdir = bindings/java-jni
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
$(top_srcdir)/m4/varcheckpoint.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
......@@ -213,6 +222,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
......@@ -258,6 +268,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JAVA_CPPFLAGS = @JAVA_CPPFLAGS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LG_PYDIR = @LG_PYDIR@
LIBEDIT_CFLAGS = @LIBEDIT_CFLAGS@
LIBEDIT_LIBS = @LIBEDIT_LIBS@
LIBGC_CFLAGS = @LIBGC_CFLAGS@
......@@ -272,6 +283,7 @@ LINK_MINOR_VERSION = @LINK_MINOR_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
......@@ -301,11 +313,18 @@ PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PYTHON = @PYTHON@
PYTHON2_CPPFLAGS = @PYTHON2_CPPFLAGS@
PYTHON2_LDFLAGS = @PYTHON2_LDFLAGS@
PYTHON2_LIBS = @PYTHON2_LIBS@
PYTHON3 = @PYTHON3@
PYTHON3_CPPFLAGS = @PYTHON3_CPPFLAGS@
PYTHON3_LDFLAGS = @PYTHON3_LDFLAGS@
PYTHON3_LIBS = @PYTHON3_LIBS@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
......@@ -325,6 +344,7 @@ VERSION = @VERSION@
VERSION_INFO = @VERSION_INFO@
WARN_CFLAGS = @WARN_CFLAGS@
WARN_CXXFLAGS = @WARN_CXXFLAGS@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......@@ -373,7 +393,10 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
pyexecdir = @pyexecdir@
python2dir = @python2dir@
python3dir = @python3dir@
pythondir = @pythondir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......@@ -420,7 +443,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/java-jni/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/java-jni/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -721,6 +743,8 @@ uninstall-am: uninstall-libLTLIBRARIES
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
......@@ -17,9 +17,16 @@ JAVA_SRCS = \
linkgrammar-@VERSION@.jar: $(JAVA_SRCS)
ant
# distclean-generic will delete build.xml, so clean-local must run
# first.... but then, build.xml doesn't get removed :-(
distclean-generic: clean-local
distclean-local: clean-local
-rm -f build.xml
# Let ant delete the files that ant creates.
clean-local:
ant clean
-rm -f *.jar
javadir=$(datadir)/java
java_DATA = linkgrammar-@VERSION@.jar
......
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -19,7 +19,17 @@
#
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -83,15 +93,14 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = bindings/java
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(srcdir)/build.xml.in README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
$(top_srcdir)/m4/varcheckpoint.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES = build.xml
CONFIG_CLEAN_VPATH_FILES =
......@@ -144,6 +153,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(javadir)"
DATA = $(java_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/build.xml.in README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
......@@ -189,6 +199,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JAVA_CPPFLAGS = @JAVA_CPPFLAGS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LG_PYDIR = @LG_PYDIR@
LIBEDIT_CFLAGS = @LIBEDIT_CFLAGS@
LIBEDIT_LIBS = @LIBEDIT_LIBS@
LIBGC_CFLAGS = @LIBGC_CFLAGS@
......@@ -203,6 +214,7 @@ LINK_MINOR_VERSION = @LINK_MINOR_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
......@@ -232,11 +244,18 @@ PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PYTHON = @PYTHON@
PYTHON2_CPPFLAGS = @PYTHON2_CPPFLAGS@
PYTHON2_LDFLAGS = @PYTHON2_LDFLAGS@
PYTHON2_LIBS = @PYTHON2_LIBS@
PYTHON3 = @PYTHON3@
PYTHON3_CPPFLAGS = @PYTHON3_CPPFLAGS@
PYTHON3_LDFLAGS = @PYTHON3_LDFLAGS@
PYTHON3_LIBS = @PYTHON3_LIBS@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
......@@ -256,6 +275,7 @@ VERSION = @VERSION@
VERSION_INFO = @VERSION_INFO@
WARN_CFLAGS = @WARN_CFLAGS@
WARN_CXXFLAGS = @WARN_CXXFLAGS@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......@@ -304,7 +324,10 @@ prefix = @prefix@
program_transform_name = @program_transform_name@