change the project name and add the subdirectory

Change-Id: Ib0aa389df52223bb15b05d395ba3bb2111f9e78f

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index 5197220..28cc708
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,44 +1,3 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-SET(fw_name "nltk_native_library")
-PROJECT(${fw_name} C)
 
-INCLUDE(FindPkgConfig)
-
-EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_VERSION)
-message("Building by ${CMAKE_SYSTEM_VERSION} machine")
-
-SET(
-    client_src  src/nltk_native_library.c
-    )
-
-#include
-set(INC_DIRS
-    inc
-    )
-message("INC_DIRS:${INC_DIRS}")
-INCLUDE_DIRECTORIES( ${INC_DIRS} )
-
-
-IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
-    SET(CMAKE_BUILD_TYPE "Debug")
-ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
-MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
-
-pkg_check_modules(pkgs REQUIRED
-        capi-base-common
-        python
-    )
-FOREACH(flag ${pkgs_CFLAGS})
-    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wl,--unresolved-symbols=ignore-in-shared-libs -Wl,-zdefs")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
-SET(CMAKE_C_FLAGS_RELEASE "-O2")
-
-ADD_LIBRARY(${fw_name} SHARED ${client_src})
-TARGET_LINK_LIBRARIES(${fw_name} ${pkgs_LDFLAGS} -lm)
-
-INSTALL(TARGETS ${fw_name} DESTINATION /usr/lib)
-INSTALL(FILES inc/nltk_native_library.h DESTINATION /usr/include)
\ No newline at end of file
+ADD_SUBDIRECTORY(client)

diff --git a/.cproject b/client/.cproject
similarity index 100%
rename from .cproject
rename to client/.cproject

diff --git a/.project b/client/.project
similarity index 100%
rename from .project
rename to client/.project

diff --git a/.tproject b/client/.tproject
similarity index 100%
rename from .tproject
rename to client/.tproject

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..e5ebddd
--- /dev/null
+++ b/client/CMakeLists.txt
@@ -0,0 +1,44 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+SET(fw_name "nlp")
+PROJECT(${fw_name} C)
+
+INCLUDE(FindPkgConfig)
+
+EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_VERSION)
+message("Building by ${CMAKE_SYSTEM_VERSION} machine")
+
+SET(
+    client_src  src/nltk_native_library.c
+    )
+
+#include
+set(INC_DIRS
+    inc
+    )
+message("INC_DIRS:${INC_DIRS}")
+INCLUDE_DIRECTORIES( ${INC_DIRS} )
+
+
+IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
+    SET(CMAKE_BUILD_TYPE "Debug")
+ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
+MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
+
+pkg_check_modules(pkgs REQUIRED
+        capi-base-common
+        python
+    )
+FOREACH(flag ${pkgs_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wl,--unresolved-symbols=ignore-in-shared-libs -Wl,-zdefs")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+SET(CMAKE_C_FLAGS_RELEASE "-O2")
+
+ADD_LIBRARY(${fw_name} SHARED ${client_src})
+TARGET_LINK_LIBRARIES(${fw_name} ${pkgs_LDFLAGS} -lm)
+
+INSTALL(TARGETS ${fw_name} DESTINATION /usr/lib)
+INSTALL(FILES inc/nltk_native_library.h DESTINATION /usr/include)
\ No newline at end of file

diff --git a/inc/nltk_native_library.h b/client/inc/nltk_native_library.h
similarity index 100%
rename from inc/nltk_native_library.h
rename to client/inc/nltk_native_library.h

diff --git a/project_def.prop b/client/project_def.prop
similarity index 100%
rename from project_def.prop
rename to client/project_def.prop

diff --git a/src/nltk_native_library.c b/client/src/nltk_native_library.c
similarity index 100%
rename from src/nltk_native_library.c
rename to client/src/nltk_native_library.c

diff --git a/packaging/nlp.spec b/packaging/nlp.spec
old mode 100644 (file)
new mode 100755 (executable)
index c357ed2..0f025ef
--- a/packaging/nlp.spec
+++ b/packaging/nlp.spec
@@ -1,4 +1,5 @@
-Name:       nltk_native_library
+Name:       nlp
+
 Summary:    NLTK
 Version:    0.1.0
 Release:    1
@@ -10,7 +11,7 @@ BuildRequires: pkgconfig(capi-base-common)
 BuildRequires: pkgconfig(python)
 
 %description
-nltk_native_library is the native library of the NLP program.
+nlp is the native library of the NLP program.
 
 %prep
 %setup -q