summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRadek Novacek <rnovacek@redhat.com>2013-07-03 14:39:58 +0200
committerRadek Novacek <rnovacek@redhat.com>2013-07-03 14:39:58 +0200
commit4ca5c8c282c036bd9b1f24e977814f075820a011 (patch)
treed60f2916e9a34052237b19820181f31b16fbe339 /src
parent0f424bf9162bf0a3b3cf47f321c0aec5a3cfe7bc (diff)
downloadopenlmi-providers-4ca5c8c282c036bd9b1f24e977814f075820a011.tar.gz
openlmi-providers-4ca5c8c282c036bd9b1f24e977814f075820a011.tar.xz
openlmi-providers-4ca5c8c282c036bd9b1f24e977814f075820a011.zip
account: don't require indication manager
Indication manager is part of this project, search for its installation will just create a chicken-egg problem.
Diffstat (limited to 'src')
-rw-r--r--src/account/CMakeLists.txt5
-rw-r--r--src/account/LMI_AccountInstanceCreationIndicationProvider.c2
-rw-r--r--src/account/LMI_AccountInstanceDeletionIndicationProvider.c2
3 files changed, 4 insertions, 5 deletions
diff --git a/src/account/CMakeLists.txt b/src/account/CMakeLists.txt
index a8f8553..7bdce53 100644
--- a/src/account/CMakeLists.txt
+++ b/src/account/CMakeLists.txt
@@ -32,11 +32,10 @@ add_library(${LIBRARY_NAME} SHARED
# Require GLib-2.0 and libuser
pkg_check_modules(GLIB REQUIRED glib-2.0)
pkg_check_modules(LIBUSER REQUIRED libuser)
-pkg_check_modules(IM REQUIRED openlmiindmanager)
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR} ${GLIB_INCLUDE_DIRS} ${LIBUSER_INCLUDE_DIRS} ${IM_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR} ${GLIB_INCLUDE_DIRS} ${LIBUSER_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src/indmanager)
-target_link_libraries(${LIBRARY_NAME} openlmicommon ${KONKRETCMPI_LIBRARIES} ${GLIB_LIBRARIES} ${LIBUSER_LIBRARIES} ${IM_LIBRARIES})
+target_link_libraries(${LIBRARY_NAME} openlmicommon ${KONKRETCMPI_LIBRARIES} ${GLIB_LIBRARIES} ${LIBUSER_LIBRARIES} openlmiindmanager)
# Create registration file
cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers)
diff --git a/src/account/LMI_AccountInstanceCreationIndicationProvider.c b/src/account/LMI_AccountInstanceCreationIndicationProvider.c
index bbf69a6..a3e149a 100644
--- a/src/account/LMI_AccountInstanceCreationIndicationProvider.c
+++ b/src/account/LMI_AccountInstanceCreationIndicationProvider.c
@@ -21,7 +21,7 @@
#include <konkret/konkret.h>
#include "LMI_AccountInstanceCreationIndication.h"
-#include <ind_manager.h>
+#include "ind_manager.h"
#include "indication_common.h"
#include "macros.h"
diff --git a/src/account/LMI_AccountInstanceDeletionIndicationProvider.c b/src/account/LMI_AccountInstanceDeletionIndicationProvider.c
index 029fc65..0e17cc1 100644
--- a/src/account/LMI_AccountInstanceDeletionIndicationProvider.c
+++ b/src/account/LMI_AccountInstanceDeletionIndicationProvider.c
@@ -24,7 +24,7 @@
#include <sys/inotify.h>
#include <unistd.h>
-#include <ind_manager.h>
+#include "ind_manager.h"
#include "indication_common.h"
#include "macros.h"