diff --git a/Makefile.in b/Makefile.in index fdc3feecc..5cd9e31c6 100755 --- a/Makefile.in +++ b/Makefile.in @@ -704,7 +704,7 @@ all: startup.yss @INSTALL_DLLS@ (cd library/system; $(MAKE)) @INSTALL_DLLS@ (cd library/tries; $(MAKE)) @ENABLE_CLIB@ @INSTALL_DLLS@ (cd packages/clib; $(MAKE)) - @ENABLE_CHR@ @INSTALL_DLLS@ (cd packages/chr; $(MAKE)) + @ENABLE_CHR@ (cd packages/chr; $(MAKE)) @ENABLE_HTTP@ @INSTALL_DLLS@ (cd packages/http; $(MAKE)) @ENABLE_PLDOC@ @INSTALL_DLLS@ (cd packages/pldoc; $(MAKE)) @ENABLE_PLUNIT@ @INSTALL_DLLS@ (cd packages/plunit; $(MAKE)) @@ -712,17 +712,17 @@ all: startup.yss @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@ (cd packages/real; $(MAKE)) - @ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(MAKE)) - @ENABLE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE)) + @ENABLE_REAL@ @INSTALL_DLLS@ (cd packages/real; $(MAKE)) + @ENABLE_CLPBN_BP@ @INSTALL_DLLS@ (cd packages/CLPBN/horus; $(MAKE)) + @ENABLE_MINISAT@ @INSTALL_DLLS@ (cd packages/swi-minisat2/C; $(MAKE)) @ENABLE_LIBARCHIVE@ @INSTALL_DLLS@ (cd packages/archive; $(MAKE)) @ENABLE_ODBC@ @INSTALL_DLLS@ (cd packages/odbc; $(MAKE)) @ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE)) @ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE)) @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE)) @ENABLE_CPLINT@ (cd packages/cplint/slipcase; $(MAKE)) - @ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE)) - @ENABLE_BDDLIB@ (cd packages/bdd; $(MAKE)) + @ENABLE_PRISM@ @INSTALL_DLLS@ (cd packages/prism/src/c; $(MAKE)) + @ENABLE_BDDLIB@ @INSTALL_DLLS@ (cd packages/bdd; $(MAKE)) @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE)) @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE)) @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE)) @@ -792,12 +792,11 @@ install_unix: startup.yss libYap.a @ENABLE_LIBARCHIVE@ @INSTALL_DLLS@ (cd packages/archive; $(MAKE) install) @ENABLE_ODBC@ @INSTALL_DLLS@ (cd packages/odbc; $(MAKE) install) @ENABLE_CLPBN_BP@ @INSTALL_DLLS@ (cd packages/CLPBN/horus; $(MAKE) install) - @ENABLE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install) - @INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install) - @ENABLE_REAL@ (cd packages/real; $(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_JPL@ @INSTALL_DLLS@ (cd packages/python; $(MAKE) install) mkdir -p $(DESTDIR)$(INCLUDEDIR) mkdir -p $(DESTDIR)$(INCLUDEDIR)/src $(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR)/src @@ -807,9 +806,9 @@ install_unix: startup.yss libYap.a $(INSTALL) YapTermConfig.h $(DESTDIR)$(INCLUDEDIR) @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install) @ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(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_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_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install) @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE) install) @@ -927,7 +926,7 @@ clean: clean_docs @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@ @INSTALL_DLLS@ (cd packages/chr; $(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)