Merge branch 'master' of github.com:vscosta/yap-6.3

library/lammpi/CMakeLists.txt

@@ -82,6 +82,7 @@ if (MPI_C_FOUND)
 
   install(TARGETS  yap_mpi
     LIBRARY DESTINATION ${dlls}
+    ARCHIVE DESTINATION ${dlls}
     )
 
 endif (MPI_C_FOUND)

library/lineutils.yap

@@ -8,7 +8,7 @@
  * 
 */
 
-:- module(line_utils,
+:- module(lineutils,
 	  [search_for/2,
 	   search_for/3,
 	   scan_natural/3,
@@ -244,7 +244,8 @@ split_unquoted(_, [], []) --> [].
 
 split_quoted( [0'"], More) --> %0'"
     "\"".
-split_quoted( [0'\\ ,C|New], More) --> %0'"
+split_quoted( [0'\\ ,C|New], More) --> 
+    %0'"
     "\\",
     [C],
     split_quoted(New, More).

library/matlab/CMakeLists.txt

@@ -17,7 +17,8 @@ if (MATLAB_FOUND)
   target_link_libraries(matlab libYap $(MATLAB_LIBRARIES) )
 
   install(TARGETS  matlab
-    LIBRARY DESTINATION ${dlls} )
+    LIBRARY DESTINATION ${dlls}
+    ARCHIVE DESTINATION ${dlls} )
 
 endif (MATLAB_FOUND)
 

library/matrix/CMakeLists.txt

@@ -6,5 +6,7 @@ target_link_libraries(matrix libYap)
 set_target_properties (matrix PROPERTIES PREFIX "")
 
 install(TARGETS  matrix
-  LIBRARY DESTINATION ${dlls} )
+  LIBRARY DESTINATION ${dlls}
+  ARCHIVE DESTINATION ${dlls}
+  )
 

library/random/CMakeLists.txt

@@ -6,5 +6,6 @@ target_link_libraries(yap_random libYap)
 set_target_properties (yap_random PROPERTIES PREFIX "")
 
 install(TARGETS  yap_random
-  LIBRARY DESTINATION ${dlls} )
+  LIBRARY DESTINATION ${dlls}
+  ARCHIVE DESTINATION ${dlls} )
 

library/regex/CMakeLists.txt

@@ -18,5 +18,6 @@ target_link_libraries(regexp libYap ${REGEX_SOURCES})
 set_target_properties (regexp PROPERTIES PREFIX "")
 
 install(TARGETS  regexp
-  LIBRARY DESTINATION ${dlls} )
+  LIBRARY DESTINATION ${dlls}
+  ARCHIVE DESTINATION ${dlls} )
 

library/rltree/CMakeLists.txt

@@ -11,5 +11,6 @@ target_link_libraries(yap_rl libYap)
 set_target_properties (yap_rl PROPERTIES PREFIX "")
 
 install(TARGETS  yap_rl
-  LIBRARY DESTINATION ${dlls} )
+  LIBRARY DESTINATION ${dlls}
+  ARCHIVE DESTINATION ${dlls} )
 

library/splay.yap

@@ -184,8 +184,6 @@ where  _LeftTree_ contains all items in  _Tree_ less than
 greater than  _Key_. This operations destroys  _Tree_.
 */
 
- */
-
  
 splay_access(V, Item, Val, Tree, NewTree):-
 	bst(access(V), Item, Val, Tree, NewTree).

library/system/CMakeLists.txt

@@ -28,7 +28,8 @@ target_link_libraries(sys libYap)
 set_target_properties (sys PROPERTIES  PREFIX "")
 
 install(TARGETS  sys
-  LIBRARY DESTINATION ${dlls} )
+  LIBRARY DESTINATION ${dlls}
+  ARCHIVE DESTINATION ${dlls} )
 
 configure_file ("sys_config.h.cmake" "sys_config.h" )
 

library/system/sys_config.h

@@ -0,0 +1,31 @@
+/* Define to 1 if you have the <openssl/ripemd.h> header file. */
+#ifndef HAVE_APACHE2_UTIL_MD5_H
+/* #undef HAVE_APACHE2_UTIL_MD5_H */
+#endif
+
+/* Define to 1 if you have the <openssl/ripemd.h> header file. */
+#ifndef HAVE_APR_1_APR_MD5_H
+#define HAVE_APR_1_APR_MD5_H 1
+#endif
+
+
+/* Define to 1 if you have the <openssl/md5.h> header file. */
+#ifndef HAVE_OPENSSL_MD5_H
+/* #undef HAVE_OPENSSL_MD5_H */
+#endif
+
+/* Define to 1 if you have the <openssl/ripemd.h> header file. */
+#ifndef HAVE_OPENSSL_RIPEMD_H
+/* #undef HAVE_OPENSSL_RIPEMD_H */
+#endif
+
+/* "Define if you have the crypt function." */
+#ifndef HAVE_CRYPT
+/* #undef HAVE_CRYPT */
+#endif
+
+/* Define to 1 if you have the <crypt.h> header file. */
+#ifndef HAVE_CRYPT_H
+/* #undef HAVE_CRYPT_H */
+#endif
+

library/tries/CMakeLists.txt

@@ -12,7 +12,8 @@ target_link_libraries(tries libYap)
 set_target_properties (tries PROPERTIES PREFIX "")
 
 install(TARGETS  tries
-  LIBRARY DESTINATION ${dlls} )
+  LIBRARY DESTINATION ${dlls} 
+  ARCHIVE DESTINATION ${dlls})
 
 
 set ( ITRIES_SOURCES
@@ -28,5 +29,6 @@ target_link_libraries(itries libYap)
 set_target_properties (itries PROPERTIES PREFIX "")
 
 install(TARGETS  itries
-  LIBRARY DESTINATION ${dlls} )
+  LIBRARY DESTINATION ${dlls}
+  ARCHIVE DESTINATION ${dlls} )