Many submodules building (no gui yet), with link-time errors

15 files changed, 313 insertions, 5 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..2adf512
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,77 @@
+project(libtwinkle)
+
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
+
+add_subdirectory(audio)
+add_subdirectory(audio/gsm/src)
+add_subdirectory(audits)
+add_subdirectory(im)
+add_subdirectory(mwi)
+add_subdirectory(parser)
+add_subdirectory(patterns)
+add_subdirectory(presence)
+add_subdirectory(sdp)
+add_subdirectory(sockets)
+add_subdirectory(stun)
+add_subdirectory(threads)
+add_subdirectory(utils)
+
+set(LIBTWINKLE_SRCS
+	main.cpp
+	abstract_dialog.cpp
+	address_book.cpp
+	auth.cpp
+	call_history.cpp
+	call_script.cpp
+	client_request.cpp
+	cmd_socket.cpp
+	dialog.cpp
+	diamondcard.cpp
+	epa.cpp
+	events.cpp
+	id_object.cpp
+	line.cpp
+	listener.cpp
+	log.cpp
+	phone.cpp
+	phone_user.cpp
+	prohibit_thread.cpp
+	redirect.cpp
+	sender.cpp
+	service.cpp
+	session.cpp
+	sub_refer.cpp
+	subscription.cpp
+	subscription_dialog.cpp
+	sys_settings.cpp
+	timekeeper.cpp
+	transaction.cpp
+	transaction_layer.cpp
+	transaction_mgr.cpp
+	user.cpp
+	userintf.cpp
+	util.cpp
+	
+	$<TARGET_OBJECTS:libtwinkle-audio>
+	$<TARGET_OBJECTS:libtwinkle-gsm>
+	$<TARGET_OBJECTS:libtwinkle-audits>
+	$<TARGET_OBJECTS:libtwinkle-im>
+	$<TARGET_OBJECTS:libtwinkle-mwi>
+	$<TARGET_OBJECTS:libtwinkle-parser>
+	$<TARGET_OBJECTS:libtwinkle-patterns>
+	$<TARGET_OBJECTS:libtwinkle-presence>
+	$<TARGET_OBJECTS:libtwinkle-sdp>
+	$<TARGET_OBJECTS:libtwinkle-sockets>
+	$<TARGET_OBJECTS:libtwinkle-stun>
+	$<TARGET_OBJECTS:libtwinkle-threads>
+	$<TARGET_OBJECTS:libtwinkle-utils>
+)
+
+add_executable(twinkle
+	${LIBTWINKLE_SRCS})
+
+target_link_libraries(twinkle -lpthread ${LibMagic_LIBRARY} ${LIBXML2_LIBRARIES}
+	${Readline_LIBRARY} ${ILBC_LIBRARIES} ${SPEEX_LIBRARIES} ${ZRTPCPP_LIBRARIES}
+	${CCRTP_LIBRARIES} ${COMMONCPP_LIBRARIES} ${UCOMMON_LIBRARIES} ${LIBSNDFILE_LIBRARY})
+
+
diff --git a/src/audio/CMakeLists.txt b/src/audio/CMakeLists.txt
new file mode 100644
index 0000000..56fcc4f
--- /dev/null
+++ b/src/audio/CMakeLists.txt
@@ -0,0 +1,26 @@
+project(libtwinkle-audio)
+
+set(LIBTWINKLE_AUDIO-SRCS
+	audio_device.cpp
+	audio_decoder.cpp
+	audio_encoder.cpp
+	audio_codecs.cpp
+	audio_rx.cpp
+	audio_session.cpp
+	audio_tx.cpp
+	dtmf_player.cpp
+	freq_gen.cpp
+	g711.cpp
+	g721.cpp
+	g723_16.cpp
+	g723_24.cpp
+	g723_40.cpp
+	g72x.cpp
+	media_buffer.cpp
+	rtp_telephone_event.cpp
+	tone_gen.cpp
+	twinkle_rtp_session.cpp
+	twinkle_zrtp_ui.cpp
+)
+
+add_library(libtwinkle-audio OBJECT ${LIBTWINKLE_AUDIO-SRCS})
diff --git a/src/audio/gsm/src/CMakeLists.txt b/src/audio/gsm/src/CMakeLists.txt
new file mode 100644
index 0000000..15789fd
--- /dev/null
+++ b/src/audio/gsm/src/CMakeLists.txt
@@ -0,0 +1,26 @@
+project(libtwinkle-gsm)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../inc)
+
+set(LIBTWINKLE_GSM-SRCS
+	add.cpp
+	code.cpp
+	debug.cpp
+	decode.cpp
+	gsm_create.cpp
+	gsm_decode.cpp
+	gsm_destroy.cpp
+	gsm_encode.cpp
+	gsm_explode.cpp
+	gsm_implode.cpp
+	gsm_option.cpp
+	gsm_print.cpp
+	long_term.cpp
+	lpc.cpp
+	preprocess.cpp
+	rpe.cpp
+	short_term.cpp
+	table.cpp
+)
+
+add_library(libtwinkle-gsm OBJECT ${LIBTWINKLE_GSM-SRCS})
diff --git a/src/audits/CMakeLists.txt b/src/audits/CMakeLists.txt
new file mode 100644
index 0000000..a1ef0e5
--- /dev/null
+++ b/src/audits/CMakeLists.txt
@@ -0,0 +1,7 @@
+project(libtwinkle-audits)
+
+set(LIBTWINKLE_AUDITS-SRCS
+	memman.cpp
+)
+
+add_library(libtwinkle-audits OBJECT ${LIBTWINKLE_AUDITS-SRCS})
diff --git a/src/im/CMakeLists.txt b/src/im/CMakeLists.txt
new file mode 100644
index 0000000..ce4246c
--- /dev/null
+++ b/src/im/CMakeLists.txt
@@ -0,0 +1,8 @@
+project(libtwinkle-im)
+
+set(LIBTWINKLE_IM-SRCS
+	im_iscomposing_body.cpp
+	msg_session.cpp
+)
+
+add_library(libtwinkle-im OBJECT ${LIBTWINKLE_IM-SRCS})
diff --git a/src/mwi/CMakeLists.txt b/src/mwi/CMakeLists.txt
new file mode 100644
index 0000000..b43c448
--- /dev/null
+++ b/src/mwi/CMakeLists.txt
@@ -0,0 +1,10 @@
+project(libtwinkle-mwi)
+
+set(LIBTWINKLE_MWI-SRCS
+	mwi.cpp
+	mwi_dialog.cpp
+	mwi_subscription.cpp
+	simple_msg_sum_body.cpp
+)
+
+add_library(libtwinkle-mwi OBJECT ${LIBTWINKLE_MWI-SRCS})
diff --git a/src/parser/CMakeLists.txt b/src/parser/CMakeLists.txt
new file mode 100644
index 0000000..7392df9
--- /dev/null
+++ b/src/parser/CMakeLists.txt
@@ -0,0 +1,84 @@
+project(libtwinkle-parser)
+
+set(LIBTWINKLE_PARSER-SRCS
+	challenge.cpp
+        coding.cpp
+        credentials.cpp
+        definitions.cpp
+        hdr_accept.cpp
+        hdr_accept_encoding.cpp
+        hdr_accept_language.cpp
+        hdr_alert_info.cpp
+        hdr_allow.cpp
+	hdr_allow_events.cpp
+        hdr_auth_info.cpp
+        hdr_authorization.cpp
+        hdr_call_id.cpp
+        hdr_call_info.cpp
+        hdr_contact.cpp
+        hdr_content_disp.cpp
+        hdr_content_encoding.cpp
+        hdr_content_language.cpp
+        hdr_content_length.cpp
+        hdr_content_type.cpp
+        hdr_cseq.cpp
+        hdr_date.cpp
+        hdr_error_info.cpp
+	hdr_event.cpp
+        hdr_expires.cpp
+        hdr_from.cpp
+        hdr_in_reply_to.cpp
+        hdr_max_forwards.cpp
+        hdr_min_expires.cpp
+        hdr_mime_version.cpp
+        hdr_organization.cpp
+        hdr_priority.cpp
+        hdr_privacy.cpp
+        hdr_p_asserted_identity.cpp
+        hdr_p_preferred_identity.cpp
+        hdr_proxy_authenticate.cpp
+        hdr_proxy_authorization.cpp
+        hdr_proxy_require.cpp
+        hdr_rack.cpp
+        hdr_record_route.cpp
+        hdr_refer_sub.cpp
+	hdr_refer_to.cpp
+	hdr_referred_by.cpp
+	hdr_replaces.cpp
+        hdr_reply_to.cpp
+        hdr_require.cpp
+        hdr_request_disposition.cpp
+        hdr_retry_after.cpp
+        hdr_route.cpp
+        hdr_rseq.cpp
+        hdr_server.cpp
+        hdr_service_route.cpp
+        hdr_sip_etag.cpp
+        hdr_sip_if_match.cpp
+        hdr_subject.cpp
+	hdr_subscription_state.cpp
+        hdr_supported.cpp
+        hdr_timestamp.cpp
+        hdr_to.cpp
+        hdr_unsupported.cpp
+        hdr_user_agent.cpp
+        hdr_via.cpp
+        hdr_warning.cpp
+        hdr_www_authenticate.cpp
+        header.cpp
+        identity.cpp
+        media_type.cpp
+        milenage.cpp
+        parameter.cpp
+        parse_ctrl.cpp
+	parser.cxx
+        request.cpp
+        response.cpp
+        rijndael.cpp
+        route.cpp
+	scanner.cxx
+        sip_body.cpp
+        sip_message.cpp
+)
+
+add_library(libtwinkle-parser OBJECT ${LIBTWINKLE_PARSER-SRCS})
diff --git a/src/patterns/CMakeLists.txt b/src/patterns/CMakeLists.txt
new file mode 100644
index 0000000..df6bde7
--- /dev/null
+++ b/src/patterns/CMakeLists.txt
@@ -0,0 +1,7 @@
+project(libtwinkle-patterns)
+
+set(LIBTWINKLE_PATTERNS-SRCS
+	observer.cpp
+)
+
+add_library(libtwinkle-patterns OBJECT ${LIBTWINKLE_PATTERNS-SRCS})
diff --git a/src/presence/CMakeLists.txt b/src/presence/CMakeLists.txt
new file mode 100644
index 0000000..69068ee
--- /dev/null
+++ b/src/presence/CMakeLists.txt
@@ -0,0 +1,12 @@
+project(libtwinkle-presence)
+
+set(LIBTWINKLE_PRESENCE-SRCS
+	buddy.cpp
+	pidf_body.cpp
+	presence_dialog.cpp
+	presence_epa.cpp
+	presence_state.cpp
+	presence_subscription.cpp
+)
+
+add_library(libtwinkle-presence OBJECT ${LIBTWINKLE_PRESENCE-SRCS})
diff --git a/src/sdp/CMakeLists.txt b/src/sdp/CMakeLists.txt
new file mode 100644
index 0000000..15cb9d2
--- /dev/null
+++ b/src/sdp/CMakeLists.txt
@@ -0,0 +1,13 @@
+project(libtwinkle-sdp)
+
+#BISON_TARGET(MyParser migcom.tproj/parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.c)
+#FLEX_TARGET(MyScanner migcom.tproj/lexxer.l ${CMAKE_CURRENT_BINARY_DIR}/lexer.c)
+#ADD_FLEX_BISON_DEPENDENCY(MyScanner MyParser)
+
+set(LIBTWINKLE_SDP-SRCS
+	sdp.cpp
+        sdp_parse_ctrl.cpp
+        sdp_scanner.cxx
+)
+
+add_library(libtwinkle-sdp OBJECT ${LIBTWINKLE_SDP-SRCS})
diff --git a/src/sockets/CMakeLists.txt b/src/sockets/CMakeLists.txt
new file mode 100644
index 0000000..a940b40
--- /dev/null
+++ b/src/sockets/CMakeLists.txt
@@ -0,0 +1,12 @@
+project(libtwinkle-sockets)
+
+set(LIBTWINKLE_SOCKETS-SRCS
+	connection.cpp
+	connection_table.cpp
+	dnssrv.cpp
+        interfaces.cpp
+        socket.cpp
+        url.cpp
+)
+
+add_library(libtwinkle-sockets OBJECT ${LIBTWINKLE_SOCKETS-SRCS})
diff --git a/src/sockets/socket.cpp b/src/sockets/socket.cpp
index 87bdc27..a56d273 100644
--- a/src/sockets/socket.cpp
+++ b/src/sockets/socket.cpp
@@ -24,15 +24,15 @@
 #include "socket.h"
 #include "audits/memman.h"
 
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#if HAVE_LINUX_TYPES_H
+#ifdef HAVE_LINUX_TYPES_H
 #include <linux/types.h>
 #endif
 
-#if HAVE_LINUX_ERRQUEUE_H
+#ifdef HAVE_LINUX_ERRQUEUE_H
 #include <linux/errqueue.h>
 #endif
 
@@ -185,7 +185,7 @@ bool t_socket_udp::select_read(unsigned long timeout) {
 }
 
 bool t_socket_udp::enable_icmp(void) {
-#if HAVE_LINUX_ERRQUEUE_H
+#ifdef HAVE_LINUX_ERRQUEUE_H
 	int enable = 1;
 	int ret = setsockopt(SOL_IP, IP_RECVERR, &enable, sizeof(int));
 	if (ret < 0) return false;
@@ -196,7 +196,7 @@ bool t_socket_udp::enable_icmp(void) {
 }
 
 bool t_socket_udp::get_icmp(t_icmp_msg &icmp) {
-#if HAVE_LINUX_ERRQUEUE_H
+#ifdef HAVE_LINUX_ERRQUEUE_H
 	int ret;
 	char buf[256];
 	
diff --git a/src/stun/CMakeLists.txt b/src/stun/CMakeLists.txt
new file mode 100644
index 0000000..dabf6ba
--- /dev/null
+++ b/src/stun/CMakeLists.txt
@@ -0,0 +1,9 @@
+project(libtwinkle-stun)
+
+set(LIBTWINKLE_STUN-SRCS
+	stun.cxx
+	stun_transaction.cpp
+	udp.cxx
+)
+
+add_library(libtwinkle-stun OBJECT ${LIBTWINKLE_STUN-SRCS})
diff --git a/src/threads/CMakeLists.txt b/src/threads/CMakeLists.txt
new file mode 100644
index 0000000..2fc7de9
--- /dev/null
+++ b/src/threads/CMakeLists.txt
@@ -0,0 +1,9 @@
+project(libtwinkle-threads)
+
+set(LIBTWINKLE_THREADS-SRCS
+	thread.cpp
+	mutex.cpp
+	sema.cpp
+)
+
+add_library(libtwinkle-threads OBJECT ${LIBTWINKLE_THREADS-SRCS})
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
new file mode 100644
index 0000000..8e347b7
--- /dev/null
+++ b/src/utils/CMakeLists.txt
@@ -0,0 +1,8 @@
+project(libtwinkle-utils)
+
+set(LIBTWINKLE_UTILS-SRCS
+	file_utils.cpp
+	mime_database.cpp
+)
+
+add_library(libtwinkle-utils OBJECT ${LIBTWINKLE_UTILS-SRCS})