Move the lg-dict directory

beew · Dec 22, 2014 · 14ef8a8 · 14ef8a8
1 parent 248649f
commit 14ef8a8
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 33 deletions.
diff --git a/opencog/nlp/CMakeLists.txt b/opencog/nlp/CMakeLists.txt
@@ -11,10 +11,9 @@ ADD_SUBDIRECTORY (types)
 ADD_SUBDIRECTORY (wsd)
 
 IF (HAVE_VITERBI)
+	ADD_SUBDIRECTORY (lg-dict)
+
 	# Currently does not build, due to changes in SchemeEval API.
 	# ADD_SUBDIRECTORY (viterbi)
 ENDIF (HAVE_VITERBI)
 
-IF (HAVE_LINK_GRAMMAR)
-    ADD_SUBDIRECTORY (sureal)
-ENDIF (HAVE_LINK_GRAMMAR)
diff --git a/opencog/nlp/lg-dict/CMakeLists.txt b/opencog/nlp/lg-dict/CMakeLists.txt
@@ -0,0 +1,27 @@
+
+INCLUDE_DIRECTORIES (
+	${LINK_GRAMMAR_INCLUDE_DIRS}	# for LinkGrammar dictionary
+	${CMAKE_BINARY_DIR}           # for the NLP atom types
+)
+
+ADD_LIBRARY (lg-dict SHARED
+	LGDictReader
+)
+
+ADD_DEPENDENCIES (lg-dict
+	nlp_atom_types
+)
+
+TARGET_LINK_LIBRARIES (lg-dict smob ${LINK_GRAMMAR_LIBRARY})
+
+ADD_LIBRARY (LGDictModule SHARED
+	LGDictModule
+)
+
+TARGET_LINK_LIBRARIES (LGDictModule lg-dict server)
+
+IF (WIN32)
+   INSTALL (TARGETS lg-dict DESTINATION "lib${LIB_DIR_SUFFIX}/opencog")
+ELSEIF (CYGWIN)
+   INSTALL (TARGETS lg-dict DESTINATION "lib${LIB_DIR_SUFFIX}/opencog")
+ENDIF ()
diff --git a/opencog/nlp/sureal/LGDictModule.cc → opencog/nlp/lg-dict/LGDictModule.cc b/opencog/nlp/sureal/LGDictModule.cc → opencog/nlp/lg-dict/LGDictModule.cc
diff --git a/opencog/nlp/sureal/LGDictModule.h → opencog/nlp/lg-dict/LGDictModule.h b/opencog/nlp/sureal/LGDictModule.h → opencog/nlp/lg-dict/LGDictModule.h
diff --git a/opencog/nlp/sureal/LGDictReader.cc → opencog/nlp/lg-dict/LGDictReader.cc b/opencog/nlp/sureal/LGDictReader.cc → opencog/nlp/lg-dict/LGDictReader.cc
diff --git a/opencog/nlp/sureal/LGDictReader.h → opencog/nlp/lg-dict/LGDictReader.h b/opencog/nlp/sureal/LGDictReader.h → opencog/nlp/lg-dict/LGDictReader.h
diff --git a/opencog/nlp/sureal/CMakeLists.txt b/opencog/nlp/sureal/CMakeLists.txt
diff --git a/opencog/nlp/sureal/README.md b/opencog/nlp/sureal/README.md
@@ -1,3 +1,5 @@
 # Surface Realization
 
-Functions for surface realization of output from micro-planner's output. The main function is sureal which takes in a SetLink and returns a sentence. Presently in alpha stage of development.
+Functions for surface realization of output from micro-planner's output.
+The main function is sureal which takes in a SetLink and returns a
+sentence. Presently in alpha stage of development.