Conversion to explicit paths for guile extensions

opencog · Jul 3, 2019 · 608cd92 · 608cd92
1 parent bf15e46
commit 608cd92
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/atom-types/CMakeLists.txt b/atom-types/CMakeLists.txt
@@ -20,6  20,8 @@ INSTALL (TARGETS spacetime-types
 	LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog"
 )
 
 ADD_GUILE_EXTENSION(SCM_CONFIG spacetime-types "opencog-ext-path-spacetime-types")
 
 ADD_GUILE_MODULE (FILES
 	spacetime.scm
 	${CMAKE_CURRENT_BINARY_DIR}/spacetime_types.scm

diff --git a/atom-types/spacetime.scm b/atom-types/spacetime.scm
@@ -4,8  4,9 @@
 (define-module (opencog spacetime))
 
 (use-modules (opencog))
 (use-modules (opencog oc-config))
 
 ; Load the C library that calls the nameserver to load the types.
-(load-extension "libspacetime-types" "spacetime_types_init")
 (load-extension (string-append opencog-ext-path-spacetime-types "libspacetime-types") "spacetime_types_init")
 
 (load "spacetime/spacetime_types.scm")
diff --git a/octomap/CMakeLists.txt b/octomap/CMakeLists.txt
@@ -28,6  28,8 @@ INSTALL (FILES
 	DESTINATION "${GUILE_SITE_DIR}/opencog"
 )
 
 ADD_GUILE_EXTENSION(SCM_CONFIG octomap-types "opencog-ext-path-octomap-types")
 
 ADD_GUILE_MODULE (FILES
 	${CMAKE_CURRENT_BINARY_DIR}/octomap_types.scm
 	MODULE_DESTINATION "${GUILE_SITE_DIR}/opencog/spacetime/octomap"

diff --git a/octomap/octomap.scm b/octomap/octomap.scm
@@ -1,7  1,8 @@
 (define-module (opencog octomap))
 
 (use-modules (srfi srfi-1) (opencog) (opencog exec))
 (use-modules (opencog oc-config))
 
 ; Load the C library that calls the nameserver to load the types.
-(load-extension "liboctomap-types" "octomap_types_init")
 (load-extension (string-append opencog-ext-path-point-memory "liboctomap-types") "octomap_types_init")
 (load "spacetime/octomap/octomap_types.scm")
diff --git a/pointmemory/CMakeLists.txt b/pointmemory/CMakeLists.txt
@@ -14,6  14,8 @@ INSTALL (TARGETS point_memory
 	DESTINATION "lib${LIB_DIR_SUFFIX}/opencog"
 )
 
 ADD_GUILE_EXTENSION(SCM_CONFIG point_memory "opencog-ext-path-point-memory")
 
 ADD_GUILE_MODULE (FILES
 	pointmem.scm
 	MODULE_DESTINATION "${GUILE_SITE_DIR}/opencog/pointmem"

diff --git a/pointmemory/pointmem.scm b/pointmemory/pointmem.scm
@@ -1,5  1,5 @@
 (define-module (opencog pointmem))
 
-(use-modules (opencog))
 (use-modules (opencog oc-config))
 
-(load-extension "libpoint_memory" "opencog_ato_pointmem_init")
 (load-extension (string-append opencog-ext-path-point-memory "libpoint_memory") "opencog_ato_pointmem_init")