diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index dc585af91..b0018c419 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -35,6 +35,7 @@ set (LIBRARY_PL
   range.yap
   rbtrees.yap
   regexp.yap
+  readutil.yap
   rltree.yap
   sockets.yap
   splay.yap
@@ -68,6 +69,9 @@ add_subdirectory(rltree)
 add_subdirectory(system)
 add_subdirectory(tries)
 
+add_custom_target (library SOURCES ${LIBRARY_PL} ) # WORKING_DIRECTORY ${CMAKE_BINARY_DIR} )
+
+
 install(FILES ${LIBRARY_PL}
   DESTINATION ${libpl}
   )
diff --git a/library/dialect/CMakeLists.txt b/library/dialect/CMakeLists.txt
index 8aaa50f49..ea3e55770 100644
--- a/library/dialect/CMakeLists.txt
+++ b/library/dialect/CMakeLists.txt
@@ -1,12 +1,20 @@
 set (DIALECTS_PL
-  bprolog.yap   
-  commons.yap   
-  hprolog.yap   
+  bprolog.yap
+  commons.yap
+  hprolog.yap
   swi.yap
   )
 
 add_subdirectory(swi)
 
+add_custom_target( dialects
+DEPENDS visited
+SOURCES ${DIALECTS_PL} )
+
+add_custom_command (OUTPUT visited
+COMMAND ${CMAKE_COMMAND} -E touch visited
+DEPENDS ${DIALECTS_PL}  ) # WORKING_DIRECTORY ${CMAKE_BINARY_DIR} )
+
 install(FILES ${DIALECTS_PL}
   DESTINATION ${libpl}/dialect
   )
diff --git a/library/dialect/swi.yap b/library/dialect/swi.yap
index 6f55682a3..4860f244f 100644
--- a/library/dialect/swi.yap
+++ b/library/dialect/swi.yap
@@ -169,13 +169,6 @@ goal_expansion(arg(A,B,C),genarg(A,B,C)).
 :- dynamic
    user:file_search_path/2.
 
-user:file_search_path(swi, Home) :-
-        current_prolog_flag(home, Home).
-user:file_search_path(foreign, swi(ArchLib)) :-
-        current_prolog_flag(arch, Arch),
-        atom_concat('lib/', Arch, ArchLib).
-user:file_search_path(foreign, swi(lib)).
-
 /** @pred concat_atom(? _List_,+ _Separator_,? _Atom_)
 
 
@@ -225,9 +218,6 @@ concat_atom(List, New) :-
 	atomic_concat(List, New).
 
 
-read_clause(X,Y) :-
-	read_term(X,Y,[singetons(warning)]).
-
 bindings_message(V) -->
        { cvt_bindings(V, Bindings) },
        prolog:message(query(_YesNo,Bindings)), !.