diff -r dcf6bffe29a1 -r 4a18d3961be9 gmyth-upnp/src/Makefile.am
--- a/gmyth-upnp/src/Makefile.am	Wed Jan 10 17:18:36 2007 +0000
+++ b/gmyth-upnp/src/Makefile.am	Tue Apr 17 15:48:40 2007 +0100
@@ -1,81 +1,24 @@
 SUBDIRS = .
 
-lib_LTLIBRARIES = libgmyth.la
+lib_LTLIBRARIES = libgmythupnp.la
 
-BUILT_SOURCES = 				\
-	gmyth_marshal.c 			\
-	gmyth_marshal.h
+libgmythupnp_la_SOURCES = 			\
+	gmyth_upnp.c
+	
+libgmythupnp_la_CFLAGS = 			\
+	-DDATADIR=\"$(pkgdatadir)\" 	\
+	$(LIBGMYTH_CFLAGS)			\
+	$(CYBERLINK_CFLAGS)
 
-libgmyth_la_SOURCES = 			\
-	gmyth_common.c				\
-	gmyth_debug.c				\
-	gmyth_epg.c 				\
-	gmyth_recorder.c			\
-	gmyth_remote_util.c			\
-	gmyth_tvchain.c				\
-	gmyth_scheduler.c 			\
-	gmyth_util.c				\
-	gmyth_query.c				\
-	gmyth_socket.c				\
-	gmyth_stringlist.c			\
-	gmyth_monitor_handler.c		\
-	gmyth_file_transfer.c		\
-	gmyth_livetv.c				\
-	gmyth_backendinfo.c			\
-	gmyth_programinfo.c			\
-	gmyth_uri.c					\
-	$(BUILT_SOURCES)
+libgmythupnp_la_LDFLAGS = 			\
+	-export-dynamic 		\
+	$(LIBGMYTH_LIBS) 			\
+	$(CYBERLINK_LIBS)
 
-
-EXTRA_libgmyth_la_SOURCES = gmyth_marshal.list
-
-gmyth_marshal.h: gmyth_marshal.list
-	glib-genmarshal --header --prefix=gmyth_marshal gmyth_marshal.list > gmyth_marshal.h.tmp
-	mv gmyth_marshal.h.tmp gmyth_marshal.h
-
-gmyth_marshal.c: gmyth_marshal.list gmyth_marshal.h
-	echo "#include \"glib-object.h\"" > gmyth_marshal.c.tmp
-	echo "#include \"gmyth_marshal.h\"" >> gmyth_marshal.c.tmp
-	glib-genmarshal --body --prefix=gmyth_marshal $(srcdir)/gmyth_marshal.list >> gmyth_marshal.c.tmp
-	mv gmyth_marshal.c.tmp gmyth_marshal.c
-
-libgmyth_la_CFLAGS = 			\
-	-DDATADIR=\"$(pkgdatadir)\" \
-	$(GLIB_CFLAGS) 				\
-	$(GOBJECT_CFLAGS)			\
-	$(GST_CFLAGS) 				\
-	$(GSTBASE_CFLAGS)			\
-	$(GSTPLUGINSBASE_CFLAGS)	\
-	$(MYSQL_CFLAGS)
-
-libgmyth_la_LDFLAGS = 			\
-	-export-dynamic 			\
-	$(MYSQL_LIBS) 				\
-	$(GST_LIBS) 				\
-	$(GSTBASE_LIBS)				\
-	$(GSTPLUGINS_LIBS)
-
-libgmyth_includedir = 			\
+libgmythupnp_includedir = 			\
 	$(pkgincludedir)
 
-libgmyth_include_HEADERS =    	\
-	gmyth.h						\
-	gmyth_common.h	 			\
-	gmyth_debug.h				\
-	gmyth_epg.h 				\
-	gmyth_recorder.h 			\
-	gmyth_scheduler.h 			\
-	gmyth_tvchain.h 			\
-	gmyth_util.h 				\
-	gmyth_query.h 				\
-	gmyth_socket.h 				\
-	gmyth_remote_util.h			\
-	gmyth_stringlist.h 			\
-	gmyth_monitor_handler.h		\
-	gmyth_file_transfer.h		\
-	gmyth_livetv.h				\
-	gmyth_backendinfo.h			\
-	gmyth_programinfo.h			\
-	gmyth_uri.h
+libgmythupnp_include_HEADERS =    		\
+	gmyth_upnp.h
 	
 CLEANFILES = $(BUILT_SOURCES)