From 0f4b64d199cd5b6b29ef60afe15fb2819f6d936b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Manuel=20de=20Morais=20Santos=20Costa?=
 <vsc@xato.(none)>
Date: Fri, 16 Oct 2009 08:31:23 +0100
Subject: [PATCH] make should only look at reconsulted files, it makes no sense
 to use make for consulted files.

---
 pl/consult.yap | 20 ++++++++++----------
 pl/modules.yap |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pl/consult.yap b/pl/consult.yap
index 58ed9cba3..b09edc0d7 100644
--- a/pl/consult.yap
+++ b/pl/consult.yap
@@ -208,7 +208,7 @@ use_module(M,F,Is) :-
 	nb_setval('$if_level',0),
 	( nb_getval('$system_mode', OldMode) -> true ; OldMode = off),
         ( OldMode == off -> '$enter_system_mode' ; true ),
-	'$record_loaded'(Stream, ContextModule),
+	'$record_loaded'(Stream, ContextModule, Reconsult),
 	'$current_module'(OldModule,ContextModule),
 	getcwd(OldD),
 	nb_getval('$consulting_file',OldF),
@@ -411,11 +411,11 @@ prolog_load_context(term_position, Position) :-
 
 '$ensure_file_loaded'(F, M, Imports) :-
 	recorded('$module','$module'(F1,NM,P),_),
-	recorded('$lf_loaded','$lf_loaded'(F1,_,_),_),
+	recorded('$lf_loaded','$lf_loaded'(F1,_,_,_),_),
 	'$same_file'(F1,F), !,
 	'$use_preds'(Imports,P, NM, M).
 '$ensure_file_loaded'(F, M, _) :-
-	recorded('$lf_loaded','$lf_loaded'(F1,M,_),_),
+	recorded('$lf_loaded','$lf_loaded'(F1,M,_,_),_),
 	'$same_file'(F1,F), !.
 	
 
@@ -427,12 +427,12 @@ prolog_load_context(term_position, Position) :-
 
 '$ensure_file_unchanged'(F, M, Imports) :-
 	recorded('$module','$module'(F1,NM,P),_),
-	recorded('$lf_loaded','$lf_loaded'(F1,_,Age),R),
+	recorded('$lf_loaded','$lf_loaded'(F1,_,Age,_),R),
 	'$same_file'(F1,F), !,
 	'$file_is_unchanged'(F, R, Age),
 	'$use_preds'(Imports, P, NM, M).
 '$ensure_file_unchanged'(F, M, _) :-
-	recorded('$lf_loaded','$lf_loaded'(F1,M,Age),R),
+	recorded('$lf_loaded','$lf_loaded'(F1,M,Age,_),R),
 	'$same_file'(F1,F), !,
 	'$file_is_unchanged'(F, R, Age).
 
@@ -516,16 +516,16 @@ remove_from_path(New) :- '$check_path'(New,Path),
 	file_directory_name(F, Dir),
 	cd(Dir).
 
-'$record_loaded'(Stream, M) :-
+'$record_loaded'(Stream, M, Reconsult) :-
 	Stream \= user,
 	Stream \= user_input,
 	'$file_name'(Stream,F),
-	( recorded('$lf_loaded','$lf_loaded'(F,M,_),R), erase(R), fail ; true ),
+	( recorded('$lf_loaded','$lf_loaded'(F,M,_,_),R), erase(R), fail ; true ),
 
 	'$file_age'(F,Age),
-	recorda('$lf_loaded','$lf_loaded'(F,M,Age),_),
+	recorda('$lf_loaded','$lf_loaded'(F,M,Age,Reconsult),_),
 	fail.
-'$record_loaded'(_, _).
+'$record_loaded'(_, _, _).
 
 %
 % encoding stuff: what I believe SWI does.
@@ -927,7 +927,7 @@ absolute_file_name(File,Opts,TrueFileName) :-
 '$fetch_comp_status'(compact).
 
 make :-
-	recorded('$lf_loaded','$lf_loaded'(F1,M,_),_),
+	recorded('$lf_loaded','$lf_loaded'(F1,M,_,reconsult),_),
 	'$load_files'(F1, [if(changed)],make),
 	fail.
 make.
diff --git a/pl/modules.yap b/pl/modules.yap
index 9fd923143..18a2b9a36 100644
--- a/pl/modules.yap
+++ b/pl/modules.yap
@@ -608,7 +608,7 @@ abolish_module(_).
 	(recorded('$import','$import'(Mod,Module,G,G1,N0,K0),_), writeln('$import'(Mod,Module,G,G1,N0,K0)), fail; true),
 	'$convert_for_reexport'(Spec, Exports, Tab, MyExports, Goal),
 	'$add_to_imports'(Tab, Module, Mod),
-	recorded('$lf_loaded','$lf_loaded'(TopFile,TopModule,_),_),
+	recorded('$lf_loaded','$lf_loaded'(TopFile,TopModule,_,_),_),
 	recorded('$module', '$module'(CurrentFile, Module, ModExports), Ref),
 	erase(Ref),
 	lists:append(ModExports, MyExports, AllExports),