Updated to Working CHR

This commit is contained in:
Vitor Santos Costa 2008-08-26 00:18:06 +01:00
parent 6f0b3cf2f5
commit 42bed282b4
6 changed files with 33 additions and 82 deletions

@ -1 +1 @@
Subproject commit 6f423ed237c23d090c56e2dbd0667c93fb302387 Subproject commit ef9e506ca3befa9589b683ddd7e482411c00b759

23
configure vendored
View File

@ -725,6 +725,10 @@ ENABLE_WINCONSOLE
INSTALL_MATLAB INSTALL_MATLAB
MATLAB_INCLUDE MATLAB_INCLUDE
M4GENABSMI M4GENABSMI
PROLOG_SYSTEM
IN_YAP
IN_SWI
CHR_TARGETS
LIBOBJS LIBOBJS
LTLIBOBJS' LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
@ -16161,6 +16165,16 @@ _ACEOF
fi fi
fi fi
PROLOG_SYSTEM=yap
IN_YAP=
IN_SWI="#"
CHR_TARGETS=chr_support"$SHLIB_SUFFIX"
mkdir -p library/matrix mkdir -p library/matrix
mkdir -p library/matlab mkdir -p library/matlab
mkdir -p library/mpi mkdir -p library/mpi
@ -16189,7 +16203,7 @@ mkdir -p GPL/clpqr
mkdir -p GPL/http mkdir -p GPL/http
mkdir -p cplint mkdir -p cplint
ac_config_files="$ac_config_files Makefile library/matrix/Makefile library/matlab/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/Makefile LGPL/chr/Makefile LGPL/chr/chr_swi_bootstrap.yap CLPBN/Makefile LGPL/clp/Makefile GPL/clpqr/Makefile library/lammpi/Makefile library/tries/Makefile library/rltree/Makefile LGPL/swi_console/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap GPL/http/Makefile GPL/Makefile cplint/Makefile" ac_config_files="$ac_config_files Makefile library/matrix/Makefile library/matlab/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/Makefile LGPL/chr/Makefile CLPBN/Makefile LGPL/clp/Makefile GPL/clpqr/Makefile library/lammpi/Makefile library/tries/Makefile library/rltree/Makefile LGPL/swi_console/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap GPL/http/Makefile GPL/Makefile cplint/Makefile"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
@ -16757,7 +16771,6 @@ do
"library/Makefile") CONFIG_FILES="$CONFIG_FILES library/Makefile" ;; "library/Makefile") CONFIG_FILES="$CONFIG_FILES library/Makefile" ;;
"LGPL/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/Makefile" ;; "LGPL/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/Makefile" ;;
"LGPL/chr/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/chr/Makefile" ;; "LGPL/chr/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/chr/Makefile" ;;
"LGPL/chr/chr_swi_bootstrap.yap") CONFIG_FILES="$CONFIG_FILES LGPL/chr/chr_swi_bootstrap.yap" ;;
"CLPBN/Makefile") CONFIG_FILES="$CONFIG_FILES CLPBN/Makefile" ;; "CLPBN/Makefile") CONFIG_FILES="$CONFIG_FILES CLPBN/Makefile" ;;
"LGPL/clp/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/clp/Makefile" ;; "LGPL/clp/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/clp/Makefile" ;;
"GPL/clpqr/Makefile") CONFIG_FILES="$CONFIG_FILES GPL/clpqr/Makefile" ;; "GPL/clpqr/Makefile") CONFIG_FILES="$CONFIG_FILES GPL/clpqr/Makefile" ;;
@ -16986,11 +16999,15 @@ ENABLE_WINCONSOLE!$ENABLE_WINCONSOLE$ac_delim
INSTALL_MATLAB!$INSTALL_MATLAB$ac_delim INSTALL_MATLAB!$INSTALL_MATLAB$ac_delim
MATLAB_INCLUDE!$MATLAB_INCLUDE$ac_delim MATLAB_INCLUDE!$MATLAB_INCLUDE$ac_delim
M4GENABSMI!$M4GENABSMI$ac_delim M4GENABSMI!$M4GENABSMI$ac_delim
PROLOG_SYSTEM!$PROLOG_SYSTEM$ac_delim
IN_YAP!$IN_YAP$ac_delim
IN_SWI!$IN_SWI$ac_delim
CHR_TARGETS!$CHR_TARGETS$ac_delim
LIBOBJS!$LIBOBJS$ac_delim LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then
break break
elif $ac_last_try; then elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

View File

@ -1410,6 +1410,17 @@ AC_DEFINE(USE_DL_MALLOC,1)
fi fi
fi fi
dnl SWI compatibility support!
PROLOG_SYSTEM=yap
IN_YAP=
IN_SWI="#"
CHR_TARGETS=chr_support"$SHLIB_SUFFIX"
AC_SUBST(PROLOG_SYSTEM)
AC_SUBST(IN_YAP)
AC_SUBST(IN_SWI)
AC_SUBST(CHR_TARGETS)
mkdir -p library/matrix mkdir -p library/matrix
mkdir -p library/matlab mkdir -p library/matlab
mkdir -p library/mpi mkdir -p library/mpi
@ -1438,7 +1449,7 @@ mkdir -p GPL/clpqr
mkdir -p GPL/http mkdir -p GPL/http
mkdir -p cplint mkdir -p cplint
AC_OUTPUT(Makefile library/matrix/Makefile library/matlab/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/Makefile LGPL/chr/Makefile LGPL/chr/chr_swi_bootstrap.yap CLPBN/Makefile LGPL/clp/Makefile GPL/clpqr/Makefile library/lammpi/Makefile library/tries/Makefile library/rltree/Makefile LGPL/swi_console/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap GPL/http/Makefile GPL/Makefile cplint/Makefile) AC_OUTPUT(Makefile library/matrix/Makefile library/matlab/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/Makefile LGPL/chr/Makefile CLPBN/Makefile LGPL/clp/Makefile GPL/clpqr/Makefile library/lammpi/Makefile library/tries/Makefile library/rltree/Makefile LGPL/swi_console/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap GPL/http/Makefile GPL/Makefile cplint/Makefile)
make depend make depend

View File

@ -1,8 +0,0 @@
manual.pdf: manual.tex manual.bbl
pdflatex manual
pdflatex manual
manual.html: manual.tex manual.bbl
htlatex manual

View File

@ -1,46 +0,0 @@
#
# generate documentation files for YAP
#
MAKEINFO=makeinfo
TEXI2DVI=texi2dvi
TEXI2HTML=texi2html
TEXI2PDF=texi2pdf
all: info html ps pdf
install-info:
$(MAKEINFO) $(MAKEINFOFLAGS) -I $(srcdir) -o $(INFODIR)/yap.info $(srcdir)/Documentation/yap.tex
info: yap.info
yap.info: yap.tex
$(MAKEINFO) yap.tex
html: yap.html
yap.html: yap.tex
$(TEXI2HTML) yap.tex
dvi: yap.dvi
yap.dvi: yap.tex
$(TEXI2DVI) yap.tex
ps: yap.ps
yap.ps: yap.dvi
dvips -o yap.ps yap
pdf: yap.pdf
yap.pdf: yap.tex
$(TEXI2PDF) yap.tex
clean:
rm -f *.aux *.ca *.cas *.cn *.cns *.cp *.cps *.cy *.cys *.dvi *.fn *.fns *.ky *.log *.sa *.sas *.sn *.sns *.sy *.sys *~ *.tp *.vr *.toc *.pg
realclean:
-@make clean
rm -f yap.ps yap.html yap_toc.html yap.pdf yap.info*

View File

@ -1,23 +0,0 @@
FILE=iclp07
all: $(FILE).dvi $(FILE).ps $(FILE).pdf
$(FILE).dvi: force
./latexmk $(FILE)
$(FILE).ps: $(FILE).dvi
dvips -t a4 -P cmz -o $(FILE).ps $(FILE).dvi
$(FILE).pdf: $(FILE).ps
ps2pdf14 $(FILE).ps
.PHONY: force
force:
.PHONY: clean
clean::
rm -f $(FILE).aux $(FILE).aux.bak $(FILE).bbl $(FILE).blg $(FILE).dvi $(FILE).log
.PHONY: realclean
realclean: clean
rm -f $(FILE).ps $(FILE).pdf