Permalink
Browse files

Add 'nyx_module_prefix' and 'nyx_module_suffix' variables to nyx.pc

Open-webOS-DCO-1.0-Signed-off-by: Sapna Todwal <sapna.todwal@palm.com>

Change-Id: I82269f42f825049bbcfff2b7c2bc5a4fc18b92c9
  • Loading branch information...
1 parent aed79f0 commit 5d620600717865756cb7c0d0a0c9d9e9fa40ea09 Sapna Todwal committed Oct 8, 2012
Showing with 14 additions and 5 deletions.
  1. +4 −2 CMakeLists.txt
  2. +8 −3 README.md
  3. +2 −0 files/pkgconfig/nyx.pc.in
View
@@ -33,15 +33,17 @@ webos_component(${NYX_API_VERSION_MAJOR} ${NYX_API_VERSION_MINOR} 0)
set(NYX_MODULE_DIR ${WEBOS_INSTALL_LIBDIR}/nyx/modules CACHE PATH "Nyx modules directory path")
set(NYX_MODULE_MOCK_DIR ${WEBOS_INSTALL_LIBDIR}/nyx/modules.mock CACHE PATH "Nyx mock modules directory path")
+set(NYX_MODULE_PREFIX nyx)
+set(NYX_MODULE_SUFFIX .module)
webos_add_linker_options(ALL --no-undefined --as-needed)
webos_add_compiler_flags(ALL -Wall -g -std=c99)
webos_add_compiler_flags(ALL -D_GNU_SOURCE=1)
webos_add_compiler_flags(DEBUG -O0 -DDEBUG -D_DEBUG)
webos_add_compiler_flags(RELEASE -DNDEBUG)
-add_definitions(-DNYX_MODULE_PREFIX=\"${CMAKE_SHARED_MODULE_PREFIX}\")
-add_definitions(-DNYX_MODULE_SUFFIX=\"${CMAKE_SHARED_MODULE_SUFFIX}\")
+add_definitions(-DNYX_MODULE_PREFIX=\"${NYX_MODULE_PREFIX}\")
+add_definitions(-DNYX_MODULE_SUFFIX=\"${NYX_MODULE_SUFFIX}\")
add_definitions(-DNYX_MODULE_DIR=\"${NYX_MODULE_DIR}\")
add_definitions(-DNYX_MODULE_MOCK_DIR=\"${NYX_MODULE_MOCK_DIR}\")
View
@@ -65,9 +65,14 @@ To see a list of the make targets that `cmake` has generated, enter:
$ make help
-You may also specify `NYX_MODULE_DIR` and `NYX_MODULE_MOCK_DIR` from
-command line to override the default settings. The default settings
-are extracted from variables `nyx_module_dir` and `nyx_module_mock_dir`
+You may also specify the values for `NYX_MODULE_DIR` and `NYX_MODULE_MOCK_DIR` from
+command line. For example:
+
+ $ cmake -D NYX_MODULE_DIR:PATH=$HOME/nyx/modules ..
+ $ make
+ $ sudo make install
+
+The default settings are extracted from the variables `nyx_module_dir`and `nyx_module_mock_dir`
in nyx.pc.
## Uninstalling
@@ -20,6 +20,8 @@ libdir=@WEBOS_INSTALL_LIBDIR@
includedir=@WEBOS_INSTALL_INCLUDEDIR@
nyx_module_dir=@NYX_MODULE_DIR@
nyx_module_mock_dir=@NYX_MODULE_MOCK_DIR@
+nyx_module_prefix=@NYX_MODULE_PREFIX@
+nyx_module_suffix=@NYX_MODULE_SUFFIX@
Name: Nyx
Description: @WEBOS_PROJECT_SUMMARY@

0 comments on commit 5d62060

Please sign in to comment.