Merge branch 'master' of ssh://git.dcc.fc.up.pt/yap-6.3

Conflicts:
	configure
This commit is contained in:
Vítor Santos Costa
2014-02-10 23:57:18 +00:00
21 changed files with 888 additions and 1018 deletions

View File

@@ -117,6 +117,7 @@ CLPBN_LEARNING_EXAMPLES= \
$(CLPBN_EXDIR)/learning/sprinkler_params.yap \
$(CLPBN_EXDIR)/learning/train.yap
all:
install: $(CLBN_TOP) $(CLBN_PROGRAMS) $(CLPBN_LEARNING_PROGRAMS) $(CLPBN_SCHOOL_EXAMPLES) $(CLPBN_HMMER_EXAMPLES) $(CLPBN_LEARNING_EXAMPLES)
mkdir -p $(DESTDIR)$(SHAREDIR)/clpbn
@@ -128,6 +129,8 @@ install: $(CLBN_TOP) $(CLBN_PROGRAMS) $(CLPBN_LEARNING_PROGRAMS) $(CLPBN_SCHOOL_
for h in $(CLPBN_TOP); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
for h in $(CLPBN_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpbn; done
for h in $(CLPBN_LEARNING_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpbn/learning; done
install-examples:
for h in $(CLPBN_EXAMPLES); do $(INSTALL_DATA) $$h $(DESTDIR)$(EXDIR); done
for h in $(CLPBN_SCHOOL_EXAMPLES); do $(INSTALL_DATA) $$h $(DESTDIR)$(EXDIR)/School; done
for h in $(CLPBN_HMMER_EXAMPLES); do $(INSTALL_DATA) $$h $(DESTDIR)$(EXDIR)/HMMer; done

View File

@@ -80,6 +80,8 @@ PROBLOG_EXAMPLES = \
MANUAL_NAME = problog
MANUAL = $(srcdir)/$(MANUAL_NAME)
all:
install: $(PROGRAMS) $(PROBLOG_PROGRAMS) $(PROBLOG_EXAMPLES)
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/problog
@@ -88,6 +90,8 @@ install: $(PROGRAMS) $(PROBLOG_PROGRAMS) $(PROBLOG_EXAMPLES)
for p in $(PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap; done
for p in $(PROBLOG_PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/problog; done
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(DOCSDIR)
install-examples:
for p in $(PROBLOG_EXAMPLES); do $(INSTALL_DATA) $$p $(DESTDIR)$(EXDOCSDIR); done
pdf: $(MANUAL)
@@ -97,3 +101,8 @@ pdf: $(MANUAL)
install_docs: pdf
$(INSTALL_DATA) problog.pdf $(DESTDIR)$(DOCSDIR)
clean:
realclean:
rm -f Makefile

View File

@@ -65,6 +65,12 @@ install: all
for h in $(BDD_PROLOG); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
install-examples:
clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
realclean: clean
rm -f $(SOBJS) Makefile

View File

@@ -1,24 +1,23 @@
AC_ARG_WITH(cudd,
[ --with-cudd[=DIR] use CUDD package in DIR],
yap_cv_cudd="$withval",
[yap_cv_cudd=no])
AC_ARG_ENABLE(bddlib,
[ --enable-bddlib dynamic bdd library ],
dynamic_bdd="$enableval", dynamic_bdd=no)
if test "$yap_cv_cudd" = no
then
ENABLE_CUDD="@# "
ENABLE_BDDLIB="@# "
PKG_BDDLIB=""
elif test "$dynamic_bdd" = yes
then
PKG_BDDLIB="packages/bdd packages/ProbLog/simplecudd packages/ProbLog/simplecudd_lfi"
else
if test "$dynamic_bdd" = yes
then
ENABLE_BDDLIB=""
else
ENABLE_BDDLIB="@# "
fi
ENABLE_CUDD=""
PKG_BDDLIB="packages/ProbLog/simplecudd packages/ProbLog/simplecudd_lfi"
fi
if test "$yap_cv_cudd" != no; then
oldlibs="$LIBS"
@@ -105,7 +104,15 @@ LIBS="$oldlibs"
fi
fi
AC_SUBST(ENABLE_CUDD)
AC_SUBST(ENABLE_BDDLIB)
AC_SUBST(PKG_BDDLIB)
AC_SUBST(CUDD_LDFLAGS)
AC_SUBST(CUDD_CPPFLAGS)
mkdir -p packages/bdd
if test "$PKG_BDDLIB" != ""; then
AC_CONFIG_FILES([packages/bdd/Makefile])
AC_CONFIG_FILES([packages/ProbLog/simplecudd/Makefile])
AC_CONFIG_FILES([packages/ProbLog/simplecudd_lfi/Makefile])
fi

View File

@@ -19,7 +19,6 @@ if test ! "$yap_cv_cplint" = "no"
CPLINT_CFLAGS+=" -I${yap_cv_cplint}/include"
CPLINT_LIBS="-lcudd -lmtr -lst -lepd -lutil -lm "$CPLINT_LIBS
fi
ENABLE_CPLINT=""
if test "$target_os" = "cygwin" -o "$target_os" = "mingw32"
then
CPLINT_SHLIB_LD="gcc -shared ../../yap.dll"
@@ -28,12 +27,23 @@ if test ! "$yap_cv_cplint" = "no"
CPLINT_SHLIB_LD=$SHLIB_LD
SHLIB_SUFFIX="so"
fi
PKG_CPLINT="packages/cplint packages/cplint/splipcase packages/cplint/approx/simplecuddLPADs"
AC_SUBST(PKG_CPLINT)
AC_SUBST(CPLINT_LIBS)
AC_SUBST(CPLINT_CFLAGS)
AC_SUBST(CPLINT_LDFLAGS)
AC_SUBST(CPLINT_SHLIB_LD)
AC_SUBST(SHLIB_SUFFIX)
else
ENABLE_CPLINT="@#"
PKG_CPLINT=""
fi
mkdir -p packages/cplint
mkdir -p packages/cplint/approx
mkdir -p packages/cplint/approx/simplecuddLPADs
AC_CONFIG_FILES([packages/cplint/Makefile])
AC_CONFIG_FILES([packages/cplint/approx/simplecuddLPADs/Makefile])
AC_CONFIG_FILES([packages/cplint/slipcase/Makefile])

View File

@@ -67,6 +67,11 @@ install: all
for h in $(BDD_PROLOG); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
install-examples:
clean:
rm -f *.o *~ $(OBJS) *.BAK
realclean:
rm -f $(SOBJS) Makefile

View File

@@ -14,14 +14,14 @@ CUDA_LDFLAGS=""
CUDA_CPPFLAGS=""
if test "$yap_cv_cuda" = no
then
ENABLE_CUDA="@# "
PKG_CUDA=""
else
AC_PATH_PROG(NVCC, [nvcc], [no], [$yap_cv_cuda/bin])
if test "$yap_cv_cuda" = no
then
ENABLE_CUDA="@# "
PKG_CUDA=""
else
ENABLE_CUDA=""
PKG_CUDA="packages/cuda"
case "$target_os" in
*darwin*)
CUDA_LDFLAGS="$LDFLAGS"
@@ -37,7 +37,7 @@ else
fi
fi
AC_SUBST(ENABLE_CUDA)
AC_SUBST(PKG_CUDA)
AC_SUBST(NVCC)
AC_SUBST(CUDA_SHLIB_LD)
AC_SUBST(CUDA_CPPFLAGS)
@@ -45,3 +45,5 @@ AC_SUBST(CUDA_LDFLAGS)
AC_CONFIG_FILES([packages/cuda/Makefile])
mkdir -p packages/cuda

View File

@@ -69,6 +69,9 @@ gecode.yap: $(srcdir)/gecode$(GECODE_MAJOR)_yap_hand_written.yap $(srcdir)/$(GEC
clean:
-rm -f *.o *.so *~ gecode.yap
realclean:
-rm -f $(SOBJS) Makefile
install: all
mkdir -p $(DESTDIR)$(YAPLIBDIR)
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
@@ -76,3 +79,5 @@ install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
$(INSTALL) gecode.yap $(DESTDIR)$(SHAREDIR)/Yap
$(INSTALL) $(srcdir)/clpfd.yap $(DESTDIR)$(SHAREDIR)/Yap/gecode
install-examples:

View File

@@ -20,11 +20,11 @@ AC_ARG_ENABLE(gecode,
fi], use_gecode=$have_gecode)
if test "$use_gecode" = no; then
ENABLE_GECODE="@# "
PKG_GECODE=""
else
ENABLE_GECODE=""
PKG_GECODE="packages/gecode"
fi
AC_SUBST(ENABLE_GECODE)
AC_SUBST(PKG_GECODE)
AC_MSG_CHECKING([if dynamic arrays are supported])
@@ -90,3 +90,8 @@ fi
AC_SUBST(GECODE_VERSION)
AC_SUBST(GECODE_EXTRALIBS)
if test "$PKG_GECODE" = "packages/gecode"; then
AC_CONFIG_FILES([packages/gecode/Makefile])
fi

View File

@@ -31,7 +31,7 @@ AC_ARG_ENABLE(myddas-top-level,
if test "$yap_cv_myddas" != "no"
then
ENABLE_MYDDAS=""
PKG_MYDDAS="packages/myddas"
dnl check for mysql
AC_SEARCH_LIBS(mysql_init, [mysqlclient], [yap_cv_mysql="yes"], [yap_cv_mysql="no"])
if test "$yap_cv_mysql" = yes
@@ -58,6 +58,7 @@ then
ODBC_LIBS="$ODBC_LIBS -liodbc"
fi
fi
AC_CHECK_HEADERS(mysql/mysql.h)
if test "$yap_cv_odbc" = yes
then
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_ODBC"
@@ -73,13 +74,9 @@ then
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_TOP_LEVEL"
fi
else
ENABLE_MYDDAS="#@ "
ENABLE_MYDDAS=""
fi
AC_SUBST(ENABLE_MYDDAS)
AC_SUBST(PKG_MYDDAS)
if test "$yap_cv_myddas" != "no"
then
AC_CHECK_HEADERS(mysql/mysql.h)
fi

View File

@@ -11,10 +11,10 @@ AC_ARG_WITH(python,
if test "$yap_cv_python" = "no"; then
PYTHON_TARGET="dummy"
ENABLE_PYTHON="@# "
PKG_PYTHON=""
elif test -e "$srcdir"/packages/python/Makefile.in ; then
PYTHON_TARGET="pitf"
ENABLE_PYTHON=""
PKG_PYTHON="packages/python"
if test "$yap_cv_python" = "yes"
then
AC_CHECK_PROGS(PYTHON, python, "none")
@@ -39,7 +39,7 @@ elif test -e "$srcdir"/packages/python/Makefile.in ; then
PYTHON_LIBS="-L $PYTHONHOME/lib"
else
echo "Could not find libraries for Python"
ENABLE_PYTHON="@# "
PKG_PYTHON=""
fi
OLIBS=$LIBS
LIBS=$PYTHON_LIBS
@@ -55,20 +55,20 @@ elif test -e "$srcdir"/packages/python/Makefile.in ; then
PYTHON_INCLUDES="-I $PYTHONHOME/include"
else
echo "Could not find includes for Python"
ENABLE_PYTHON="@# "
PKG_PYTHON=""
fi
fi
else
PYTHON_TARGET="dummy"
ENABLE_PYTHON="@# "
PKG_PYTHON=""
fi
AC_SUBST(PYTHON_TARGET)
AC_SUBST(ENABLE_PYTHON)
AC_SUBST(PKG_PYTHON)
AC_SUBST(PYTHON_INCLUDES)
AC_SUBST(PYTHON_LIBS)
if test "$ENABLE_PYTHON" = ""; then
if test "$PKG_PYTHON" != ""; then
AC_CONFIG_FILES([ packages/python/Makefile ])
fi

View File

@@ -76,9 +76,14 @@ pl-minisat.o : $(srcdir)/pl-minisat.C
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
install-examples:
clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
realclean:
rm -f Makefile $(OBJS)
depend: $(HEADERS) $(C_SOURCES)
-@if test "$(GCC)" = yes; then\

View File

@@ -34,10 +34,18 @@ EXAMPLE_PROGRAMS= \
$(srcdir)/examples/adder.pl \
$(srcdir)/examples/pearl_examples.pl
all:
install: $(PROGRAMS)
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
mkdir -p $(DESTDIR)$(SHAREDIR)/doc/Yap/packages/examples/minisat
for p in $(PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap; done
for p in $(EXAMPLE_PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/doc/Yap/packages/examples/minisat; done
install-examples:
clean:
realclean:
rm Makefile