# HG changeset patch # User Myhailo Danylenko # Date 1263550070 -7200 # Node ID 9eb794ebef853864271042ef9f059766e4237391 # Parent 1c4eb7aed6c21fca3c925cf280f39eab998c1643 Change mcabber headers naming scheme diff -r 1c4eb7aed6c2 -r 9eb794ebef85 CMakeLists.txt --- a/CMakeLists.txt Sat Dec 05 22:32:55 2009 +0200 +++ b/CMakeLists.txt Fri Jan 15 12:07:50 2010 +0200 @@ -21,8 +21,7 @@ add_library(templatecmd MODULE templatecmd.c) ## User settable options -set(MCABBER_INCLUDE_DIR "${templatecmd_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-templatecmd) @@ -51,12 +50,12 @@ ## Compiler setup include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} - ${GMODULE_INCLUDE_DIRS}) + ${GMODULE_INCLUDE_DIRS} + ${MCABBER_INCLUDE_DIR}) target_link_libraries(templatecmd ${GLIB_LIBRARIES} ${GMODULE_LIBRARIES}) include_directories(${templatecmd_SOURCE_DIR} - ${templatecmd_BINARY_DIR} - ${MCABBER_INCLUDE_DIR}) + ${templatecmd_BINARY_DIR}) ## Installation install(TARGETS templatecmd DESTINATION lib/mcabber) diff -r 1c4eb7aed6c2 -r 9eb794ebef85 README --- a/README Sat Dec 05 22:32:55 2009 +0200 +++ b/README Fri Jan 15 12:07:50 2010 +0200 @@ -21,7 +21,7 @@ Debian users can instead of make install do $ fakeroot make package -# dpkg -i ...-*.deb +# dpkg -i libmcbaber-templatecmd*.deb Users of other distributions can select appropriate package generator, using cache editor. diff -r 1c4eb7aed6c2 -r 9eb794ebef85 templatecmd.c --- a/templatecmd.c Sat Dec 05 22:32:55 2009 +0200 +++ b/templatecmd.c Fri Jan 15 12:07:50 2010 +0200 @@ -21,10 +21,10 @@ #include #include -#include "compl.h" -#include "commands.h" -#include "utils.h" -#include "logprint.h" +#include +#include +#include +#include typedef struct { gchar *name;