From 32c5d537b7a6d999782a31027d1c6753c9264a7b Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Bisinger?= Date: Tue, 13 Mar 2007 19:10:06 +0000 Subject: [PATCH] Made link flags variable depending on selected protocols, eliminated some warnings --- firetalk/firetalk-int.h | 6 +++--- libicq2000/src/DirectClient.cpp | 2 +- src/Makefile.am | 25 +++++++++++++++++++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/firetalk/firetalk-int.h b/firetalk/firetalk-int.h index 4904110..484436f 100644 --- a/firetalk/firetalk-int.h +++ b/firetalk/firetalk-int.h @@ -190,8 +190,8 @@ struct s_firetalk_protocol_functions { enum firetalk_error (*chat_requestextended)(client_t, const char * const); enum firetalk_error (*subcode_send_request)(client_t, const char * const, const char * const, const char * const); enum firetalk_error (*subcode_send_reply)(client_t, const char * const, const char * const, const char * const); - const char * const (*room_normalize)(const char * const); - client_t (*create_handle)(); + const char * (*room_normalize)(const char * const); + client_t (*create_handle)( void ); void (*destroy_handle)(client_t); void (*signon_init)(client_t); }; @@ -277,6 +277,6 @@ void firetalk_internal_set_connectstate(client_t c, enum firetalk_connectstate f enum firetalk_error firetalk_check_handle(struct s_firetalk_handle *c); #endif enum firetalk_error firetalk_set_timeout(unsigned int seconds); -enum firetalk_error firetalk_clear_timeout(); +enum firetalk_error firetalk_clear_timeout( void ); #endif diff --git a/libicq2000/src/DirectClient.cpp b/libicq2000/src/DirectClient.cpp index 5116933..1550d68 100644 --- a/libicq2000/src/DirectClient.cpp +++ b/libicq2000/src/DirectClient.cpp @@ -155,7 +155,7 @@ namespace ICQ2000 { void DirectClient::Parse() { if (m_recv.empty()) return; - unsigned short length; + unsigned int length; while (!m_recv.empty()) { m_recv.setPos(0); diff --git a/src/Makefile.am b/src/Makefile.am index 6df7f12..6a833d1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,29 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/hooks -I$(top_srcdir)/connwrap -I$(top_srcdir)/firetalk -I$(top_srcdir)/firetalk/../connwrap -I$(top_srcdir)/firetalk/../connwrap-0.1 -I$(top_srcdir)/kkconsui -I$(top_srcdir)/kkconsui/include -I$(top_srcdir)/kkconsui/../kkstrtext -I$(top_srcdir)/kkconsui/../kkstrtext-0.1 -I$(top_srcdir)/kkstrtext -I$(top_srcdir)/kksystr -I$(top_srcdir)/kksystr/include -I$(top_srcdir)/kksystr/../kkstrtext -I$(top_srcdir)/kksystr/../kkstrtext-0.1 -I$(top_srcdir)/libgadu -I$(top_srcdir)/libicq2000 -I$(top_srcdir)/libicq2000/libicq2000 -I$(top_srcdir)/libjabber -I$(top_srcdir)/libjabber/../connwrap -I$(top_srcdir)/libjabber/../connwrap-0.1 -I$(top_srcdir)/libmsn -I$(top_srcdir)/libmsn/../connwrap -I$(top_srcdir)/libmsn/../connwrap-0.1 -I$(top_srcdir)/libyahoo2 -I$(top_srcdir)/libyahoo2/../connwrap -I$(top_srcdir)/libyahoo2/../connwrap-0.1 -I$(top_srcdir)/intl bin_PROGRAMS = centerim centerim_SOURCES = centericq.cc icqcontact.cc icqgroups.cc eventmanager.cc icqdialogs.cc icqhist.cc imexternal.cc imcontact.cc imlogger.cc accountmanager.cc icqcontacts.cc icqmlist.cc imcontroller.cc icqconf.cc imevents.cc impgp.cc icqface.cc centermain.cc icqgroup.cc -centerim_LDFLAGS = -L$(top_srcdir)/connwrap -L$(top_srcdir)/firetalk -L$(top_srcdir)/kkconsui -L$(top_srcdir)/kkstrtext -L$(top_srcdir)/kksystr -L$(top_srcdir)/libgadu -L$(top_srcdir)/libicq2000 -L$(top_srcdir)/libjabber -L$(top_srcdir)/libmsn -L$(top_srcdir)/libyahoo2 -centerim_LDADD = $(top_srcdir)/src/hooks/libhooks.a -lconnwrap -lfiretalk -lkkconsui -lkkstrtext -lkksystr -llibgadu -llibicq2000 -llibjabber -llibmsn -llibyahoo2 @LTLIBINTL@ +centerim_LDFLAGS = -L$(top_srcdir)/connwrap -L$(top_srcdir)/kkconsui -L$(top_srcdir)/kkstrtext -L$(top_srcdir)/kksystr -L$(top_srcdir)/libicq2000 +centerim_LDADD = $(top_srcdir)/src/hooks/libhooks.a -lconnwrap -lkkconsui -lkkstrtext -lkksystr -llibicq2000 +if BUILD_FIRETALK +centerim_LDFLAGS += -L$(top_srcdir)/firetalk +centerim_LDADD += -lfiretalk +endif +if BUILD_GADU +centerim_LDFLAGS += -L$(top_srcdir)/libgadu +centerim_LDADD += -llibgadu +endif +if BUILD_JABBER +centerim_LDFLAGS += -L$(top_srcdir)/libjabber +centerim_LDADD += -llibjabber +endif +if BUILD_MSN +centerim_LDFLAGS += -L$(top_srcdir)/libmsn +centerim_LDADD += -llibmsn +endif +if BUILD_YAHOO +centerim_LDFLAGS += -L$(top_srcdir)/libyahoo2 +centerim_LDADD += -llibyahoo2 +endif +centerim_LDADD += @LTLIBINTL@ SUBDIRS = hooks EXTRA_DIST = centericq.cc icqcontact.cc icqgroups.cc eventmanager.cc icqdialogs.cc icqhist.cc imexternal.cc imcontact.cc imlogger.cc accountmanager.cc icqcontacts.cc icqmlist.cc imcontroller.cc icqconf.cc imevents.cc impgp.cc icqface.cc centermain.cc icqgroup.cc icqmlist.h imcontroller.h icqcommon.h icqcontacts.h centericq.h icqgroup.h imcontact.h accountmanager.h eventmanager.h imevents.h icqcontact.h imlogger.h icqconf.h impgp.h icqface.h icqgroups.h icqhist.h imexternal.h AUTOMAKE_OPTIONS = foreign -- 2.11.4.GIT