Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Create two subdirectories.

One will contain the main jingle module
and the other the file transfert app.
  • Loading branch information...
commit db2bfb58a9e03a0b33cf0b8fb7a6c3c68fe00aad 1 parent e4c96f5
Nicolas Cornu authored
View
24 CMakeLists.txt
@@ -30,24 +30,15 @@ find_package(PkgConfig REQUIRED)
pkg_check_modules(GLIB REQUIRED glib-2.0)
pkg_check_modules(LM REQUIRED loudmouth-1.0)
pkg_check_modules(MCABBER REQUIRED mcabber)
-link_directories(${GLIB_LIBRARY_DIRS}
- ${LM_LIBRARY_DIRS}
- ${MCABBER_LIBRARY_DIRS})
-
-## Target definitions
-add_library(jingle MODULE jingle.c check.c register.c)
+link_directories(${GLIB_LIBRARY_DIRS} ${MCABBER_LIBRARY_DIRS})
## Compiler setup
configure_file(config.h.in config.h)
-include_directories(SYSTEM ${GLIB_INCLUDE_DIRS}
- ${LM_INCLUDE_DIRS}
- ${MCABBER_INCLUDE_DIRS})
-target_link_libraries(jingle ${GLIB_LIBRARIES}
- ${LM_LIBRARIES}
- ${MCABBER_LIBRARIES})
-include_directories(${autoaway_SOURCE_DIR}
- ${autoaway_BINARY_DIR})
-set_target_properties(jingle PROPERTIES COMPILE_FLAGS "-Wall")
+include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} ${MCABBER_INCLUDE_DIRS})
+
+## Target definitions
+add_subdirectory(jingle)
+add_subdirectory(jingle-filetransfert)
## Packaging information
set(CPACK_PACKAGE_NAME mcabber-jingle)
@@ -60,6 +51,3 @@ set(CPACK_GENERATOR DEB CACHE TEXT "Binary package generator, eg DEB, RPM, TGZ,
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
set(CPACK_SOURCE_IGNORE_FILES "/\\\\..*;\\\\.swp;~$;/build/;\\\\.tar\\\\.;\\\\.deb;\\\\.so")
include(CPack)
-
-## Installation
-install(TARGETS jingle DESTINATION lib/mcabber)
View
1  config.h.in
@@ -1 +1,2 @@
//#cmakedefine USE_LIBNAME
+#define PROJECT_VERSION "@PROJECT_VERSION@"
View
4 jingle-filetransfert/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(jingle-filetransfert MODULE filetransfert.c)
+set_target_properties(jingle-filetransfert PROPERTIES COMPILE_FLAGS "-Wall")
+include_directories(${CMAKE_SOURCE_DIR}/jingle)
+install(TARGETS jingle-filetransfert DESTINATION lib/mcabber)
View
55 jingle-filetransfert/filetransfert.c
@@ -0,0 +1,55 @@
+/*
+ * filetransfert.c
+ *
+ * Copyrigth (C) 2010 Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+#include <glib.h>
+
+#include <mcabber/modules.h>
+
+#include <jingle.h>
+
+
+static void jingleft_init(void);
+static void jingleft_uninit(void);
+
+
+const gchar *deps[] = { "jingle", NULL };
+
+module_info_t info_jingle_filetransfert = {
+ .branch = MCABBER_BRANCH,
+ .api = MCABBER_API_VERSION,
+ .version = MCABBER_VERSION,
+ .description = "Jingle File Transfert (XEP-0234)\n",
+ .requires = deps,
+ .init = jingleft_init,
+ .uninit = jingleft_uninit,
+ .next = NULL,
+};
+
+
+static void jingleft_init(void)
+{
+
+}
+
+static void jingleft_uninit(void)
+{
+
+}
View
5 jingle/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_library(jingle MODULE jingle.c check.c register.c)
+set_target_properties(jingle PROPERTIES COMPILE_FLAGS "-Wall")
+include_directories(${LM_INCLUDE_DIRS})
+target_link_libraries(jingle ${LM_LIBRARIES})
+install(TARGETS jingle DESTINATION lib/mcabber)
View
0  action-handlers.c → jingle/action-handlers.c
File renamed without changes
View
0  action-handlers.h → jingle/action-handlers.h
File renamed without changes
View
0  check.c → jingle/check.c
File renamed without changes
View
0  check.h → jingle/check.h
File renamed without changes
View
0  jingle.c → jingle/jingle.c
File renamed without changes
View
0  jingle.h → jingle/jingle.h
File renamed without changes
View
0  register.c → jingle/register.c
File renamed without changes
View
0  register.h → jingle/register.h
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.