clean up makefile

H/absmi.h

@@ -72,7 +72,7 @@ static char SccsId[] = "%W% %G%";
 #ifdef BP_FREE
 /***************************************************************
 * Use bp as PREG for X86 machines		               *
-***************************************************************/
+********************************************Term*******************/
 #if defined(IN_ABSMI_C)
 register struct yami* P1REG asm ("bp"); /* can't use yamop before Yap.h */
 #define PREG P1REG

Makefile.in

@@ -225,7 +225,7 @@ IOLIB_SOURCES=$(srcdir)/os/pl-buffer.c $(srcdir)/os/pl-ctype.c \
 	$(srcdir)/os/pl-text.c \
 	$(srcdir)/os/pl-version.c \
 	$(srcdir)/os/pl-write.c \
-	$(srcdir)/C/pl-yap.c @ENABLE_WINCONSOLE@$(srcdir)/os/windows/uxnt.c
+	$(srcdir)/C/pl-yap.c @WINDOWS@$(srcdir)/os/windows/uxnt.c
 
 C_SOURCES= \
 	$(IOLIB_SOURCES) \
@@ -346,7 +346,7 @@ IOLIB_OBJECTS=pl-buffer.o pl-codelist.o pl-ctype.o pl-dtoa.o pl-error.o  \
 	pl-stream.o pl-string.o pl-table.o \
 	pl-tai.o pl-text.o pl-utf8.o \
 	pl-version.o pl-write.o \
-	pl-yap.o @ENABLE_WINCONSOLE@ uxnt.o
+	pl-yap.o @WINDOWS@ uxnt.o
 
 ENGINE_OBJECTS = \
 	agc.o absmi.o adtdefs.o alloc.o amasm.o analyst.o arrays.o \
@@ -402,7 +402,7 @@ PLCONS_OBJECTS = \
 	pl-ntconsole.o \
 	pl-ntmain.o
 
-all: parms.h startup.yss @ENABLE_WINCONSOLE@ yap-win@EXEC_SUFFIX@
+all: parms.h startup.yss @WINDOWS@ yap-win@EXEC_SUFFIX@
 
 Makefile: $(srcdir)/Makefile.in
 
@@ -435,6 +435,11 @@ parms.h:	Makefile
 		@if cmp -s $@% $@; then rm $@%; else mv $@% $@; fi
 
 
+$(OBJECTS): config.h
+
+yap.o: $(srcdir)/console/yap.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include $(srcdir)/console/yap.c -o $@
+
 #special rule for this one: we cannot use -fomit-frame-pointer because this will
 # interface with the outside world.
 c_interface.o: $(srcdir)/C/c_interface.c $(srcdir)/include/c_interface.h config.h
@@ -446,86 +451,26 @@ yap-argss.o: $(srcdir)/C/yap-args.c $(srcdir)/include/c_interface.h config.h
 clause_list.o: $(srcdir)/C/clause_list.c $(srcdir)/include/clause_list.h config.h
 	$(CC) $(C_INTERF_FLAGS) -c $(srcdir)/C/clause_list.c -o clause_list.o
 
-init.o: $(srcdir)/C/init.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/C/init.c -o $@
-
-load_foreign.o: $(srcdir)/C/load_foreign.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/C/load_foreign.c -o $@
-
-qlyr.o: $(srcdir)/C/qlyr.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/C/qlyr.c -o $@
-
-qlyw.o: $(srcdir)/C/qlyw.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/C/qlyw.c -o $@
-
-save.o: $(srcdir)/C/save.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/C/save.c -o $@
-
-signals.o: $(srcdir)/C/signals.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/C/signals.c -o $@
-
-sysbits.o: $(srcdir)/C/sysbits.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/C/sysbits.c -o $@
-
 udi.o: $(srcdir)/C/udi.c config.h
 	$(CC) -c $(C_INTERF_FLAGS) $(srcdir)/C/udi.c -o $@
 
-yap.o: $(srcdir)/console/yap.c config.h
+%.o: $(srcdir)/C/%.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include $(srcdir)/console/yap.c -o $@
+	$(CC) -c $(CFLAGS) $< -o $@
 
-mpi.o: $(srcdir)/library/mpi/mpi.c config.h
+%.o: $(srcdir)/OPTYap/%.c config.h
-	$(MPI_CC) -c $(CFLAGS) $(srcdir)/library/mpi/mpi.c -o $@
+	$(CC) -c $(CFLAGS) $< -o $@
 
-mpe.o: $(srcdir)/library/mpi/mpe.c config.h
+%.o: $(srcdir)/BEAM/%.c config.h
-	$(MPI_CC) -c $(CFLAGS) $(srcdir)/library/mpi/mpe.c -o $@
+	$(CC) -c $(CFLAGS) $< -o $@
-
-or.memory.o: $(srcdir)/OPTYap/or.memory.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/OPTYap/or.memory.c -o $@
-
-opt.init.o: $(srcdir)/OPTYap/opt.init.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/OPTYap/opt.init.c -o $@
-
-opt.preds.o: $(srcdir)/OPTYap/opt.preds.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/OPTYap/opt.preds.c -o $@
-
-or.cut.o: $(srcdir)/OPTYap/or.cut.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/OPTYap/or.cut.c -o $@
-
-or.copy_engine.o: $(srcdir)/OPTYap/or.copy_engine.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/OPTYap/or.copy_engine.c -o $@
-
-or.cow_engine.o: $(srcdir)/OPTYap/or.cow_engine.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/OPTYap/or.cow_engine.c -o $@
-
-or.sba_engine.o: $(srcdir)/OPTYap/or.sba_engine.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/OPTYap/or.sba_engine.c -o $@
-
-or.thread_engine.o: $(srcdir)/OPTYap/or.thread_engine.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/OPTYap/or.thread_engine.c -o $@
-
-or.scheduler.o: $(srcdir)/OPTYap/or.scheduler.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/OPTYap/or.scheduler.c -o $@
-
-tab.tries.o: $(srcdir)/OPTYap/tab.tries.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/OPTYap/tab.tries.c -o $@
-
-tab.completion.o: $(srcdir)/OPTYap/tab.completion.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/OPTYap/tab.completion.c -o $@
-
-eam_showcode.o:  $(srcdir)/BEAM/eam_showcode.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/BEAM/eam_showcode.c -o $@
-
-eam_am.o:  $(srcdir)/BEAM/eam_am.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/BEAM/eam_am.c -o $@
-
-eamamasm.o:  $(srcdir)/BEAM/eamamasm.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/BEAM/eamamasm.c -o $@
-
-eamindex.o:  $(srcdir)/BEAM/eamindex.c config.h
-	$(CC) -c $(CFLAGS) $(srcdir)/BEAM/eamindex.c -o $@
 
 sys.o: $(srcdir)/library/system/sys.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include $(srcdir)/library/system/sys.c  -o $@
+	$(CC) -c $(CFPLAGS) -I$(srcdir)/include $(srcdir)/library/system/sys.c  -o $@
+
+yap_random.o: $(srcdir)/library/random/yap_random.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  $(srcdir)/library/random/yap_random.c  -o $@
+
+%.o: $(srcdir)/library/regex/%.c  @NO_BUILTIN_REGEXP@ $(srcdir)/library/regex/regex2.h  $(srcdir)/library/regex/engine.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/regex $< -o $@
 
 swi.o: $(srcdir)/library/dialect/swi/fli/swi.c  $(srcdir)/library/dialect/swi/fli/swi.h $(srcdir)/include/SWI-Prolog.h $(srcdir)/os/SWI-Stream.h config.h
 	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)/library/dialect/swi/fli  $(srcdir)/library/dialect/swi/fli/swi.c  -o $@
@@ -533,26 +478,8 @@ swi.o: $(srcdir)/library/dialect/swi/fli/swi.c  $(srcdir)/library/dialect/swi/fl
 blobs.o: $(srcdir)/library/dialect/swi/fli/blobs.c  $(srcdir)/library/dialect/swi/fli/swi.h  $(srcdir)/include/SWI-Prolog.h config.h
 	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)/library/dialect/swi/fli  $(srcdir)/library/dialect/swi/fli/blobs.c  -o $@
 
-yap_random.o: $(srcdir)/library/random/yap_random.c config.h
+%.o: $(srcdir)/os/%.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  $(srcdir)/library/random/yap_random.c  -o $@
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os  @EXTRA_INCLUDES_FOR_WIN32@  $< -o $@
-
-regexp.o: $(srcdir)/library/regex/regexp.c  @NO_BUILTIN_REGEXP@ $(srcdir)/library/regex/regex2.h  $(srcdir)/library/regex/engine.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/regex $(srcdir)/library/regex/regexp.c -o regexp.o
-
-regcomp.o: $(srcdir)/library/regex/regcomp.c $(srcdir)/library/regex/regex2.h config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/regex $(srcdir)/library/regex/regcomp.c -o regcomp.o
-
-regerror.o: $(srcdir)/library/regex/regerror.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/regex $(srcdir)/library/regex/regerror.c -o regerror.o
-
-regfree.o: $(srcdir)/library/regex/regfree.c $(srcdir)/library/regex/regex2.h config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/regex $(srcdir)/library/regex/regfree.c -o regfree.o
-
-regexec.o: $(srcdir)/library/regex/regexec.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/regex $(srcdir)/library/regex/regexec.c -o regexec.o
-
-pl-nt.o: $(srcdir)/os/pl-nt.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-nt.c -o $@
 
 pl-ntcon.o: $(srcdir)/console/LGPL/pl-ntcon.c config.h
 	$(CC) -c $(CFLAGS) -DPL_CONSOLE=1 -I$(srcdir)/include $(srcdir)/console/LGPL/pl-ntcon.c -o $@
@@ -563,81 +490,6 @@ pl-ntconsole.o: $(srcdir)/console/LGPL/pl-ntconsole.c config.h
 pl-ntmain.o: $(srcdir)/console/LGPL/pl-ntmain.c config.h
 	$(CC) -municode -DUNICODE -D_UNICODE -c $(CFLAGS) -DPL_CONSOLE=1 -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/console/LGPL/pl-ntmain.c -o $@
 
-pl-buffer.o: $(srcdir)/os/pl-buffer.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os  @EXTRA_INCLUDES_FOR_WIN32@  $(srcdir)/os/pl-buffer.c -o $@
-
-pl-codelist.o: $(srcdir)/os/pl-codelist.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-codelist.c -o $@
-
-pl-ctype.o: $(srcdir)/os/pl-ctype.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-ctype.c -o $@
-
-pl-dtoa.o: $(srcdir)/os/pl-dtoa.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-dtoa.c -o $@
-
-pl-error.o: $(srcdir)/os/pl-error.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-error.c -o $@
-
-pl-file.o: $(srcdir)/os/pl-file.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-file.c -o $@
-
-pl-files.o: $(srcdir)/os/pl-files.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-files.c -o $@
-
-pl-fmt.o: $(srcdir)/os/pl-fmt.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-fmt.c -o $@
-
-pl-glob.o: $(srcdir)/os/pl-glob.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-glob.c -o $@
-
-pl-locale.o: $(srcdir)/os/pl-locale.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-locale.c -o $@
-
-pl-option.o: $(srcdir)/os/pl-option.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-option.c -o $@
-
-pl-os.o: $(srcdir)/os/pl-os.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-os.c -o $@
-
-pl-privitf.o: $(srcdir)/os/pl-privitf.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-privitf.c -o $@
-
-pl-prologflag.o: $(srcdir)/os/pl-prologflag.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-prologflag.c -o $@
-
-pl-rl.o: $(srcdir)/os/pl-rl.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-rl.c -o $@
-
-pl-read.o: $(srcdir)/os/pl-read.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-read.c -o $@
-
-pl-stream.o: $(srcdir)/os/pl-stream.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-stream.c -o $@
-
-pl-string.o: $(srcdir)/os/pl-string.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-string.c -o $@
-
-pl-table.o: $(srcdir)/os/pl-table.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-table.c -o $@
-
-pl-text.o: $(srcdir)/os/pl-text.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-text.c -o $@
-
-pl-utf8.o: $(srcdir)/os/pl-utf8.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-utf8.c -o $@
-
-pl-version.o: $(srcdir)/os/pl-version.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-version.c -o $@
-
-pl-write.o: $(srcdir)/os/pl-write.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-write.c -o $@
-
-pl-yap.o: $(srcdir)/C/pl-yap.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/C/pl-yap.c -o $@
-
-pl-tai.o: $(srcdir)/os/pl-tai.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@  $(srcdir)/os/pl-tai.c -o $@
-
 uxnt.o: $(srcdir)/os/windows/uxnt.c config.h
 	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/windows/uxnt.c -o $@
 
@@ -646,11 +498,6 @@ uxnt.o: $(srcdir)/os/windows/uxnt.c config.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 
-# default rule
-%.o : $(srcdir)/C/%.c config.h
-	$(CC) -c $(CFLAGS) $< -o $@
-
-
 ## CPP'ed files (for macro debugging)
 
 %.i : $(srcdir)/C/%.c
@@ -666,44 +513,49 @@ c_interface.i: $(srcdir)/C/c_interface.c $(srcdir)/include/c_interface.h
 mycb: $(srcdir)/mycb.c
 	$(CC) $(CFLAGS) $(srcdir)/mycb.c -o mycb
 
+INSTALLED_PACKAGES= \
+	library/random \
+	library/regex \
+	library/rltree \
+	library/system \
+	library/tries \
+	packages/ProbLog \
+	packages/yap-lbfgs \
+	@PKG_BDDLIB@ \
+	@PKG_CLPBN@ \
+	@PKG_CUDA@ \
+	@PKG_CPLINT@ \
+	@PKG_GECODE@ \
+	@PKG_MATLAB@ \
+	@PKG_MINISAT@ \
+	@PKG_MPI@ \
+	@PKG_MYDDAS@ \
+	@PKG_PRISM@ \
+	@PKG_PYTHON@ \
+	@PKG_RAPTOR@ \
+	@PKG_CHR@ \
+	@PKG_CLIB@ \
+	@PKG_JPL@ \
+	@PKG_LIBARCHIVE@ \
+	@PKG_LTX2HTM@ \
+	@PKG_ODBC@ \
+	@PKG_PLDOC@ \
+	@PKG_PLUNIT@ \
+	@PKG_REAL@ \
+	@PKG_RDF@ \
+	@PKG_SEMWEB@ \
+	@PKG_SGML@ \
+	@PKG_WINCONSOLE@ \
+	@PKG_ZLIB@
+
+PACKAGES=  \
+	library \
+	swi/library \
+	swi/library/clp \
+	$(INSTALLED_PACKAGES)
+
 all: startup.yss
-	@ENABLE_GECODE@ @INSTALL_DLLS@ (cd packages/gecode; $(MAKE))
+	for f in $(PACKAGES); do ( cd $$f ; $(MAKE) ); done
-	@INSTALL_MPI@ (cd library/lammpi; $(MAKE))
-	@INSTALL_MATLAB@ (cd library/matlab; $(MAKE))
-	@INSTALL_DLLS@ (cd library/matrix; $(MAKE))
-	@INSTALL_DLLS@ (cd library/random; $(MAKE))
-	@INSTALL_DLLS@ (cd library/regex; $(MAKE))
-	@INSTALL_DLLS@ (cd library/rltree; $(MAKE))
-	@INSTALL_DLLS@ (cd packages/yap-lbfgs; $(MAKE))
-	@ENABLE_WINCONSOLE@ (cd swi/console; $(MAKE))
-	@INSTALL_DLLS@ (cd library/system; $(MAKE))
-	@INSTALL_DLLS@ (cd library/tries; $(MAKE))
-	@ENABLE_CLIB@ @INSTALL_DLLS@ (cd packages/clib; $(MAKE))
-	@ENABLE_CHR@ (cd packages/chr; $(MAKE))
-	@ENABLE_LIBARCHIVE@ @INSTALL_DLLS@ (cd packages/archive; $(MAKE))
-	@ENABLE_LTX2HTM@ @INSTALL_DLLS@ (cd packages/ltx2htm; $(MAKE))
-	@ENABLE_ODBC@ @INSTALL_DLLS@ (cd packages/odbc; $(MAKE))
-	@ENABLE_PLDOC@  @INSTALL_DLLS@ (cd packages/pldoc; $(MAKE))
-	@ENABLE_PLUNIT@ @INSTALL_DLLS@ (cd packages/plunit; $(MAKE))
-	@ENABLE_RDF@ @INSTALL_DLLS@ (cd packages/RDF; $(MAKE))
-	@ENABLE_SEMWEB@ @INSTALL_DLLS@ (cd packages/semweb; $(MAKE))
-	@ENABLE_SGML@ @INSTALL_DLLS@ (cd packages/sgml; $(MAKE))
-	@ENABLE_REAL@ @INSTALL_DLLS@ (cd packages/real; $(MAKE))
-	@ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE))
-	@ENABLE_CLPBN_BP@ @INSTALL_DLLS@ (cd packages/CLPBN/horus; $(MAKE))
-	@ENABLE_MINISAT@ @INSTALL_DLLS@ (cd packages/swi-minisat2/C; $(MAKE))
-	@ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE))
-	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE))
-	@ENABLE_CPLINT@ (cd packages/cplint/slipcase; $(MAKE))
-	@ENABLE_PRISM@ @INSTALL_DLLS@ (cd packages/prism/src/c; $(MAKE))
-	@ENABLE_BDDLIB@ @INSTALL_DLLS@ (cd packages/bdd; $(MAKE))
-	@ENABLE_RAPTOR@ @INSTALL_DLLS@ (cd packages/raptor; $(MAKE))
-	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE))
-	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE))
-	@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE))
-	@ENABLE_PYTHON@ @INSTALL_DLLS@ (cd packages/python; $(MAKE))
-	@ENABLE_CUDA@ @INSTALL_DLLS@ (cd packages/cuda; $(MAKE))
-	@ENABLE_MYDDAS@ @INSTALL_DLLS@ (cd packages/myddas; $(MAKE))
 
 startup.yss: yap@EXEC_SUFFIX@ $(PL_SOURCES)
 	-rm -f startup.yss
@@ -728,151 +580,40 @@ libYap.a: $(LIB_OBJECTS)
 @DYNYAPLIB@: $(LIB_OBJECTS)
 	@YAPLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) $(SONAMEFLAG)
 
-install: install_bin install_data
+install: @INSTALL_COMMAND@
-
-install_bin: @INSTALL_COMMAND@
 
 install_unix: startup.yss @YAPLIB@
 	mkdir -p $(DESTDIR)$(BINDIR)
-	$(INSTALL_PROGRAM) -m 755 yap@EXEC_SUFFIX@ $(DESTDIR)$(BINDIR)/yap
 	mkdir -p $(DESTDIR)$(YAPLIBDIR)
-	$(INSTALL_DATA) startup.yss $(DESTDIR)$(YAPLIBDIR)/startup.yss
-	@INSTALL_DLLS@ $(INSTALL_DATA) -m 755 @YAPLIB@ $(DESTDIR)$(LIBDIR)
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/pl
 	mkdir -p $(DESTDIR)$(DOCSDIR)
+	mkdir -p $(DESTDIR)$(INCLUDEDIR)
+	mkdir -p $(DESTDIR)$(INCLUDEDIR)/src
+	$(INSTALL_PROGRAM) -m 755 yap@EXEC_SUFFIX@ $(DESTDIR)$(BINDIR)/yap
+	$(INSTALL_DATA) startup.yss $(DESTDIR)$(YAPLIBDIR)/startup.yss
+	$(INSTALL_DATA) -m 755 @YAPLIB@ $(DESTDIR)$(LIBDIR)
 	$(INSTALL) $(srcdir)/Artistic $(DESTDIR)$(DOCSDIR)
 	$(INSTALL) $(srcdir)/README $(DESTDIR)$(DOCSDIR)
 	$(INSTALL) $(srcdir)/COPYING $(DESTDIR)$(DOCSDIR)
 	for f in $(PL_SOURCES); do $(INSTALL) $$f $(DESTDIR)$(SHAREDIR)/Yap/pl; done
-	@INSTALL_MPI@ (cd library/lammpi; $(MAKE) install)
-	@INSTALL_DLLS@ (cd library/matrix; $(MAKE) install)
-	@INSTALL_DLLS@ (cd library/random; $(MAKE) install)
-	@INSTALL_DLLS@ (cd library/regex; $(MAKE) install)
-	@INSTALL_DLLS@ (cd library/rltree; $(MAKE) install)
-	@INSTALL_DLLS@ (cd packages/yap-lbfgs; $(MAKE) install)
-	@INSTALL_DLLS@ (cd library/system; $(MAKE) install)
-	@INSTALL_DLLS@ (cd library/tries; $(MAKE) install)
-	@ENABLE_GECODE@ @INSTALL_DLLS@ (cd packages/gecode; $(MAKE) install)
-	@ENABLE_CLIB@ @INSTALL_DLLS@ (cd packages/clib; $(MAKE) install)
-	@ENABLE_HTTP@ @INSTALL_DLLS@ (cd packages/http; $(MAKE) install)
-	@ENABLE_HTTP@ @INSTALL_DLLS@ (cd packages/http; $(MAKE) install-examples)
-	@ENABLE_LIBARCHIVE@ @INSTALL_DLLS@ (cd packages/archive; $(MAKE) install)
-	@ENABLE_LTX2HTM@ @INSTALL_DLLS@ (cd packages/ltx2htm; $(MAKE) install)
-	@ENABLE_ODBC@ @INSTALL_DLLS@ (cd packages/odbc; $(MAKE) install)
-	@ENABLE_PLDOC@ @INSTALL_DLLS@ (cd packages/pldoc; $(MAKE) install)
-	@ENABLE_PLDOC@ @INSTALL_DLLS@ (cd packages/pldoc; $(MAKE) install-examples)
-	@ENABLE_PLUNIT@ @INSTALL_DLLS@ (cd packages/plunit; $(MAKE) install)
-	@ENABLE_PLUNIT@ @INSTALL_DLLS@ (cd packages/plunit; $(MAKE) install-examples)
-	@ENABLE_RDF@ @INSTALL_DLLS@ (cd packages/RDF; $(MAKE) install)
-	@ENABLE_SEMWEB@ @INSTALL_DLLS@ (cd packages/semweb; $(MAKE) install)
-	@ENABLE_SGML@ @INSTALL_DLLS@ (cd packages/sgml; $(MAKE) install)
-	@ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) install)
-	@ENABLE_CLPBN_BP@ @INSTALL_DLLS@ (cd packages/CLPBN/horus; $(MAKE) install)
-	@ENABLE_MINISAT@ @INSTALL_DLLS@ (cd packages/swi-minisat2/C; $(MAKE) install)
-	@INSTALL_MATLAB@ @INSTALL_DLLS@ (cd library/matlab; $(MAKE) install)
-	@ENABLE_REAL@ @INSTALL_DLLS@ (cd packages/real; $(MAKE) install)
-	@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install)
-	@ENABLE_PYTHON@ @INSTALL_DLLS@ (cd packages/python; $(MAKE) install)
-	@ENABLE_CUDA@ @INSTALL_DLLS@ (cd packages/cuda; $(MAKE) install)
-	@ENABLE_MYDDAS@ @INSTALL_DLLS@ (cd packages/myddas; $(MAKE) install)
-	mkdir -p $(DESTDIR)$(INCLUDEDIR)
-	mkdir -p $(DESTDIR)$(INCLUDEDIR)/src
 	$(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR)/src
 	for h in $(INTERFACE_HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done
 	$(INSTALL) config.h $(DESTDIR)$(INCLUDEDIR)/src/config.h
 	$(INSTALL) parms.h $(DESTDIR)$(INCLUDEDIR)/src/parms.h
 	$(INSTALL) YapTermConfig.h $(DESTDIR)$(INCLUDEDIR)
-	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install)
+	for f in $(PACKAGES); do ( echo $$f; cd $$f ; $(MAKE) install ); done
-	@ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE) install)
+	for f in $(PACKAGES); do ( echo $$f; cd $$f ; $(MAKE) install-examples ); done
-	@ENABLE_PRISM@ @INSTALL_DLLS@ (cd packages/prism/src/c; $(MAKE) install)
-	@ENABLE_PRISM@ @INSTALL_DLLS@ (cd packages/prism/src/prolog; $(MAKE) install)
-	@ENABLE_BDDLIB@ @INSTALL_DLLS@ (cd packages/bdd; $(MAKE) install)
-	@ENABLE_RAPTOR@ @INSTALL_DLLS@ (cd packages/raptor; $(MAKE) install)
-	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install)
-	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE) install)
 
-
+install_win32: startup.yss @WINDOWS@ yap-win@EXEC_SUFFIX@ install_unix
-install_win32: startup.yss @ENABLE_WINCONSOLE@ yap-win@EXEC_SUFFIX@
-	mkdir -p $(DESTDIR)$(BINDIR)
-	mkdir -p $(DESTDIR)$(LIBDIR)
-	mkdir -p $(DESTDIR)$(YAPLIBDIR)
-	mkdir -p $(DESTDIR)$(INCLUDEDIR)
-	$(INSTALL_PROGRAM) -m 755 yap.exe $(DESTDIR)$(BINDIR)/yap.exe
 	$(INSTALL_PROGRAM) -m 755 yap.dll $(DESTDIR)$(BINDIR)/yap.dll
-	@ENABLE_WINCONSOLE@ $(INSTALL_PROGRAM) -m 755 yap-win.exe $(DESTDIR)$(BINDIR)/yap-win.exe
+	@WINDOWS@ $(INSTALL_PROGRAM) -m 755 yap-win.exe $(DESTDIR)$(BINDIR)/yap-win.exe
-	@ENABLE_WINCONSOLE@ $(INSTALL_PROGRAM) -m 755 plterm.dll $(DESTDIR)$(BINDIR)/plterm.dll
+	@WINDOWS@ $(INSTALL_PROGRAM) -m 755 plterm.dll $(DESTDIR)$(BINDIR)/plterm.dll
-	$(INSTALL_PROGRAM) -m 755 @YAPLIB@ $(DESTDIR)$(YAPLIBDIR)/@YAPLIB@
-	$(INSTALL_PROGRAM) -m 755 startup.yss $(DESTDIR)$(YAPLIBDIR)/startup.yss
-	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
-	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/pl
-	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/swi
-	mkdir -p $(DESTDIR)$(DOCSDIR)
-	$(INSTALL) $(srcdir)/Artistic $(DESTDIR)$(DOCSDIR)
-	$(INSTALL) $(srcdir)/README $(DESTDIR)$(DOCSDIR)/README.TXT
-	$(INSTALL) $(srcdir)/COPYING $(DESTDIR)$(DOCSDIR)/COPYING.TXT
-	for f in $(PL_SOURCES); do $(INSTALL) $$f $(DESTDIR)$(SHAREDIR)/Yap/pl; done
-	$(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR)
-	for h in $(INTERFACE_HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done
-	$(INSTALL) config.h $(DESTDIR)$(INCLUDEDIR)/config.h
-	$(INSTALL) parms.h $(DESTDIR)$(INCLUDEDIR)/parms.h
-	(cd library/random; $(MAKE) install)
-	(cd library/matrix; $(MAKE) install)
-	(cd library/regex; $(MAKE) install)
-	(cd library/rltree; $(MAKE) install)
-	(cd library/system; $(MAKE) install)
-	@INSTALL_DLLS@ (cd packages/yap-lbfgs; $(MAKE) install)
-	@ENABLE_WINCONSOLE@ (cd swi/console; $(MAKE) install)
-	@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install)
-	(cd library/tries; $(MAKE) install)
-	@ENABLE_CLIB@ (cd packages/clib; $(MAKE) install)
-	@ENABLE_PLDOC@ (cd packages/pldoc; $(MAKE) install)
-	@ENABLE_PLDOC@ (cd packages/pldoc; $(MAKE) install-examples)
-	@ENABLE_PLUNIT@ (cd packages/plunit; $(MAKE) install)
-	@ENABLE_PLUNIT@ (cd packages/plunit; $(MAKE) install-examples)
-	@ENABLE_HTTP@ (cd packages/http; $(MAKE) install)
-	@ENABLE_LTX2HTM@ (cd packages/ltx2htm; $(MAKE) install)
-	@ENABLE_REAL@ (cd packages/real; $(MAKE) install)
-	@ENABLE_RDF@ (cd packages/RDF; $(MAKE) install)
-	@ENABLE_SEMWEB@ (cd packages/semweb; $(MAKE) install)
-	@ENABLE_SGML@ (cd packages/sgml; $(MAKE) install)
-	@ENABLE_ZLIB@ (cd packages/zlib; $(MAKE) install)
-	(cd packages/CLPBN ; $(MAKE) install)
-	@ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(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_CPLINT@ (cd packages/cplint; $(MAKE) install)
-	@ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE) install)
-	@ENABLE_PRISM@ (cd packages/prism/src/prolog; $(MAKE) install)
-	@ENABLE_BDDLIB@ (cd packages/bdd; $(MAKE) install)
-	@ENABLE_RAPTOR@ (cd packages/raptor; $(MAKE) install)
-	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install)
-	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE) install)
-	@ENABLE_CUDA@ @INSTALL_DLLS@ (cd packages/cuda; $(MAKE) install)
-	@ENABLE_MYDDAS@ @INSTALL_DLLS@ (cd packages/myddas; $(MAKE) install)
 
 install_library: @YAPLIB@
 	mkdir -p $(DESTDIR)$(INCLUDEDIR)
 	for h in $(HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done
 
-install_data: install_copied_files install_bin
-	@ENABLE_CHR@ (cd packages/chr ; $(MAKE) install)
-	@ENABLE_CHR@ (cd packages/chr ; $(MAKE) install-examples)
-	@ENABLE_CHR@ (cd packages/clpqr ; $(MAKE) install)
-
-install_copied_files:
-	(cd library ; $(MAKE) install)
-	@ENABLE_MINISAT@ (cd packages/swi-minisat2; $(MAKE) install)
-	(cd swi/library ; $(MAKE) install)
-	$(INSTALL_DATA) $(srcdir)/LGPL/pillow/icon_address.pl $(DESTDIR)$(SHAREDIR)/Yap/
-	$(INSTALL_DATA) $(srcdir)/LGPL/pillow/pillow.pl $(DESTDIR)$(SHAREDIR)/Yap/
-	@INSTALLCLP@(cd swi/library/clp ; $(MAKE) install)
-	(cd packages/CLPBN ; $(MAKE) install)
-	(cd packages/meld; $(MAKE) install)
-	(cd packages/xml; $(MAKE) install)
-	(cd  packages/ProbLog ; $(MAKE) install)
-
 ##########
 TAGS: $(C_SOURCES) $(PL_SOURCES) $(HEADERS)
 	etags  $(C_SOURCES)  $(PL_SOURCES) $(HEADERS) 
@@ -887,47 +628,7 @@ depend: $(HEADERS) $(C_SOURCES)
 
 clean: clean_docs
 	rm -f *.o *~ *.BAK *.a
-	@ENABLE_GECODE@ @INSTALL_DLLS@ (cd packages/gecode; $(MAKE) clean)
+	for f in $(PACKAGES); do ( cd $$f ; $(MAKE) clean ); done
-	@INSTALL_MPI@ (cd library/lammpi; $(MAKE) clean)
-	@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) clean)
-	@INSTALL_DLLS@ (cd library/matrix; $(MAKE) clean)
-	@INSTALL_DLLS@ (cd library/random; $(MAKE) clean)
-	@INSTALL_DLLS@ (cd library/regex; $(MAKE) clean)
-	@INSTALL_DLLS@ (cd library/rltree; $(MAKE) clean)
-	@INSTALL_DLLS@ (cd packages/yap-lbfgs; $(MAKE) clean)
-	@ENABLE_WINCONSOLE@ (cd swi/console; $(MAKE) clean)
-	@INSTALL_DLLS@ (cd library/system; $(MAKE) clean)
-	@INSTALL_DLLS@ (cd library/tries; $(MAKE) clean)
-	@ENABLE_CLIB@ @INSTALL_DLLS@ (cd packages/clib; $(MAKE) clean)
-	@ENABLE_LTX2HTM@ @INSTALL_DLLS@ (cd packages/ltx2htm; $(MAKE) clean)
-	@ENABLE_HTTP@ @INSTALL_DLLS@ (cd packages/http; $(MAKE) clean)
-	@ENABLE_PLDOC@ @INSTALL_DLLS@ (cd packages/pldoc; $(MAKE) clean)
-	@ENABLE_PLUNIT@ @INSTALL_DLLS@ (cd packages/plunit; $(MAKE) clean)
-	@ENABLE_R@ @INSTALL_DLLS@ (cd packages/R; $(MAKE) clean)
-	@ENABLE_RDF@ @INSTALL_DLLS@ (cd packages/RDF; $(MAKE) clean)
-	@ENABLE_SEMWEB@ @INSTALL_DLLS@ (cd packages/semweb; $(MAKE) clean)
-	@ENABLE_SGML@ @INSTALL_DLLS@ (cd packages/sgml; $(MAKE) clean)
-	@ENABLE_REAL@ (cd packages/real; $(MAKE) clean)
-	@ENABLE_MINISAT@ (cd packages/swi-minisat2; $(MAKE) clean)
-	@ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(MAKE) clean)
-	@ENABLE_CHR@ (cd packages/chr; $(MAKE) clean)
-	@ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) clean)
-	@ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE) clean)
-	@ENABLE_PRISM@ (cd packages/prism/src/prolog; $(MAKE) clean)
-	@ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE) clean)
-	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) clean)
-	@ENABLE_BDDLIB@ (cd packages/bdd; $(MAKE) clean)
-	@ENABLE_RAPTOR@ (cd packages/raptor; $(MAKE) clean)
-	@ENABLE_LIBARCHIVE@ (cd packages/archive; $(MAKE) clean)
-	@ENABLE_ODBC@ (cd packages/odbc; $(MAKE) clean)
-	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) clean)
-	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE) clean)
-	@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) clean)
-	@ENABLE_PYTHON@ @INSTALL_DLLS@ (cd packages/python; $(MAKE) clean)
-	@ENABLE_CUDA@ @INSTALL_DLLS@ (cd packages/cuda; $(MAKE) clean)
-	@ENABLE_MYDDAS@ @INSTALL_DLLS@ (cd packages/myddas; $(MAKE) clean)
-
-
 
 distclean: clean realclean_docs
 	rm -f yap@EXEC_SUFFIX@ startup.yss libYap.* Makefile */Makefile */*/Makefile */*defs */*/*/Makefile *.h config.*

configure.in

@@ -36,7 +36,7 @@ dnl EXTRA_LIBS_FOR_DLLS= libs that are required when lding a so
 dnl EXTRA_LIBS_FOR_SWIDLLS= libs that are required when lding a SWI so
 
 
-AC_INIT(console/yap.c)
+AC_INIT(YAP, 6.3.4, yap-users@sf.net, yap )
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_HEADER(YapTermConfig.h)
 
@@ -98,9 +98,6 @@ AC_ARG_ENABLE(low-level-tracer,
 AC_ARG_ENABLE(threads,
 	[ --enable-threads           support system threads ],
 	threads="$enableval", threads=no)
-AC_ARG_ENABLE(bddlib,
-	[ --enable-bddlib           dynamic bdd library ],
-	dynamic_bdd="$enableval", dynamic_bdd=no)
 AC_ARG_ENABLE(pthread-locking,
 	[ --enable-pthread-locking   use pthread locking primitives for internal locking (requires threads)  ],
 	pthreadlocking="$enableval", pthreadlocking=no)
@@ -234,18 +231,6 @@ AC_ARG_WITH(readline,
 	fi,
 	[yap_cv_readline=yes])
 
-AC_ARG_WITH(matlab,
-	[ --with-matlab[=DIR]      use MATLAB package in DIR],
-	if test "$withval" = yes; then
-		yap_cv_matlab=yes
-	elif test "$withval" = no; then
-		yap_cv_matlab=no
-	else
-		yap_cv_matlab=$with_matlab
-		MATLAB_INCLUDE="-I${yap_cv_matlab}/extern/include"
-	fi,
-	[yap_cv_matlab=no])
-
 AC_ARG_WITH(heap-space,
 	[ --with-heap-space[=space]  default heap size in Kbytes],
 	if test "$withval" = yes; then
@@ -337,33 +322,11 @@ fi
 
 if test "$yap_cv_prism" = no 
 then
-  INSTALL_PRISM="@# "
+  INSTALL_PRISM="packages/prism/src/c packages/prism/src/prolog"
 else
   INSTALL_PRISM=""
 fi
 
-dnl condor does not like dynamic linking on Linux, DEC, and HP-UX platforms.
-if test "$yap_cv_matlab" = no 
-then
-  INSTALL_MATLAB="@# "
-elif test "$yap_cv_matlab" = yes 
-then
-  INSTALL_MATLAB=""
-else
-  case "$target_cpu" in
-  i*86*)
-     LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/glnx86"
-  ;;
-  x86*)
-     LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/glnxa64"
-  ;;
-  sparc*)
-     LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/sol2"
-  ;;
-  esac
-  INSTALL_MATLAB=""
-fi
-
 if test "$yap_cv_clpbn_bp"="yes"; then
   AC_LANG_PUSH([C++])
   my_save_cxxflags="$CXXFLAGS"
@@ -380,9 +343,9 @@ fi
 
 if test "$yap_cv_clpbn_bp" = no 
 then
-  ENABLE_CLPBN_BP="@# "
+  PKG_CLPBN="packages/CLPBN"
 else
-  ENABLE_CLPBN_BP=""
+  PKG_CLPBN="packages/CLPBN packages/CLPBN/horus"
 fi
 
 
@@ -571,16 +534,19 @@ then
       esac
     fi
     echo $prefix
-    ENABLE_WINCONSOLE=""   
+    WINDOWS=""
+    PKG_WINCONSOLE="swi/console"   
   else
-    ENABLE_WINCONSOLE="#"   
+    WINDOWS="#"
+    PKG_WINCONSOLE=""   
     LIBS="-lcygwin"
     EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll"
     EXTRA_INCLUDES_FOR_WIN32="-I\$(srcdir)/packages/PLStream/windows"
   fi
 else
   INSTALL_COMMAND="install_unix"
-  ENABLE_WINCONSOLE="#"
+  WINDOWS="#"
+  PKG_WINCONSOLE=""
   AC_CHECK_LIB(m,sin)
   AC_CHECK_LIB(socket,socket)
   dnl X/Open Networking is sometimes a separate library
@@ -657,98 +623,98 @@ CMFLAGS=-fpic
 CIFLAGS=-I.
 
 if test "$use_prism" = no; then
-  ENABLE_PRISM="@# "
+  PKG_PRISM="@# "
 else
-  ENABLE_PRISM=""
+  PKG_PRISM=""
 fi
-AC_SUBST(ENABLE_PRISM)
+AC_SUBST(PKG_PRISM)
 
 if test -e "$srcdir"/packages/archive/Makefile.in; then
-  ENABLE_LIBARCHIVE=""
+  PKG_LIBARCHIVE=""
 else
-  ENABLE_LIBARCHIVE="@# "
+  PKG_LIBARCHIVE="@# "
 fi
 
 if test -e "$srcdir"/packages/odbc/Makefile.in; then
-  ENABLE_ODBC=""
+  PKG_ODBC=""
 else
-  ENABLE_ODBC="@# "
+  PKG_ODBC="@# "
 fi
 
 if test "$use_chr" = no; then
-  ENABLE_CHR="@# "
+  PKG_CHR=""
 elif test -e "$srcdir"/packages/chr/Makefile.in; then
-  ENABLE_CHR=""
+  PKG_CHR="packages/chr"
 else
-  ENABLE_CHR="@# "
+  PKG_CHR=""
 fi
 
 if test "$use_clpqr" = no; then
-  ENABLE_CLPQR="@# " 
+  PKG_CLPQR="" 
 elif test -e "$srcdir"/packages/clpqr/Makefile.in; then
-  ENABLE_CLPQR=""
+  PKG_CLPQR="packages/clpqr"
 else
-  ENABLE_CLPQR="@# "
+  PKG_CLPQR=""
 fi
 
 if test -e "$srcdir"/packages/clib/Makefile.in; then
-  ENABLE_CLIB=""
+  PKG_CLIB="packages/clib"
 else
-  ENABLE_CLIB="@# "
+  PKG_CLIB=""
 fi
 
 if test -e "$srcdir"/packages/http/Makefile.in; then
-  ENABLE_HTTP=""
+  PKG_HTTP="packages/http"
 else
-  ENABLE_HTTP="@# "
+  PKG_HTTP=""
 fi
 
 if test -e "$srcdir"/packages/pldoc/Makefile.in; then
-  ENABLE_PLDOC=""
+  PKG_PLDOC="packages/pldoc"
 else
-  ENABLE_PLDOC="@# "
+  PKG_PLDOC=""
 fi
 
 if test -e "$srcdir"/packages/plunit/Makefile.in; then
-  ENABLE_PLUNIT=""
+  PKG_PLUNIT="packages/plunit"
 else
-  ENABLE_PLUNIT="@# "
+  PKG_PLUNIT=""
 fi
 
 if test -e "$srcdir"/packages/R/Makefile.in; then
-  ENABLE_R=""
+  PKG_R="packages/R"
 else
-  ENABLE_R="@# "
+  PKG_R=""
 fi
 
 if test -e "$srcdir"/packages/RDF/Makefile.in; then
-  ENABLE_RDF=""
+  PKG_RDF="packages/RDF"
 else
-  ENABLE_RDF="@# "
+  PKG_RDF=""
 fi
 
 if test -e "$srcdir"/packages/ltx2htm/Makefile.in; then
-  ENABLE_LTX2HTM=""
+  PKG_LTX2HTM="packages/ltx2htm"
 else
-  ENABLE_LTX2HTM="@# "
+  PKG_LTX2HTM=""
 fi
 
 if test -e "$srcdir"/packages/semweb/Makefile.in; then
-  ENABLE_SEMWEB=""
+  PKG_SEMWEB="packages/semweb"
 else
-  ENABLE_SEMWEB="@# "
+  PKG_SEMWEB=""
 fi
 
 if test -e "$srcdir"/packages/sgml/Makefile.in; then
-  ENABLE_SGML=""
+  PKG_SGML="packages/sgml"
 else
-  ENABLE_SGML="@# "
+  PKG_SGML=""
 fi
 
 if test -e "$srcdir"/packages/zlib/Makefile.in; then
-  ENABLE_ZLIB=""
+  PKG_ZLIB="packages/zlib"
 else
-  ENABLE_ZLIB="@# "
+  PKG_ZLIB=""
 fi
 
 if test "$cross_compiling" = "yes"
@@ -759,7 +725,7 @@ else
 fi
 
 dnl defaults
-INSTALL_DLLS="#"
+INSTALL_DLLS="no"
 EXTRA_OBJS=""
 SHLIB_LD="#"
 SHLIB_CXX_LD="#"
@@ -804,7 +770,7 @@ case "$target_os" in
 	  then
 	   SHLIB_CFLAGS="-shared -fPIC $CFLAGS"
 	   SHLIB_CXXFLAGS="-shared -fPIC $CXXFLAGS"
-	   INSTALL_DLLS=""
+	   INSTALL_DLLS="yes"
           fi
 	  LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
           DYNYAPLIB=libYap."$SO"
@@ -834,7 +800,7 @@ case "$target_os" in
 	 LIBS="$LIBS -lnsl"
         fi
         SO="o"
-	INSTALL_DLLS=""
+	INSTALL_DLLS="yes"
 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
         DYNYAPLIB=libYap."$SO"
 	SONAMEFLAG=""
@@ -859,7 +825,7 @@ case "$target_os" in
             SO="sl"
 	    SHLIB_CFLAGS="+z $CFLAGS"
 	    SHLIB_CXXFLAGS="+z $CXXFLAGS"
-	    INSTALL_DLLS=""
+	    INSTALL_DLLS="yes"
 	    # If the xnet library was found, turn on X/Open networking
 	    if test "$ac_cv_lib_xnet_getsockname" = yes
 	    then
@@ -867,7 +833,7 @@ case "$target_os" in
 	     AC_DEFINE(_XOPEN_SOURCE_EXTENDED,1)
 	    fi
 	  else
-	    INSTALL_DLLS="#"
+	    INSTALL_DLLS="no"
           fi
         fi
 	#do not use realloc() from HP-UX 10.20 together with MPI
@@ -888,7 +854,7 @@ case "$target_os" in
 	#
         # SO="a"
         #SHLIB_LD="\$(srcdir)/../../ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
-	#INSTALL_DLLS=""
+	#INSTALL_DLLS="yes"
 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
         DYNYAPLIB=libYap."$SO"
 	SONAMEFLAG=""
@@ -922,7 +888,7 @@ dnl Linux has both elf and a.out, in this case we found elf
         DO_SECOND_LD=""
 	SHLIB_LD="ld -n32 -shared -rdata_shared"
         SHLIB_CXX_LD="$SHLIB_LD"
-	INSTALL_DLLS=""
+	INSTALL_DLLS="yes"
 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
         DYNYAPLIB=libYap."$SO"
 	SONAMEFLAG=""
@@ -961,7 +927,7 @@ dnl Linux has both elf and a.out, in this case we found elf
 	then
 	   SHLIB_CFLAGS="-shared -fPIC $CFLAGS"
 	   SHLIB_CXXFLAGS="-shared -fPIC $CXXFLAGS"
-	   INSTALL_DLLS=""
+	   INSTALL_DLLS="yes"
         fi
         CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall"
         DYNYAPLIB=libYap."$SO"
@@ -985,7 +951,7 @@ dnl Linux has both elf and a.out, in this case we found elf
           SHLIB_CXX_LD="$CXX -shared -export-dynamic"
           DO_SECOND_LD=""
 	  SO="so"
-	  INSTALL_DLLS=""
+	  INSTALL_DLLS="yes"
         fi
 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR)"
         DYNYAPLIB=libYap."$SO"
@@ -1004,7 +970,7 @@ dnl Linux has both elf and a.out, in this case we found elf
         SHLIB_CXX_LD="$CXX -shared"
         DO_SECOND_LD=""
 	SO="so"
-	INSTALL_DLLS=""
+	INSTALL_DLLS="yes"
 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
         DYNYAPLIB=libYap."$SO"
 	SONAMEFLAG="-Wl,--soname=$DYNYAPLIB"
@@ -1038,7 +1004,7 @@ dnl Linux has both elf and a.out, in this case we found elf
 	SO="dll"
 	C_PARSER_FLAGS="$C_INTERF_FLAGS"
 	EXEC_SUFFIX=".exe"
-	INSTALL_DLLS=""
+	INSTALL_DLLS="yes"
 	DO_SECOND_LD=""
 	MERGE_DLL_OBJS=""
         IN_UNIX="#"
@@ -1055,7 +1021,7 @@ dnl Linux has both elf and a.out, in this case we found elf
 	 then
          SO="o"
 	 LIBS="$LIBS -ldl"
-	 INSTALL_DLLS=""
+	 INSTALL_DLLS="yes"
 	 if test "$GCC" = "yes"
 	 then
 	   SHLIB_CXXFLAGS="-fPIC $CXXFLAGS"
@@ -1185,33 +1151,6 @@ if test "$tabling" = "yes"
   then
   YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1"
 fi
-if test ! "$yap_cv_cplint" = "no"
-  then	
-	if test ! "$yap_cv_cplint" = "yes"
-	then
-		CPLINT_LDFLAGS+=" -L${yap_cv_cplint}/cudd -L${yap_cv_cplint}/mtr -L${yap_cv_cplint}/st -L${yap_cv_cplint}/util -L${yap_cv_cplint}/epd "
-		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"
-		SHLIB_SUFFIX="dll"
-	else
-		CPLINT_SHLIB_LD=$SHLIB_LD
-		SHLIB_SUFFIX="so"
-	fi
-	AC_SUBST(CPLINT_LIBS)
-	AC_SUBST(CPLINT_CFLAGS)
-	AC_SUBST(CPLINT_LDFLAGS)
-	AC_SUBST(CPLINT_SHLIB_LD)
-	AC_SUBST(SHLIB_SUFFIX)
-else
-	ENABLE_CPLINT="@#"
-fi
-AC_SUBST(ENABLE_CPLINT)
-
 AC_SUBST(INSTALL_ENV)
 AC_SUBST(PRE_INSTALL_ENV)
 
@@ -1354,34 +1293,33 @@ AC_SUBST(INSTALL_INFO)
 dnl let YAP_EXTRAS fall through configure, from the env into Makefile
 AC_SUBST(YAP_EXTRAS)
 AC_SUBST(NO_BUILTIN_REGEXP)
-AC_SUBST(ENABLE_CHR)
+AC_SUBST(PKG_CHR)
-AC_SUBST(ENABLE_CLIB)
+AC_SUBST(PKG_CLIB)
-AC_SUBST(ENABLE_CLPQR)
+AC_SUBST(PKG_CLPQR)
-AC_SUBST(ENABLE_HTTP)
+AC_SUBST(PKG_HTTP)
-AC_SUBST(ENABLE_JPL)
+AC_SUBST(PKG_JPL)
-AC_SUBST(ENABLE_LTX2HTM)
+AC_SUBST(PKG_LTX2HTM)
-AC_SUBST(ENABLE_PLDOC)
+AC_SUBST(PKG_PLDOC)
-AC_SUBST(ENABLE_PLUNIT)
+AC_SUBST(PKG_PLUNIT)
-AC_SUBST(ENABLE_R)
+AC_SUBST(PKG_R)
-AC_SUBST(ENABLE_RDF)
+AC_SUBST(PKG_RDF)
-AC_SUBST(ENABLE_SEMWEB)
+AC_SUBST(PKG_SEMWEB)
-AC_SUBST(ENABLE_SGML)
+AC_SUBST(PKG_SGML)
-AC_SUBST(ENABLE_ZLIB)
+AC_SUBST(PKG_ZLIB)
-AC_SUBST(ENABLE_CLPBN_BP)
+AC_SUBST(PKG_CLPBN)
 AC_SUBST(IN_UNIX)
-AC_SUBST(INSTALL_MPI)
 AC_SUBST(MPI_CC)
 AC_SUBST(INSTALL_COMMAND)
 AC_SUBST(INSTALLCLP)
 AC_SUBST(MAX_WORKERS)
 AC_SUBST(STATIC_MODE)
-AC_SUBST(ENABLE_WINCONSOLE)
+AC_SUBST(PKG_WINCONSOLE)
+AC_SUBST(WINDOWS)
 AC_SUBST(EXTRA_INCLUDES_FOR_WIN32)
 
-AC_SUBST(ENABLE_MINISAT)
+AC_SUBST(PKG_MINISAT)
-AC_SUBST(ENABLE_REAL)
+AC_SUBST(PKG_REAL)
-AC_SUBST(INSTALL_MATLAB)
+
-AC_SUBST(MATLAB_INCLUDE)
 AC_SUBST(INSTALL_PRISM)
 
 dnl check for threaded code
@@ -1771,16 +1709,14 @@ AC_TRY_COMPILE(
    AC_MSG_RESULT(yes),
    AC_MSG_RESULT(no))
 
-if test "$yap_cv_minisat" = no 
+if test "$yap_cv_minisat" = no -a "$INSTALL_DLLS" = "no" 
 then
-  ENABLE_MINISAT="@# "
+  PKG_MINISAT=""
-elif test "$INSTALL_DLLS" = "#" 
-then
-  ENABLE_MINISAT="@# "
 else
-  ENABLE_MINISAT=""
+  PKG_MINISAT="packages/swi-minisat2"
 fi
 
+
 if test "x$PLARCH" = "x"; then
   case "$host" in
     *linux*)
@@ -1807,32 +1743,32 @@ fi
 
 m4_include([packages/myddas/configure.in])
 
-if test "$ENABLE_CLIB" = ""
+if test "$PKG_CLIB" = ""
 then
 
 m4_include([packages/clib/configure.in])
 
 fi
 
-if test "$ENABLE_LIBARCHIVE" = ""
+if test "$PKG_LIBARCHIVE" = ""
 then
 
 m4_include([packages/archive/configure.in])
 
 if test "$ARCHIVE_TARGETS" = "nolib"
 then
-  ENABLE_LIBARCHIVE="@# "
+  PKG_LIBARCHIVE="@# "
 fi
 
 fi
 
-if test "$ENABLE_ODBC" = ""; then
+if test "$PKG_ODBC" = ""; then
 
 m4_include([packages/odbc/configure.in])
 
 if test "$ODBC_TARGETS" = "nolib"
 then
-  ENABLE_ODBC="@# "
+  PKG_ODBC="@# "
 fi
 
 else
@@ -1844,34 +1780,34 @@ fi
 m4_include([packages/bdd/configure.in])
 
 dnl zlib
-if test "$ENABLE_ZLIB" = ""
+if test "$PKG_ZLIB" = ""
 then
 
 m4_include([packages/zlib/configure.in])
 
 if test "$ZLIB_TARGETS" = "nolib"
 then
-  ENABLE_ZLIB="@# "
+  PKG_ZLIB="@# "
 fi
 
 fi
 
 if test "$yap_cv_R" != "no" -a  -e "$srcdir"/packages/real/Makefile.in; then
-   ENABLE_REAL=""
+   PKG_REAL="packages/real"
 
    m4_include([packages/real/configure.in])
 else
     REAL_TARGET="dummy"
-    ENABLE_REAL="@# "
+    PKG_REAL=""
 fi
 
 dnl
 dnl java is hard
 dnl
 if test "$yap_cv_java" = no; then
-	ENABLE_JPL="@#"   
+	PKG_JPL=""   
 elif test -e "$srcdir"/packages/jpl/Makefile.in; then
-	ENABLE_JPL=""
+	PKG_JPL="packages/jpl"
 	if test "$yap_cv_java" != "yes"; then
           JAVA_HOME=$yap_cv_java
 	  JAVAPREFIX="$JAVA_HOME"/bin
@@ -1884,35 +1820,34 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
 fi
 
 if test -e "$srcdir"/packages/ltx2htm/Makefile.in; then
-   ENABLE_LTX22HTM=""
+   PKG_LTX22HTM="packages/ltx2htm"
 
    m4_include([packages/ltx2htm/configure.in])
 else
-    ENABLE_LTX2HTM="@# "
+    PKG_LTX2HTM=""
 fi
 
-m4_include([packages/gecode/configure.in])
-
 if test -e "$srcdir"/packages/raptor/Makefile.in; then
    m4_include([packages/raptor/configure.in])
 fi
 
+m4_include([library/matlab/configure.in])
+
 m4_include([library/lammpi/configure.in])
 
 m4_include([packages/python/configure.in])
 
-m4_include([packages/cuda/configure.in])
-
 m4_include([packages/cplint/configure.in])
 
+m4_include([packages/cuda/configure.in])
 
-AC_SUBST(ENABLE_LIBARCHIVE)
+m4_include([packages/gecode/configure.in])
 
-AC_SUBST(ENABLE_ODBC)
+AC_SUBST(PKG_LIBARCHIVE)
+
+AC_SUBST(PKG_ODBC)
 
-mkdir -p  library/lammpi
 mkdir -p  library/matrix
-mkdir -p  library/matlab
 mkdir -p  library/mpi
 mkdir -p  library/random
 mkdir -p  library/regex
@@ -1921,7 +1856,6 @@ mkdir -p  library/tries
 mkdir -p  library/rltree
 mkdir -p  LGPL
 mkdir -p  packages/
-mkdir -p  packages/bdd
 mkdir -p  packages/clib
 mkdir -p  packages/clib/sha1
 mkdir -p  packages/clib/maildrop
@@ -1931,10 +1865,6 @@ mkdir -p  packages/CLPBN
 mkdir -p  packages/CLPBN/clpbn
 mkdir -p  packages/CLPBN/horus
 mkdir -p  packages/clpqr
-mkdir -p  packages/cplint
-mkdir -p  packages/cplint/approx
-mkdir -p  packages/cplint/approx/simplecuddLPADs
-mkdir -p  packages/cuda
 mkdir -p  packages/http
 mkdir -p  packages/jpl
 mkdir -p  packages/jpl/src
@@ -1980,7 +1910,6 @@ mkdir -p  swi/library/clp
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([library/Makefile])
 AC_CONFIG_FILES([library/lammpi/Makefile])
-AC_CONFIG_FILES([library/matlab/Makefile])
 AC_CONFIG_FILES([library/matrix/Makefile])
 AC_CONFIG_FILES([library/mpi/Makefile])
 AC_CONFIG_FILES([library/random/Makefile])
@@ -1990,107 +1919,93 @@ AC_CONFIG_FILES([library/system/Makefile])
 AC_CONFIG_FILES([library/tries/Makefile])
 AC_CONFIG_FILES([packages/Makefile.defs])
 AC_CONFIG_FILES([packages/Dialect.defs])
-AC_CONFIG_FILES([packages/CLPBN/Makefile])
-AC_CONFIG_FILES([packages/cplint/Makefile])
-AC_CONFIG_FILES([packages/cplint/approx/simplecuddLPADs/Makefile])
-AC_CONFIG_FILES([packages/cplint/slipcase/Makefile])
 AC_CONFIG_FILES([packages/meld/Makefile])
 AC_CONFIG_FILES([packages/xml/Makefile])
 AC_CONFIG_FILES([packages/ProbLog/Makefile ])
-AC_CONFIG_FILES([swi/console/Makefile])
 AC_CONFIG_FILES([swi/library/Makefile])
 AC_CONFIG_FILES([swi/library/clp/Makefile])
 
-if test "$ENABLE_CHR" = ""; then
+if test "$PKG_CHR" != ""; then
 AC_CONFIG_FILES([packages/chr/Makefile])
 fi
 
-if test "$ENABLE_CLIB" = ""; then
+if test "$PKG_CLIB" != ""; then
 AC_CONFIG_FILES([packages/clib/Makefile])
 fi
 
-if test "$ENABLE_CLPQR" = ""; then
+if test "$PKG_CLPQR" != ""; then
 AC_CONFIG_FILES([packages/clpqr/Makefile])
 fi
 
-if test "$ENABLE_HTTP" = ""; then
+if test "$PKG_HTTP" != ""; then
 AC_CONFIG_FILES([packages/http/Makefile])
 fi
 
-if test "$ENABLE_JPL" = ""; then
+if test "$PKG_JPL" != ""; then
 AC_CONFIG_FILES([packages/jpl/Makefile packages/jpl/src/java/Makefile ])
 fi
 
-if test "$ENABLE_LTX2HTM" = ""; then
+if test "$PKG_LTX2HTM" != ""; then
 AC_CONFIG_FILES([ packages/ltx2htm/Makefile packages/ltx2htm/latex2html])
 fi
 
-if test "$ENABLE_PLDOC" = ""; then
+if test "$PKG_PLDOC" != ""; then
 AC_CONFIG_FILES([packages/pldoc/Makefile])
 AC_CONFIG_FILES([packages/pldoc/server/man_server.pl])
 fi
 
-if test "$ENABLE_PLUNIT" = ""; then
+if test "$PKG_PLUNIT" != ""; then
 AC_CONFIG_FILES([packages/plunit/Makefile])
 fi
 
-if test "$ENABLE_R" = ""; then
+if test "$PKG_R" != ""; then
 AC_CONFIG_FILES([packages/R/Makefile])
 fi
 
-if test "$ENABLE_RDF" = ""; then
+if test "$PKG_RDF" != ""; then
 AC_CONFIG_FILES([packages/RDF/Makefile])
 fi
 
-if test "$ENABLE_SEMWEB" = ""; then
+if test "$PKG_SEMWEB" != ""; then
 AC_CONFIG_FILES([packages/semweb/Makefile])
 fi
 
-if test "$ENABLE_SGML" = ""; then
+if test "$PKG_SGML" != ""; then
 AC_CONFIG_FILES([packages/sgml/Makefile])
 fi
 
-if test "$ENABLE_ZLIB" = ""; then
+if test "$PKG_ZLIB" != ""; then
 AC_CONFIG_FILES([packages/zlib/Makefile])
 fi
 
-if test "$ENABLE_LIBARCHIVE" = ""; then
+if test "$PKG_LIBARCHIVE" != ""; then
 AC_CONFIG_FILES([packages/archive/Makefile])
 fi
 
-if test "$ENABLE_ODBC" = ""; then
+if test "$PKG_ODBC" != ""; then
 AC_CONFIG_FILES([packages/odbc/Makefile])
 fi
 
 
-if test "$ENABLE_CUDD" = ""; then
+if test "$PKG_MINISAT" != ""; then
-AC_CONFIG_FILES([packages/bdd/Makefile])
-AC_CONFIG_FILES([packages/ProbLog/simplecudd/Makefile])
-AC_CONFIG_FILES([packages/ProbLog/simplecudd_lfi/Makefile])
-fi
-
-if test "$ENABLE_MINISAT" = ""; then
 AC_CONFIG_FILES([packages/swi-minisat2/Makefile])
 AC_CONFIG_FILES([packages/swi-minisat2/C/Makefile])
 fi
 
-if test "$ENABLE_REAL" = ""; then
+if test "$PKG_REAL" != ""; then
 AC_CONFIG_FILES([packages/real/Makefile])
 fi
 
-if test "$ENABLE_MYDDAS" = ""; then
+if test "$PKG_MYDDAS" != ""; then
 AC_CONFIG_FILES([packages/myddas/Makefile])
 fi
 
-if test "$ENABLE_CLPBN_BP" = ""; then
+if test "$PKG_CLPBN" != ""; then
+AC_CONFIG_FILES([packages/CLPBN/Makefile])
 AC_CONFIG_FILES([packages/CLPBN/horus/Makefile])
 fi
 
-if test "$ENABLE_GECODE" = ""; then
+if test "$PKG_PRISM" != ""; then
-AC_CONFIG_FILES([packages/gecode/Makefile])
-fi
-
-if test "$ENABLE_PRISM" = ""; then
 AC_CONFIG_FILES([packages/prism/src/c/Makefile])
 AC_CONFIG_FILES([packages/prism/src/prolog/Makefile])
 fi

library/lammpi/configure.in

@@ -34,7 +34,7 @@ fi
 
 dnl LAM/MPI interface
 
-if test "$yap_cv_mpi" != "no"; then
+if test "$yap_cv_mpi" != "no" -a "$INSTALL_DLLS" != "no"; then
     if test "$yap_cv_mpi" != "yes"; then
       AC_PATH_PROG(MPI_CC,mpicc,true,$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin)
     else
@@ -43,7 +43,7 @@ if test "$yap_cv_mpi" != "no"; then
     MPILDF=`"$MPI_CC" --showme:link`
     MPICF=`"$MPI_CC" --showme:compile`
     LIBS="$LIBS $MPILDF"
-    INSTALL_MPI=""
+    PKG_MPI="library/mpi"
     OLD_CC=${CC}
     CC=${MPI_CC}
     AC_CHECK_HEADERS(mpi.h)
@@ -64,11 +64,14 @@ if test "$yap_cv_mpi" != "no"; then
      CC=${OLD_CC}
    fi
 else
-  INSTALL_MPI="# "
+  PKG_MPI=""
   MPI_CC=${CC}
 fi
 
 
+AC_SUBST(PKG_MPI)
 AC_SUBST(YAPMPILIB)
 AC_SUBST(MPILDF)
 AC_SUBST(MPICF)
+
+mkdir -p  library/lammpi

library/matlab/Makefile.in

@@ -59,5 +59,5 @@ clean:
 	rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
 
 realclean: clean
-	rm -f Makefile
+	rm -f Makefile $(SOBJS) 
 

library/random/Makefile.in

@@ -56,6 +56,11 @@ yap_random.o: $(srcdir)/yap_random.c
 install: all
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 
+install-examples:
+
 clean:
 	rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
 
+realclean: clean
+	rm -f Makefile $(SOBJS)
+

packages/raptor

@@ -1 +1 @@
-Subproject commit 0f77a1e1b90b36bddb1844712380f4f3858123b7
+Subproject commit d5c70de04a6fce6be71a9086d0164dd0b0c9d9d4

packages/real

@@ -1 +1 @@
-Subproject commit 651702fe47088a12922e5051e6de89414a24e84c
+Subproject commit 6235790ec8283ca65aefaed14f95a1749e744325

packages/zlib

@@ -1 +1 @@
-Subproject commit 044e8b33bfe3158463141add5bb9ce5e71cb7451
+Subproject commit a8a43aa09892c4b7018dc053d8e7653e2f648107

swi/library/clp/Makefile.in

@@ -25,8 +25,12 @@ srcdir=@srcdir@
 
 PROGRAMS= $(srcdir)/clp_events.pl
 
+all:
+
 install: $(PROGRAMS)
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/clp
 	for p in $(PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/clp; done
 
+install-examples:
+