Mercurial > pidgin

changeset 11093:7831d0969531

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 13118] Sametime builds for me now. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Tue, 12 Jul 2005 04:13:11 +0000
parents 68652f4ad6a7
children 59a1ff5a4bae
files configure.ac src/protocols/sametime/Makefile.am src/protocols/sametime/meanwhile/Makefile.am
diffstat 3 files changed, 52 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Tue Jul 12 01:56:02 2005 +0000
+++ b/configure.ac	Tue Jul 12 04:13:11 2005 +0000
@@ -1279,6 +1279,7 @@
 		   src/protocols/oscar/Makefile
 		   src/protocols/rendezvous/Makefile
 		   src/protocols/sametime/Makefile
+		   src/protocols/sametime/meanwhile/Makefile
 		   src/protocols/silc/Makefile
 		   src/protocols/toc/Makefile
 		   src/protocols/trepia/Makefile
--- a/src/protocols/sametime/Makefile.am	Tue Jul 12 01:56:02 2005 +0000
+++ b/src/protocols/sametime/Makefile.am	Tue Jul 12 04:13:11 2005 +0000
@@ -1,4 +1,4 @@
-
+SUBDIRS = meanwhile
 
 EXTRA_DIST = # Makefile.mingw
 
@@ -6,46 +6,9 @@
 pkgdir = $(libdir)/gaim
 
 
-noinst_HEADERS = \
-	meanwhile/mw_channel.h \
-	meanwhile/mw_cipher.h \
-	meanwhile/mw_common.h \
-	meanwhile/mw_debug.h \
-	meanwhile/mw_error.h \
-	meanwhile/mw_message.h \
-	meanwhile/mw_service.h \
-	meanwhile/mw_session.h \
-	meanwhile/mw_srvc_aware.h \
-	meanwhile/mw_srvc_conf.h \
-	meanwhile/mw_srvc_ft.h \
-	meanwhile/mw_srvc_im.h \
-	meanwhile/mw_srvc_resolve.h \
-	meanwhile/mw_srvc_store.h \
-	meanwhile/mw_st_list.h \
-	meanwhile/mw_util.h \
-	sametime.h
+noinst_HEADERS = sametime.h
 
-meanwhile_SOURCES = \
-	meanwhile/channel.c \
-	meanwhile/cipher.c \
-	meanwhile/common.c \
-	meanwhile/error.c \
-	meanwhile/message.c \
-	meanwhile/mw_debug.c \
-	meanwhile/mw_util.c \
-	meanwhile/service.c \
-	meanwhile/session.c \
-	meanwhile/srvc_aware.c \
-	meanwhile/srvc_conf.c \
-	meanwhile/srvc_ft.c \
-	meanwhile/srvc_im.c \
-	meanwhile/srvc_store.c \
-	meanwhile/srvc_resolve.c \
-	meanwhile/st_list.c
-
-sametime_SOURCES = \
-	$(meanwhile_SOURCES) \
-	sametime.c
+sametime_SOURCES = sametime.c
 
 
 if STATIC_SAMETIME
@@ -61,11 +24,12 @@
 pkg_LTLIBRARIES     = libsametime.la
 libsametime_la_SOURCES = $(sametime_SOURCES)
 
+
 endif
 
 
 libsametime_la_LDFLAGS = -module -avoid-version -no-undefined
-libsametime_la_LIBADD = $(GLIB_LIBS)
+libsametime_la_LIBADD = $(GLIB_LIBS) meanwhile/libmeanwhile.la
 
 
 AM_CFLAGS = \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/protocols/sametime/meanwhile/Makefile.am	Tue Jul 12 04:13:11 2005 +0000
@@ -0,0 +1,46 @@
+noinst_HEADERS = \
+	mw_channel.h \
+	mw_cipher.h \
+	mw_common.h \
+	mw_debug.h \
+	mw_error.h \
+	mw_message.h \
+	mw_service.h \
+	mw_session.h \
+	mw_srvc_aware.h \
+	mw_srvc_conf.h \
+	mw_srvc_ft.h \
+	mw_srvc_im.h \
+	mw_srvc_resolve.h \
+	mw_srvc_store.h \
+	mw_st_list.h \
+	mw_util.h 
+
+
+meanwhile_SOURCES = \
+	channel.c \
+	cipher.c \
+	common.c \
+	error.c \
+	message.c \
+	mw_debug.c \
+	mw_util.c \
+	service.c \
+	session.c \
+	srvc_aware.c \
+	srvc_conf.c \
+	srvc_ft.c \
+	srvc_im.c \
+	srvc_store.c \
+	srvc_resolve.c \
+	st_list.c
+
+AM_CFLAGS = \
+	$(GLIB_CFLAGS) \
+	$(DEBUG_CFLAGS) \
+	-I$(top_srcdir)/src 
+
+libmeanwhile_la_SOURCES = $(meanwhile_SOURCES)
+st =
+noinst_LTLIBRARIES = libmeanwhile.la
+