diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3

Browse Source
This commit is contained in:
Vitor Santos Costa 2012-10-22 22:04:38 +01:00
commit f189784510
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -724,6 +724,7 @@ all: startup.yss
@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE)) @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE))
@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE)) @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE))
@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE)) @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE))
@ENABLE_PYTHON@ @INSTALL_DLLS@ (cd packages/pyswip; $(MAKE))
startup.yss: yap@EXEC_SUFFIX@ $(PL_SOURCES) startup.yss: yap@EXEC_SUFFIX@ $(PL_SOURCES)
-rm -f startup.yss -rm -f startup.yss
@ -792,6 +793,7 @@ install_unix: startup.yss libYap.a
@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install) @INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install)
@ENABLE_REAL@ (cd packages/real; $(MAKE) install) @ENABLE_REAL@ (cd packages/real; $(MAKE) install)
@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install) @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install)
@ENABLE_PYTHON@ @INSTALL_DLLS@ (cd packages/pyswip; $(MAKE) install)
#@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/pyswip; $(MAKE) install) #@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/pyswip; $(MAKE) install)
mkdir -p $(DESTDIR)$(INCLUDEDIR) mkdir -p $(DESTDIR)$(INCLUDEDIR)
mkdir -p $(DESTDIR)$(INCLUDEDIR)/src mkdir -p $(DESTDIR)$(INCLUDEDIR)/src
@ -857,6 +859,7 @@ install_win32: startup.yss @ENABLE_WINCONSOLE@ yap-win@EXEC_SUFFIX@
(cd packages/CLPBN ; $(MAKE) install) (cd packages/CLPBN ; $(MAKE) install)
@ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(MAKE) install) @ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(MAKE) install)
@ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install) @ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install)
@ENABLE_PYTHON@ (cd packages/python ; $(MAKE) install)
@ENABLE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install) @ENABLE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install)
@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install) @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install)
@ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE) install) @ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE) install)
@ -931,6 +934,7 @@ clean: clean_docs
@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) clean) @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) clean)
@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE) clean) @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE) clean)
@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) clean) @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) clean)
@ENABLE_PYTHON@ @INSTALL_DLLS@ (cd packages/python; $(MAKE) clean)

7
configure vendored
View File

@ -11201,7 +11201,12 @@ ac_config_files="$ac_config_files packages/http/Makefile"
fi fi
if test "$ENABLE_JPL" = ""; then if test "$ENABLE_JPL" = ""; then
ac_config_files="$ac_config_files packages/jpl/Makefile packages/jpl/jpl_paths.yap packages/jpl/src/java/Makefile packages/pyswip/Makefile" ac_config_files="$ac_config_files packages/jpl/Makefile packages/jpl/jpl_paths.yap packages/jpl/src/java/Makefile"
fi
if test "$ENABLE_PYTHON" = ""; then
ac_config_files="$ac_config_files packages/pyswip/Makefile"
fi fi

6
configure.in
View File

@ -2527,7 +2527,11 @@ AC_CONFIG_FILES([packages/http/Makefile])
fi fi
if test "$ENABLE_JPL" = ""; then if test "$ENABLE_JPL" = ""; then
AC_CONFIG_FILES([packages/jpl/Makefile packages/jpl/jpl_paths.yap packages/jpl/src/java/Makefile packages/pyswip/Makefile ]) AC_CONFIG_FILES([packages/jpl/Makefile packages/jpl/jpl_paths.yap packages/jpl/src/java/Makefile ])
fi
if test "$ENABLE_PYTHON" = ""; then
AC_CONFIG_FILES([ packages/pyswip/Makefile ])
fi fi
if test "$ENABLE_PLDOC" = ""; then if test "$ENABLE_PLDOC" = ""; then

2
packages/real

@ -1 +1 @@
Subproject commit 8f441c441b9e481e0467676d70b0f5e949c87a79 Subproject commit aaef148402584fef38f291b3b5f319c9c2e1d811