From 1d27d22ef0d775e224c4a098889e1778e9448c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@dcc.fc.up.pt>
Date: Thu, 13 Feb 2014 01:58:48 +0000
Subject: [PATCH] big makefile cleanup

---
 Makefile.in                                 | 12 +++++++-----
 configure.in                                |  2 +-
 library/Makefile.in                         |  9 +++++++--
 library/lammpi/Makefile.in                  |  6 +++++-
 library/matlab/Makefile.in                  |  3 ++-
 library/matrix/Makefile.in                  |  7 ++++++-
 library/random/Makefile.in                  |  7 ++++---
 library/regex/Makefile.in                   |  6 +++++-
 library/rltree/Makefile.in                  |  8 +++++++-
 library/system/Makefile.in                  |  7 ++++++-
 library/tries/Makefile.in                   |  5 ++++-
 packages/CLPBN/Makefile.in                  |  8 ++++++--
 packages/CLPBN/horus/Makefile.in            |  3 ++-
 packages/Dialect.defs.in                    |  2 ++
 packages/ProbLog/Makefile.in                |  7 ++++---
 packages/ProbLog/simplecudd/Makefile.in     |  6 ++++++
 packages/ProbLog/simplecudd_lfi/Makefile.in |  5 +++++
 packages/R                                  |  2 +-
 packages/RDF                                |  2 +-
 packages/bdd/Makefile.in                    |  4 ++--
 packages/chr                                |  2 +-
 packages/clib                               |  2 +-
 packages/clpqr                              |  2 +-
 packages/cplint/Makefile.in                 |  8 ++++++--
 packages/cuda/Makefile.in                   |  4 ++--
 packages/gecode/Makefile.in                 |  7 ++++---
 packages/http                               |  2 +-
 packages/jpl                                |  2 +-
 packages/ltx2htm                            |  2 +-
 packages/meld/Makefile.in                   |  8 +++++++-
 packages/myddas/Makefile.in                 |  3 ++-
 packages/odbc                               |  2 +-
 packages/pldoc                              |  2 +-
 packages/plunit                             |  2 +-
 packages/prism/src/c/Makefile.in            |  5 +++++
 packages/prism/src/prolog/Makefile.in       |  3 +++
 packages/python/Makefile.in                 |  4 +++-
 packages/real                               |  2 +-
 packages/semweb                             |  2 +-
 packages/sgml                               |  2 +-
 packages/swi-minisat2/C/Makefile.in         |  2 +-
 packages/swi-minisat2/Makefile.in           |  4 ++--
 packages/xml/Makefile.in                    | 10 ++++++++--
 packages/yap-lbfgs/Makefile.in              |  6 +++++-
 swi/library/Makefile.in                     |  7 +++++++
 swi/library/clp/Makefile.in                 |  4 ++++
 46 files changed, 154 insertions(+), 56 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 536fb8b66..98fae44dc 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -514,12 +514,15 @@ mycb: $(srcdir)/mycb.c
 	$(CC) $(CFLAGS) $(srcdir)/mycb.c -o mycb
 
 INSTALLED_PACKAGES= \
+	library/matrix \
 	library/random \
 	library/regex \
 	library/rltree \
 	library/system \
 	library/tries \
+	packages/meld \
 	packages/ProbLog \
+	packages/xml \
 	packages/yap-lbfgs \
 	@PKG_BDDLIB@ \
 	@PKG_CLPBN@ \
@@ -602,8 +605,7 @@ install_unix: startup.yss @YAPLIB@
 	$(INSTALL) config.h $(DESTDIR)$(INCLUDEDIR)/src/config.h
 	$(INSTALL) parms.h $(DESTDIR)$(INCLUDEDIR)/src/parms.h
 	$(INSTALL) YapTermConfig.h $(DESTDIR)$(INCLUDEDIR)
-	for f in $(PACKAGES); do ( echo $$f; cd $$f ; $(MAKE) install ); done
-	for f in $(PACKAGES); do ( echo $$f; cd $$f ; $(MAKE) install-examples ); done
+	for f in $(PACKAGES); do ( echo "**** INSTALLING **** " $$f; cd $$f ; $(MAKE) install ); done
 
 install_win32: startup.yss @WINDOWS@ yap-win@EXEC_SUFFIX@ install_unix
 	$(INSTALL_PROGRAM) -m 755 yap.dll $(DESTDIR)$(BINDIR)/yap.dll
@@ -632,9 +634,9 @@ clean: clean_docs clean_local
 clean_local:
 	rm -f *.o *~ *.BAK *.a 	
 
-distclean:  realclean_docs clean_local
+distclean:  distclean_docs clean_local
+	for f in $(PACKAGES); do ( ECHO "**** CLEANING ****" $$f; cd $$f ; $(MAKE) distclean ); done
 	rm -f yap@EXEC_SUFFIX@ startup.yss libYap.* Makefile packages/Makefile.defs packages/Dialect.defs
-	for f in $(PACKAGES); do ( cd $$f ; $(MAKE) distclean ); done
 
 dist:
 
@@ -718,7 +720,7 @@ yap.pdf:  $(YAPDOCS)
 clean_docs:
 	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_docs: clean_docs
+distclean_docs: clean_docs
 	rm -f yap.ps yap.html yap_toc.html yap.pdf yap.info*
 
 installcheck:
diff --git a/configure.in b/configure.in
index 467187a09..b794e80c3 100755
--- a/configure.in
+++ b/configure.in
@@ -1687,7 +1687,7 @@ if test "$yap_cv_minisat" = no -a "$INSTALL_DLLS" = "no"
 then
   PKG_MINISAT=""
 else
-  PKG_MINISAT="packages/swi-minisat2"
+  PKG_MINISAT="packages/swi-minisat2 packages/swi-minisat2/C"
 fi
 
 
diff --git a/library/Makefile.in b/library/Makefile.in
index 06f4aab56..6108590d8 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -102,7 +102,7 @@ DIALECT_BP= \
 	$(srcdir)/dialect/bprolog/foreach.pl \
 	$(srcdir)/dialect/bprolog/hashtable.yap
 
-install: $(PROGRAMS)
+install: $(PROGRAMS)  install-examples
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/dialect
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/dialect/swi
@@ -112,5 +112,10 @@ install: $(PROGRAMS)
 	for p in $(DIALECT_SWI); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/dialect/swi; done
 	for p in $(DIALECT_BP); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/dialect/bprolog; done
 
-realclean:
+
+install-examples:
+
+clean:
+
+distclean: clean
 	rm -f *def Makefile
diff --git a/library/lammpi/Makefile.in b/library/lammpi/Makefile.in
index 859850381..faa158af6 100644
--- a/library/lammpi/Makefile.in
+++ b/library/lammpi/Makefile.in
@@ -61,7 +61,7 @@ hash.o: $(srcdir)/hash.c $(srcdir)/hash.h
 @DO_SECOND_LD@yap_mpi.@SO@: $(OBJS)
 @DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o yap_mpi.@SO@ $(OBJS)  $(MPILDF) @EXTRA_LIBS_FOR_DLLS@
 
-install: all
+install: all  install-examples
 	@if test "$(SOBJS)" = ""; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi
 
 clean:
@@ -70,3 +70,7 @@ clean:
 no:
 	@echo "YAP LAM/MPI module not compiled."
 
+install-examples:
+
+distclean: clean
+	rm -f Makefile
diff --git a/library/matlab/Makefile.in b/library/matlab/Makefile.in
index 1e069a8a9..c922589d0 100644
--- a/library/matlab/Makefile.in
+++ b/library/matlab/Makefile.in
@@ -52,7 +52,7 @@ matlab.o: $(srcdir)/matlab.c
 @DO_SECOND_LD@matlab.@SO@: matlab.o
 @DO_SECOND_LD@	@SHLIB_LD@ -o matlab.@SO@ matlab.o  @EXTRA_LIBS_FOR_DLLS@
 
-install: all
+install: all  install-examples
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 
 clean:
@@ -61,3 +61,4 @@ clean:
 realclean: clean
 	rm -f Makefile $(SOBJS) 
 
+install-examples:
diff --git a/library/matrix/Makefile.in b/library/matrix/Makefile.in
index f1f5134d2..8016e02a5 100644
--- a/library/matrix/Makefile.in
+++ b/library/matrix/Makefile.in
@@ -53,9 +53,14 @@ matrix.o: $(srcdir)/matrix.c
 @DO_SECOND_LD@matrix.@SO@: matrix.o
 @DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o matrix.@SO@ matrix.o  @EXTRA_LIBS_FOR_DLLS@
 
-install: all
+install: all install-examples
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 
 clean:
 	rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
 
+
+install-examples:
+
+distclean: clean
+	rm -f Makefile
diff --git a/library/random/Makefile.in b/library/random/Makefile.in
index 9a0fe5b05..fdf149d2b 100644
--- a/library/random/Makefile.in
+++ b/library/random/Makefile.in
@@ -53,7 +53,7 @@ yap_random.o: $(srcdir)/yap_random.c
 @DO_SECOND_LD@yap_random.@SO@: yap_random.o
 @DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@
 
-install: all
+install: all install-examples
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 
 install-examples:
@@ -61,6 +61,7 @@ install-examples:
 clean:
 	rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
 
-realclean: clean
-	rm -f Makefile $(SOBJS)
+distclean: clean
+	rm -f Makefile
+
 
diff --git a/library/regex/Makefile.in b/library/regex/Makefile.in
index cdb40644a..31e5a2d0c 100644
--- a/library/regex/Makefile.in
+++ b/library/regex/Makefile.in
@@ -77,9 +77,13 @@ regexec.o: $(srcdir)/regexec.c
 @DO_SECOND_LD@regexec.@SO@: regexec.o
 @DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@
 
-install: all
+install: all install-examples
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 
+install-examples:
+
 clean:
 	rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
 
+distclean: clean
+	rm -f Makefile
diff --git a/library/rltree/Makefile.in b/library/rltree/Makefile.in
index ca8ad6dac..2e73f85ce 100644
--- a/library/rltree/Makefile.in
+++ b/library/rltree/Makefile.in
@@ -58,7 +58,7 @@ yaprl.o: $(srcdir)/yap_rl.c
 @DO_SECOND_LD@yap_rl.@SO@: $(OBJS)
 @DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
 
-install: all
+install: all install-examples
 	@if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi
 
 clean:
@@ -67,3 +67,9 @@ clean:
 no:
 	@echo "YAP RL module not compiled."
 
+
+
+install-examples:
+
+distclean: clean
+	rm -f Makefile
diff --git a/library/system/Makefile.in b/library/system/Makefile.in
index d799392b1..d021d73f4 100644
--- a/library/system/Makefile.in
+++ b/library/system/Makefile.in
@@ -53,9 +53,14 @@ sys.o: $(srcdir)/sys.c
 @DO_SECOND_LD@sys.@SO@: sys.o
 @DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@
 
-install: all
+install: all install-examples
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 
+install-examples:
+
 clean:
 	rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
 
+
+distclean: clean
+	rm -f Makefilee
diff --git a/library/tries/Makefile.in b/library/tries/Makefile.in
index c376f346c..6c5fb7580 100644
--- a/library/tries/Makefile.in
+++ b/library/tries/Makefile.in
@@ -69,10 +69,13 @@ itries.o: $(srcdir)/core_tries.h $(srcdir)/base_itries.h $(srcdir)/itries.c
 @DO_SECOND_LD@itries.@SO@: core_tries.o base_itries.o itries.o
 @DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
 
-install: all
+install: all install-examples
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 
 clean:
 	rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
 
+install-examples:
 
+distclean: clean
+	rm -f Makefile
diff --git a/packages/CLPBN/Makefile.in b/packages/CLPBN/Makefile.in
index e1e3c8f19..00428225b 100644
--- a/packages/CLPBN/Makefile.in
+++ b/packages/CLPBN/Makefile.in
@@ -119,7 +119,7 @@ CLPBN_LEARNING_EXAMPLES= \
 
 all:
 
-install: $(CLBN_TOP) $(CLBN_PROGRAMS) $(CLPBN_LEARNING_PROGRAMS) $(CLPBN_SCHOOL_EXAMPLES) $(CLPBN_HMMER_EXAMPLES) $(CLPBN_LEARNING_EXAMPLES)
+install: $(CLBN_TOP) $(CLBN_PROGRAMS) $(CLPBN_LEARNING_PROGRAMS) install-examples
 	mkdir -p $(DESTDIR)$(SHAREDIR)/clpbn
 	mkdir -p $(DESTDIR)$(SHAREDIR)/clpbn/learning
 	mkdir -p $(DESTDIR)$(EXDIR)
@@ -130,7 +130,7 @@ install: $(CLBN_TOP) $(CLBN_PROGRAMS) $(CLPBN_LEARNING_PROGRAMS) $(CLPBN_SCHOOL_
 	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:
+install-examples: $(CLPBN_SCHOOL_EXAMPLES) $(CLPBN_HMMER_EXAMPLES) $(CLPBN_LEARNING_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
@@ -146,3 +146,7 @@ docs: $(MANUAL)
 install_docs: docs
 	$(INSTALL_DATA) pfl.pdf $(DESTDIR)$(EXDIR)
 
+clean:
+
+distclean: clean
+	rm -f Makefile
diff --git a/packages/CLPBN/horus/Makefile.in b/packages/CLPBN/horus/Makefile.in
index e2b361ba7..a8466c626 100644
--- a/packages/CLPBN/horus/Makefile.in
+++ b/packages/CLPBN/horus/Makefile.in
@@ -211,10 +211,11 @@ $(UTESTING): $(UTESTS_OBJS)
 	$(CXX) -o $@ -c $(CXXFLAGS) $<
 
 
-install: all
+install: all install-exaamples
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 	$(INSTALL_PROGRAM) $(HCLI) $(DESTDIR)$(BINDIR)
 
+install-examples:
 
 clean:
 	rm -f $(SOBJS) $(HCLI) $(UTESTING) *.o *~ $(utestsdir)/*.o $(utestsdir)/*~
diff --git a/packages/Dialect.defs.in b/packages/Dialect.defs.in
index 54756b59e..41c883e1f 100755
--- a/packages/Dialect.defs.in
+++ b/packages/Dialect.defs.in
@@ -70,3 +70,5 @@ PLTOTEX=$(PUBLICPL) -q -l $(srcdir)/pltotex -g pltotex --
 %.o: $(srcdir)/%.c
 		$(CC) -c $(CFLAGS) $< -o $@
 
+
+install-examples::
diff --git a/packages/ProbLog/Makefile.in b/packages/ProbLog/Makefile.in
index 68992240c..2ad2bcd31 100644
--- a/packages/ProbLog/Makefile.in
+++ b/packages/ProbLog/Makefile.in
@@ -82,7 +82,7 @@ MANUAL = $(srcdir)/$(MANUAL_NAME)
 
 all:
 
-install: $(PROGRAMS) $(PROBLOG_PROGRAMS) $(PROBLOG_EXAMPLES)
+install: $(PROGRAMS) $(PROBLOG_PROGRAMS) install-examples
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/problog
 	mkdir -p $(DESTDIR)$(DOCSDIR)
@@ -91,7 +91,7 @@ install: $(PROGRAMS) $(PROBLOG_PROGRAMS) $(PROBLOG_EXAMPLES)
 	for p in $(PROBLOG_PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/problog; done
 	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(DOCSDIR)
 
-install-examples:
+install-examples:  $(PROBLOG_EXAMPLES)
 	for p in $(PROBLOG_EXAMPLES); do $(INSTALL_DATA) $$p $(DESTDIR)$(EXDOCSDIR); done
 
 pdf: $(MANUAL)
@@ -104,5 +104,6 @@ install_docs: pdf
 
 clean:
 
-realclean:
+distclean:
 	rm -f Makefile
+
diff --git a/packages/ProbLog/simplecudd/Makefile.in b/packages/ProbLog/simplecudd/Makefile.in
index da6d89b15..70aa2bfd3 100644
--- a/packages/ProbLog/simplecudd/Makefile.in
+++ b/packages/ProbLog/simplecudd/Makefile.in
@@ -60,3 +60,9 @@ clean:
 
 install: default
 	$(INSTALL_PROGRAM) problogbdd $(DESTDIR)$(SHAREDIR)/Yap
+
+install-examples:
+
+distclean: clean
+	rm -f Makefile
+
diff --git a/packages/ProbLog/simplecudd_lfi/Makefile.in b/packages/ProbLog/simplecudd_lfi/Makefile.in
index 03ffee7ed..b18b47052 100644
--- a/packages/ProbLog/simplecudd_lfi/Makefile.in
+++ b/packages/ProbLog/simplecudd_lfi/Makefile.in
@@ -60,3 +60,8 @@ clean:
 
 install: default
 	$(INSTALL_PROGRAM) problogbdd_lfi $(DESTDIR)$(SHAREDIR)/Yap
+
+install-examples:
+
+distclean: clean
+	rm -f Makefile
diff --git a/packages/R b/packages/R
index 87ea72e5d..87bb48410 160000
--- a/packages/R
+++ b/packages/R
@@ -1 +1 @@
-Subproject commit 87ea72e5db5844be1bccfac0efb56abdab1d7f84
+Subproject commit 87bb48410a5c5e9bc36abfde0e718b8bd3e99864
diff --git a/packages/RDF b/packages/RDF
index 5b577c841..f19e64df2 160000
--- a/packages/RDF
+++ b/packages/RDF
@@ -1 +1 @@
-Subproject commit 5b577c8414aeaba18c2eb9eff987060fa9df96d8
+Subproject commit f19e64df267c6dbaf3c4f93b44f2b1e343e4b449
diff --git a/packages/bdd/Makefile.in b/packages/bdd/Makefile.in
index ab4d9fe3e..d8d9b64f3 100644
--- a/packages/bdd/Makefile.in
+++ b/packages/bdd/Makefile.in
@@ -60,7 +60,7 @@ cudd.o: $(srcdir)/cudd.c
 @DO_SECOND_LD@cudd.@SO@: cudd.o
 @DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o cudd.@SO@ cudd.o @EXTRA_LIBS_FOR_DLLS@  @CUDD_LDFLAGS@
 
-install: all
+install: all install-examples
 	mkdir -p $(DESTDIR)$(SHAREDIR)
 	for h in $(BDD_PROLOG); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
@@ -70,7 +70,7 @@ install-examples:
 clean:
 	rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
 
-realclean: clean
+distclean: clean
 	rm -f $(SOBJS) Makefile
 
 
diff --git a/packages/chr b/packages/chr
index fe49dc72a..33b688ae7 160000
--- a/packages/chr
+++ b/packages/chr
@@ -1 +1 @@
-Subproject commit fe49dc72a077b8f853fa2fb42661bd79a8c6aa00
+Subproject commit 33b688ae733f35bb938f8ed0ad4170d882d86837
diff --git a/packages/clib b/packages/clib
index 4424be7f2..10cbe41ff 160000
--- a/packages/clib
+++ b/packages/clib
@@ -1 +1 @@
-Subproject commit 4424be7f21a07d4f29c1fcbf0330956d74fc07fa
+Subproject commit 10cbe41ff198d1c37fed9019f30b3792b6a1cd44
diff --git a/packages/clpqr b/packages/clpqr
index 23a8bc68d..4aa1c2836 160000
--- a/packages/clpqr
+++ b/packages/clpqr
@@ -1 +1 @@
-Subproject commit 23a8bc68dfc19351ed96db608cfb82db616a1d1d
+Subproject commit 4aa1c28369a3003506aafafc9911d85683d58b2c
diff --git a/packages/cplint/Makefile.in b/packages/cplint/Makefile.in
index 5fb8592c1..61991acf0 100644
--- a/packages/cplint/Makefile.in
+++ b/packages/cplint/Makefile.in
@@ -149,7 +149,7 @@ CPLINT_LEARNING_PROGRAMS=\
 	$(CPLINT_SRCDIR)/rib \
 	$(CPLINT_SRCDIR)/slipcase \
 	$(CPLINT_SRCDIR)/slipcover
-	
+
 
 all: $(SOBJS)
 
@@ -167,7 +167,7 @@ cplint_Prob.o: $(srcdir)/cplint_Prob.c  $(srcdir)/cplint.h
 clean:
 	rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
 
-install: all 
+install: all install-examples
 	mkdir -p $(DESTDIR)$(SHAREDIR)/cplint
 	mkdir -p $(DESTDIR)$(SHAREDIR)/cplint/examples
 	mkdir -p $(DESTDIR)$(SHAREDIR)/cplint/doc
@@ -185,6 +185,8 @@ install: all
 	cp $(CPLINT_SRCDIR)/slipcover/*.pl $(DESTDIR)$(SHAREDIR)/cplint/
 	$(INSTALL_PROGRAM) slipcase/bddem.so $(DESTDIR)$(YAPLIBDIR)
 
+install_examples:
+
 installcheck: 
 	for h in ${CPLINT_TEST_PROGRAMS}; do echo "t. halt." | $(BINDIR)/yap -l $$h; done
 
@@ -192,3 +194,5 @@ installcheck:
 test%:  	
 	echo "t. halt." | yap -l $(CPLINT_SRCDIR)/$@.pl
 
+distclean: clean
+	rm -f Makefile
diff --git a/packages/cuda/Makefile.in b/packages/cuda/Makefile.in
index 20cbe54e1..852468493 100644
--- a/packages/cuda/Makefile.in
+++ b/packages/cuda/Makefile.in
@@ -62,7 +62,7 @@ memory.o: $(srcdir)/memory.cu $(srcdir)/pred.h
 @DO_SECOND_LD@cuda.@SO@: $(OBJS)
 @DO_SECOND_LD@	@CUDA_SHLIB_LD@ $(CUDA_LDFLAGS) -o cuda.@SO@ $(OBJS)
 
-install: all
+install: all install-exampleS
 	mkdir -p $(DESTDIR)$(SHAREDIR)
 	for h in $(BDD_PROLOG); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
@@ -72,6 +72,6 @@ install-examples:
 clean:
 	rm -f *.o *~ $(OBJS) *.BAK
 
-realclean:
+distclean: clean
 	rm -f $(SOBJS) Makefile
 
diff --git a/packages/gecode/Makefile.in b/packages/gecode/Makefile.in
index 431fa4020..41087a409 100644
--- a/packages/gecode/Makefile.in
+++ b/packages/gecode/Makefile.in
@@ -67,12 +67,12 @@ gecode.yap: $(srcdir)/gecode$(GECODE_MAJOR)_yap_hand_written.yap $(srcdir)/$(GEC
 .PHONY: all clean install
 
 clean:
-	-rm -f *.o *.so *~ gecode.yap
+	-rm -f *.o $(SOBJS) *~ gecode.yap
 
-realclean:
+distclean:
 	-rm -f $(SOBJS) Makefile 
 
-install: all
+install: all install-examples
 	mkdir -p $(DESTDIR)$(YAPLIBDIR)
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/gecode
@@ -81,3 +81,4 @@ install: all
 	$(INSTALL) $(srcdir)/clpfd.yap $(DESTDIR)$(SHAREDIR)/Yap/gecode
 
 install-examples:
+
diff --git a/packages/http b/packages/http
index 3ea73d3b1..c7aa381b5 160000
--- a/packages/http
+++ b/packages/http
@@ -1 +1 @@
-Subproject commit 3ea73d3b1d23631a3545a9578539ea7e3df567f6
+Subproject commit c7aa381b57518be621560c49ee5f86cf2f060e64
diff --git a/packages/jpl b/packages/jpl
index f96cfb753..cb103a2ab 160000
--- a/packages/jpl
+++ b/packages/jpl
@@ -1 +1 @@
-Subproject commit f96cfb7533c57789fa25db64b73c09aa7269d244
+Subproject commit cb103a2ab6f1e18054380598b08b466e0fcef902
diff --git a/packages/ltx2htm b/packages/ltx2htm
index a208a6e52..5c21d8fbe 160000
--- a/packages/ltx2htm
+++ b/packages/ltx2htm
@@ -1 +1 @@
-Subproject commit a208a6e52d9541b0755776dfe1df2ab07dcfcdc0
+Subproject commit 5c21d8fbe4845578c43f4ab0eb29a59e60b77d42
diff --git a/packages/meld/Makefile.in b/packages/meld/Makefile.in
index 89042183f..679934c5d 100644
--- a/packages/meld/Makefile.in
+++ b/packages/meld/Makefile.in
@@ -48,11 +48,17 @@ PROGRAMS= \
 
 all:
 
-install: $(PROGRAMS) $(EXAMPLES)
+install: $(PROGRAMS)examples-install
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/meld
 	mkdir -p $(DESTDIR)$(EX_INSTALL_DIR)
 	$(INSTALL_DATA) $(srcdir)/meld.yap $(DESTDIR)$(SHAREDIR)/Yap
 	for p in $(MELD_PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/meld; done
+
+install-examples: $(EXAMPLES) 
 	for p in $(MELD_EXAMPLES); do $(INSTALL_DATA) $$p $(DESTDIR)$(EX_INSTALL_DIR); done
 
+clean:
+
+distclean: clean
+	rm -r Makefile
diff --git a/packages/myddas/Makefile.in b/packages/myddas/Makefile.in
index a7671906f..634a3fe76 100644
--- a/packages/myddas/Makefile.in
+++ b/packages/myddas/Makefile.in
@@ -81,7 +81,7 @@ all: $(SOBJS)
 @DO_SECOND_LD@%.@SO@: $(OBJS)
 @DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ 
 
-install: all install_myddas
+install: all install_myddas install-examples
 	mkdir -p $(DESTDIR)$(SHAREDIR)
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 
@@ -102,3 +102,4 @@ clean:
 
 distclean: clean
 	rm -f Makefile
+
diff --git a/packages/odbc b/packages/odbc
index db1645c12..90510fe60 160000
--- a/packages/odbc
+++ b/packages/odbc
@@ -1 +1 @@
-Subproject commit db1645c121c478e0634e6d944b180d4378fcf4dc
+Subproject commit 90510fe601057a9122b6abeb17b716fa16a7c1aa
diff --git a/packages/pldoc b/packages/pldoc
index 1e324d30b..8fa3a149b 160000
--- a/packages/pldoc
+++ b/packages/pldoc
@@ -1 +1 @@
-Subproject commit 1e324d30b913edbe78cc4b923cde7998013cbfb0
+Subproject commit 8fa3a149b3b448ea2450e4bb570155933d16f4fe
diff --git a/packages/plunit b/packages/plunit
index 0593a6558..8497465ab 160000
--- a/packages/plunit
+++ b/packages/plunit
@@ -1 +1 @@
-Subproject commit 0593a65587ffbada6b6679204d0254a2a46b1535
+Subproject commit 8497465ab06f0991add8c5928ff11904ae204d51
diff --git a/packages/prism/src/c/Makefile.in b/packages/prism/src/c/Makefile.in
index 70268027a..e219a7b61 100755
--- a/packages/prism/src/c/Makefile.in
+++ b/packages/prism/src/c/Makefile.in
@@ -78,6 +78,8 @@ all: $(TARGETS)
 install: $(TARGETS)
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 
+install-examples:
+
 clean: clean_subdirs
 	$(RM) $(TARGET)
 
@@ -86,6 +88,9 @@ clean_subdirs:
 	  $(RM) $$i/*.o;                            \
 	done
 
+distclean: clean
+	rm -f Makefile $(SOBJS)
+
 ##----------------------------------------------------------------------
 
 .PHONY: all install clean $(SUBDIRS)
diff --git a/packages/prism/src/prolog/Makefile.in b/packages/prism/src/prolog/Makefile.in
index 2952ee6f4..805aa35da 100644
--- a/packages/prism/src/prolog/Makefile.in
+++ b/packages/prism/src/prolog/Makefile.in
@@ -147,3 +147,6 @@ install-examples:
 	for p in $(EXS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/doc/Yap/packages/examples/prism; done
 	for p in $(EXS_JTREE); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/doc/Yap/packages/examples/prism/jtree; done
 	for p in $(EXS_NOISY_OR); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/doc/Yap/packages/examples/prism/noisy_or; done
+
+distclean: clean
+	rm -f Makefile
diff --git a/packages/python/Makefile.in b/packages/python/Makefile.in
index 29d2a1247..f1199e3d9 100644
--- a/packages/python/Makefile.in
+++ b/packages/python/Makefile.in
@@ -24,7 +24,7 @@ python.@SO@:	$(OBJS)
 
 install:	install-@PYTHON_TARGET@
 install-dummy::
-install-pitf:	$(SOLIBS) $(addprefix $(srcdir)/, $(LIBPL))
+install-pitf:	$(SOLIBS) $(addprefix $(srcdir)/, $(LIBPL)) install-examples
 		mkdir -p $(DESTDIR)$(SOLIBDIR)
 		rm -f $(DESTDIR)$(SOLIBDIR)/python.@SO@
 		$(INSTALL_PROGRAM) $(SOLIBS) $(SOLIBDIR)
@@ -53,6 +53,8 @@ uninstall::
 		(cd $(PLBASE)/library && rm -f $(LIBPL))
 		$(MKINDEX)
 
+install-examples::
+
 ################################################################
 # Documentation
 ################################################################
diff --git a/packages/real b/packages/real
index e8360ba2d..34cac46db 160000
--- a/packages/real
+++ b/packages/real
@@ -1 +1 @@
-Subproject commit e8360ba2db265175a3b469bc9d51aff5cfccabb0
+Subproject commit 34cac46db62cad37386ea3321de37c0349eb9852
diff --git a/packages/semweb b/packages/semweb
index 2505370b8..e3c1b297e 160000
--- a/packages/semweb
+++ b/packages/semweb
@@ -1 +1 @@
-Subproject commit 2505370b84226fb21d71cfa447bc1c1ada9b5d22
+Subproject commit e3c1b297ea6d75d02e26511b555039f902f65e87
diff --git a/packages/sgml b/packages/sgml
index 22db6b08d..ca78af7cb 160000
--- a/packages/sgml
+++ b/packages/sgml
@@ -1 +1 @@
-Subproject commit 22db6b08d5ee26235e7ab22da194e2b4edadf4a7
+Subproject commit ca78af7cb093a4095a2e74fe83c48165d8e33226
diff --git a/packages/swi-minisat2/C/Makefile.in b/packages/swi-minisat2/C/Makefile.in
index a09385e0b..7469cadb2 100644
--- a/packages/swi-minisat2/C/Makefile.in
+++ b/packages/swi-minisat2/C/Makefile.in
@@ -81,7 +81,7 @@ install-examples:
 clean:
 	rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
 
-realclean:
+distclean:
 	rm -f Makefile $(OBJS)
 
 
diff --git a/packages/swi-minisat2/Makefile.in b/packages/swi-minisat2/Makefile.in
index a9e77e9ba..1131ac9b2 100644
--- a/packages/swi-minisat2/Makefile.in
+++ b/packages/swi-minisat2/Makefile.in
@@ -36,7 +36,7 @@ EXAMPLE_PROGRAMS= \
 
 all:
 
-install: $(PROGRAMS) 
+install: $(PROGRAMS)  install-examples
 	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
@@ -46,6 +46,6 @@ install-examples:
 
 clean:
 
-realclean:
+distclean:
 	rm Makefile
 
diff --git a/packages/xml/Makefile.in b/packages/xml/Makefile.in
index 4f9a9e4c4..6c626353b 100644
--- a/packages/xml/Makefile.in
+++ b/packages/xml/Makefile.in
@@ -61,11 +61,17 @@ PROGRAMS= \
 
 all:
 
-install: $(PROGRAMS) $(EXAMPLES)
+install: $(PROGRAMS)  install-examples
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
-	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/xml
 	mkdir -p $(DESTDIR)$(SHAREDIR)/doc/Yap/packages/examples/xml
 	$(INSTALL_DATA) $(srcdir)/xml.pl $(DESTDIR)$(SHAREDIR)/Yap
 	for p in $(XML_PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/xml; done
+
+install-examples: $(EXAMPLES)
+	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/xml
 	for p in $(XML_EXAMPLES); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/doc/Yap/packages/examples/xml; done
 
+clean:
+
+distclean: clean
+	rm -r Makefile
diff --git a/packages/yap-lbfgs/Makefile.in b/packages/yap-lbfgs/Makefile.in
index ec7f601ad..54943e079 100644
--- a/packages/yap-lbfgs/Makefile.in
+++ b/packages/yap-lbfgs/Makefile.in
@@ -1,4 +1,4 @@
-	#
+#
 # default base directory for YAP installation
 # (EROOT for architecture-dependent files)
 #
@@ -59,6 +59,10 @@ install: all
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 	for h in $(PLLIB); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
 
+install-examples:
+
 clean:
 	rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
 
+distclean: clean
+	rm -f Makefile
diff --git a/swi/library/Makefile.in b/swi/library/Makefile.in
index 493106fe6..aad4a83ef 100644
--- a/swi/library/Makefile.in
+++ b/swi/library/Makefile.in
@@ -66,3 +66,10 @@ install: $(PROGRAMS)
 	mkdir -p $(DESTDIR)$(SHAREDIR)/dcg
 	for p in $(PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap; done
 
+
+install-examples:
+
+clean:
+
+distclean: clean
+	rm -f Makefile
diff --git a/swi/library/clp/Makefile.in b/swi/library/clp/Makefile.in
index 9de7ce49d..77206b9fe 100644
--- a/swi/library/clp/Makefile.in
+++ b/swi/library/clp/Makefile.in
@@ -34,3 +34,7 @@ install: $(PROGRAMS)
 
 install-examples:
 
+clean:
+
+distclean: clean
+	rm -f Makefile