Mercurial > pidgin3 / file diff

--- a/src/protocols/sametime/Makefile.am	Fri Dec 16 03:34:01 2005 +0000
+++ b/src/protocols/sametime/Makefile.am	Fri Dec 16 04:08:05 2005 +0000
@@ -1,4 +1,3 @@
-SUBDIRS = meanwhile
 
 EXTRA_DIST = Makefile.mingw
 
@@ -29,17 +28,16 @@
 
 
 libsametime_la_LDFLAGS = -module -avoid-version -no-undefined
-libsametime_la_LIBADD = $(GLIB_LIBS) meanwhile/libmeanwhile.la
+libsametime_la_LIBADD = $(GLIB_LIBS) $(MEANWHILE_LIBS)
 
 
 AM_CFLAGS = \
-	$(GLIB_CFLAGS) \
+	$(GLIB_CFLAGS) $(MEANWHILE_CFLAGS) \
 	$(DEBUG_CFLAGS) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/protocols/sametime/meanwhile
+	-I$(top_srcdir)/src
 
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"meanwhile\" \
+	-DG_LOG_DOMAIN=\"sametime\" \
 	$(st)