--- wserver/Makefile.old	2011-03-11 13:47:04.000000000 +0100
+++ wserver/Makefile	2011-03-11 13:47:20.000000000 +0100
@@ -4,8 +4,10 @@
 
 OBJS=wserver.cmo
 
-all:: pa_macro5.cmo $(OBJS)
+all:: pa_macro5.cmo
+	$(MAKE) $(OBJS)
-opt:: pa_macro5.cmo $(OBJS:.cmo=.cmx)
+opt:: pa_macro5.cmo
+	$(MAKE) $(OBJS:.cmo=.cmx)
 
 pa_macro5.cmo: pa_macro5.ml
 	camlp5r pa_extend.cmo q_MLast.cmo -o pa_macro5.ppo pa_macro5.ml
--- src/Makefile.old	2013-04-18 21:29:52.727049806 +0200
+++ src/Makefile	2013-04-18 21:30:58.838414496 +0200
@@ -153,6 +153,8 @@
 	) | \
 	sort | uniq | grep -v '^$$' > i18n
 
+config.cmi: gwdb.cmi
+
 always:
 
 depend:
--- src/.depend.old	2014-07-17 09:18:26.882149121 +0200
+++ src/.depend	2014-07-17 09:19:07.981770328 +0200
@@ -162,7 +162,7 @@
     mutil.cmx notesLinks.cmx progrBar.cmx secure.cmx select.cmx 
 history.cmo: adef.cmi buff.cmo config.cmi date.cmi def.cmi gutil.cmi \
     gwdb.cmi hutil.cmi mutil.cmi secure.cmi templ.cmi templAst.cmi util.cmi \
-    history_diff.cmi ../wserver/wserver.cmi history.cmi 
+    history_diff.cmo ../wserver/wserver.cmi history.cmi 
 history.cmx: adef.cmx buff.cmx config.cmi date.cmx def.cmi gutil.cmx \
     gwdb.cmx hutil.cmx mutil.cmx secure.cmx templ.cmx templAst.cmi util.cmx \
     history_diff.cmx ../wserver/wserver.cmx history.cmi 
--- ged2gwb/.depend.old	2014-07-17 09:23:02.119612299 +0200
+++ ged2gwb/.depend	2014-07-17 09:23:53.987134380 +0200
@@ -1,7 +1,7 @@
 ged2gwb2.cmo: ../src/adef.cmi ../src/ansel.cmo ../src/argl.cmo \
     ../src/buff.cmo ../src/calendar.cmi ../src/db2link.cmi ../src/def.cmi \
     ../src/futil.cmi ../src/gwcomp.cmi ../src/lock.cmi ../src/mutil.cmi \
-    ../src/name.cmi ../src/secure.cmi ./utf8.cmi
+    ../src/name.cmi ../src/secure.cmi ./utf8.cmo
 ged2gwb2.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \
     ../src/buff.cmx ../src/calendar.cmx ../src/db2link.cmx ../src/def.cmi \
     ../src/futil.cmx ../src/gwcomp.cmx ../src/lock.cmx ../src/mutil.cmx \
@@ -10,7 +10,7 @@
     ../src/buff.cmo ../src/calendar.cmi ../src/check.cmi \
     ../src/checkItem.cmi ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmi \
     ../src/lock.cmi ../src/mutil.cmi ../src/name.cmi ../src/outbase.cmi \
-    ../src/secure.cmi ./utf8.cmi
+    ../src/secure.cmi ./utf8.cmo
 ged2gwb.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \
     ../src/buff.cmx ../src/calendar.cmx ../src/check.cmx \
     ../src/checkItem.cmx ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmx \
--- Makefile.old	2014-10-30 08:36:50.308668062 +0100
+++ Makefile	2014-10-30 08:37:13.204451602 +0100
@@ -65,7 +65,7 @@
 
 distrib: new_distrib wrappers
 
-wrappers:
+wrappers: new_distrib
 	if test "$(CAMLP5F)" = "-DWIN95"; then \
 	  echo -ne 'setlocal enableextensions\r\n' > $(DESTDIR)/gwd.bat; \
 	  echo -ne 'md bases\r\n' >> $(DESTDIR)/gwd.bat; \