--- a/CMakeLists.txt Tue Nov 10 19:36:54 2009 +0200
+++ b/CMakeLists.txt Fri Jan 15 12:25:04 2010 +0200
@@ -21,8 +21,7 @@
add_library(yaubil MODULE yaubil.c)
## User settable options
-set(MCABBER_INCLUDE_DIR "${yaubil_SOURCE_DIR}/../include"
- CACHE FILEPATH "Path to mcabber headers")
+set(MCABBER_INCLUDE_DIR "/usr/include" CACHE FILEPATH "Path to mcabber headers")
## Packaging information
set(CPACK_PACKAGE_NAME libmcabber-yaubil)
@@ -48,18 +47,17 @@
find_package(PkgConfig REQUIRED)
pkg_check_modules(GLIB REQUIRED glib-2.0)
pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
-#pkg_check_modules(LM REQUIRED loudmouth-1.0)
## Compiler setup
include_directories(SYSTEM ${GLIB_INCLUDE_DIRS}
${GMODULE_INCLUDE_DIRS}
- ${LM_INCLUDE_DIRS})
+ ${LM_INCLUDE_DIRS}
+ ${MCABBER_INCLUDE_DIR})
target_link_libraries(yaubil ${GLIB_LIBRARIES}
${GMODULE_LIBRARIES}
${LM_LIBRARIES})
include_directories(${yaubil_SOURCE_DIR}
- ${yaubil_BINARY_DIR}
- ${MCABBER_INCLUDE_DIR})
+ ${yaubil_BINARY_DIR})
## Installation
install(TARGETS yaubil DESTINATION lib/mcabber)
--- a/yaubil.c Tue Nov 10 19:36:54 2009 +0200
+++ b/yaubil.c Fri Jan 15 12:25:04 2010 +0200
@@ -23,10 +23,10 @@
#include <gmodule.h>
#include <string.h>
-#include "commands.h"
-#include "compl.h"
-#include "logprint.h"
-#include "settings.h"
+#include <mcabber/commands.h>
+#include <mcabber/compl.h>
+#include <mcabber/logprint.h>
+#include <mcabber/settings.h>
static gboolean ifresult = TRUE;