diff src/Makefile.am @ 13293:44a8d46ee3c1

[gaim-migrate @ 15659] Nobody minds if I revert all that mediastreamer stuff, do they? committer: Tailor Script <[e-mail]>

--- a/src/Makefile.am	Wed Feb 15 23:02:50 2006 +0000
+++ b/src/Makefile.am	Thu Feb 16 00:45:23 2006 +0000
@@ -1,4 +1,3 @@
-EXTRA_DIST = \
 		dbus-analyze-functions.py \
 		dbus-analyze-types.py \
 		gaim-notifications-example.py \
@@ -60,11 +59,7 @@
 		win32/nsis/translations/trad-chinese.nsh \
 		win32/nsis/translations/vietnamese.nsh
 
-if HAVE_VV
-SUBDIRS = protocols mediastreamer 
-else
 SUBDIRS = protocols
-endif
 
 gaim_coresources = \
 	account.c \
@@ -84,7 +79,6 @@
 	idle.c \
 	imgstore.c \
 	log.c \
-	media.c \
 	mime.c \
 	network.c \
 	ntlm.c \
@@ -133,7 +127,6 @@
 	idle.h \
 	imgstore.h \
 	log.h \
-	media.h \
 	mime.h \
 	network.h \
 	notify.h \
@@ -276,7 +269,6 @@
 	gtkimhtmltoolbar.c \
 	gtklog.c \
 	gtkmain.c \
-	gtkmedia.c \
 	gtkmenutray.c \
 	gtknotify.c \
 	gtkplugin.c \
@@ -322,7 +314,6 @@
 	gtkimhtml.h \
 	gtkimhtmltoolbar.h \
 	gtklog.h \
-	gtkmedia.h \
 	gtkmenutray.h \
 	gtknickcolors.h \
 	gtknotify.h \
@@ -351,10 +342,6 @@
 	$(gaim_coreheaders) \
 	$(gaim_headers)
 
-if HAVE_VV
-MS_LIBS=$(top_srcdir)/src/mediastreamer/libmediastreamer.la
-MS_INCLUDES=-I$(top_srcdir)/src/mediastreamer
-endif
 
 gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) $(MS_LIBS)
 gaim_LDFLAGS = -export-dynamic
@@ -368,9 +355,7 @@
 	$(SM_LIBS) \
 	$(INTLLIBS) \
 	$(GTKSPELL_LIBS) \
-	$(STARTUP_NOTIFICATION_LIBS) \
-	$(VV_LIBS) \
-	$(MS_LIBS)
+	$(STARTUP_NOTIFICATION_LIBS) 
 
 AM_CPPFLAGS = \
 	-DBR_PTHREADS=0 \
@@ -379,8 +364,6 @@
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-I$(top_srcdir)/plugins \
-	$(MS_INCLUDES) \
-	$(VV_CFLAGS) \
 	$(AUDIOFILE_CFLAGS) \
 	$(AO_CFLAGS) \
 	$(DEBUG_CFLAGS) \