rygel r133 - in trunk: . src src/media-providers/tracker src/media-server

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Tue Oct 28 21:01:08 2008
New Revision: 133
URL: http://svn.gnome.org/viewvc/rygel?rev=133&view=rev

Log:
Move the core Media Server code into a separate subdirectory.

Added:
   trunk/src/media-server/Makefile.am
      - copied, changed from r132, /trunk/src/Makefile.am
   trunk/src/media-server/cstuff.c
      - copied, changed from r132, /trunk/src/cstuff.c
   trunk/src/media-server/cstuff.h
      - copied, changed from r132, /trunk/src/cstuff.h
   trunk/src/media-server/cstuff.vapi
      - copied, changed from r132, /trunk/src/cstuff.vapi
   trunk/src/media-server/gupnp-connection-manager.vala
      - copied, changed from r132, /trunk/src/gupnp-connection-manager.vala
   trunk/src/media-server/gupnp-content-directory.vala
      - copied, changed from r132, /trunk/src/gupnp-content-directory.vala
   trunk/src/media-server/gupnp-media-manager.vala
      - copied, changed from r132, /trunk/src/gupnp-media-manager.vala
   trunk/src/media-server/gupnp-media-provider.vala
      - copied, changed from r132, /trunk/src/gupnp-media-provider.vala
   trunk/src/media-server/gupnp-media-receiver-registrar.vala
      - copied, changed from r132, /trunk/src/gupnp-media-receiver-registrar.vala
   trunk/src/media-server/gupnp-media-server.vala
      - copied, changed from r132, /trunk/src/gupnp-media-server.vala
   trunk/src/media-server/gupnp-metadata-extractor.vala
      - copied, changed from r132, /trunk/src/gupnp-metadata-extractor.vala
Removed:
   trunk/src/cstuff.c
   trunk/src/cstuff.h
   trunk/src/cstuff.vapi
   trunk/src/gupnp-connection-manager.vala
   trunk/src/gupnp-content-directory.vala
   trunk/src/gupnp-media-manager.vala
   trunk/src/gupnp-media-provider.vala
   trunk/src/gupnp-media-receiver-registrar.vala
   trunk/src/gupnp-media-server.vala
   trunk/src/gupnp-metadata-extractor.vala
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/media-providers/tracker/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Oct 28 21:01:08 2008
@@ -1,7 +1,7 @@
 AC_PREREQ(2.53)
 AC_INIT(gupnp-media-server, 0.1, http://www.gupnp.org/)
 AM_INIT_AUTOMAKE()
-AC_CONFIG_SRCDIR(src/gupnp-media-server.vala)
+AC_CONFIG_SRCDIR(src/media-server/gupnp-media-server.vala)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
@@ -111,6 +111,7 @@
 AC_OUTPUT([
 Makefile
 src/Makefile
+src/media-server/Makefile
 src/media-providers/Makefile
 src/media-providers/tracker/Makefile
 data/Makefile

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Oct 28 21:01:08 2008
@@ -1,84 +1,3 @@
-SUBDIRS = . media-providers
+SUBDIRS = media-server media-providers
 
-if UNINSTALLED
-shareddir = $(abs_top_builddir)/data
-else
-shareddir = $(datadir)/gupnp-media-server
-endif
-
-if UNINSTALLED
-plugindir = $(abs_top_builddir)/src/media-providers
-else
-plugindir = $(libdir)/gupnp-media-server-1.0
-endif
-
-AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
-	    $(LIBGUPNP_AV_CFLAGS) \
-	    $(LIBGCONF_CFLAGS) \
-	    $(LIBGSTREAMER_CFLAGS) \
-	    $(GIO_CFLAGS) \
-	    -I$(top_srcdir) -DDATA_DIR='"$(shareddir)"' \
-	    -DPLUGIN_DIR='"$(plugindir)"'
-
-bin_PROGRAMS = gupnp-media-server
-
-BUILT_SOURCES = gupnp-media-server-1.0.vapi \
-		gupnp-media-server.stamp \
-		gupnp-media-server.h \
-		gupnp-media-server.c \
-		gupnp-content-directory.h \
-		gupnp-content-directory.c \
-		gupnp-connection-manager.h \
-		gupnp-connection-manager.c \
-		gupnp-media-receiver-registrar.h \
-		gupnp-media-receiver-registrar.c \
-		gupnp-media-provider.h \
-		gupnp-media-provider.c \
-		gupnp-media-manager.h \
-		gupnp-media-manager.c
-
-gupnp_media_server_SOURCES = gupnp-media-server-1.0.vapi \
-			     cstuff.c \
-			     cstuff.h \
-			     gupnp-media-server.h \
-			     gupnp-media-server.c \
-			     gupnp-media-server.vala \
-			     gupnp-content-directory.h \
-			     gupnp-content-directory.c \
-			     gupnp-content-directory.vala \
-			     gupnp-connection-manager.h \
-			     gupnp-connection-manager.c \
-			     gupnp-connection-manager.vala \
-			     gupnp-media-receiver-registrar.h \
-			     gupnp-media-receiver-registrar.c \
-			     gupnp-media-receiver-registrar.vala \
-			     gupnp-media-provider.h \
-			     gupnp-media-provider.c \
-			     gupnp-media-manager.h \
-			     gupnp-media-manager.c \
-			     gupnp-media-manager.vala \
-			     gupnp-metadata-extractor.c \
-			     gupnp-metadata-extractor.h \
-			     gupnp-metadata-extractor.vala
-
-gupnp-media-server.stamp: $(filter %.vala,$(gupnp_media_server_SOURCES))
-	$(VALAC) -C --vapidir=$(srcdir) --pkg gupnp-media-server-1.0 \
-	--pkg cstuff --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 \
-	--pkg gconf-2.0 --pkg gstreamer-0.10 --pkg gio-2.0 $^
-	touch $@
-
-gupnp_media_server_LDADD = $(LIBGUPNP_LIBS) \
-			   $(LIBGUPNP_AV_LIBS) \
-			   $(LIBGCONF_LIBS) \
-			   $(LIBGSTREAMER_LIBS) \
-			   $(GIO_LIBS)
-gupnp_media_server_LDFLAGS = -export-dynamic
-
-VAPI_FILES = gupnp-media-server-1.0.vapi
-
-gupnp-media-server-1.0.vapi: gupnp-media-provider.vala
-	$(VALAC) -C --library=gupnp-media-server-1.0 --pkg gupnp-1.0 $^
-
-CLEANFILES = $(BUILT_SOURCES)
 MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = cstuff.vapi

Modified: trunk/src/media-providers/tracker/Makefile.am
==============================================================================
--- trunk/src/media-providers/tracker/Makefile.am	(original)
+++ trunk/src/media-providers/tracker/Makefile.am	Tue Oct 28 21:01:08 2008
@@ -5,7 +5,7 @@
 AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    $(LIBGUPNP_AV_CFLAGS) \
 	    $(LIBDBUS_GLIB_CFLAGS) \
-	    -I$(top_srcdir)/src
+	    -I$(top_srcdir)/src/media-server
 
 BUILT_SOURCES = gupnp-media-tracker.stamp \
 		gupnp-media-tracker.h \
@@ -16,7 +16,8 @@
 				    gupnp-media-tracker.vala
 
 gupnp-media-tracker.stamp: $(filter %.vala,$(libgupnp_media_tracker_la_SOURCES))
-	$(VALAC) -C --vapidir=$(top_srcdir)/src --pkg gupnp-media-server-1.0 \
+	$(VALAC) -C --vapidir=$(top_srcdir)/src/media-server \
+	--pkg gupnp-media-server-1.0 \
 	--pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 $^
 	touch $@
 

Copied: trunk/src/media-server/Makefile.am (from r132, /trunk/src/Makefile.am)
==============================================================================
--- /trunk/src/Makefile.am	(original)
+++ trunk/src/media-server/Makefile.am	Tue Oct 28 21:01:08 2008
@@ -1,5 +1,3 @@
-SUBDIRS = . media-providers
-
 if UNINSTALLED
 shareddir = $(abs_top_builddir)/data
 else

Copied: trunk/src/media-server/cstuff.c (from r132, /trunk/src/cstuff.c)
==============================================================================

Copied: trunk/src/media-server/cstuff.h (from r132, /trunk/src/cstuff.h)
==============================================================================

Copied: trunk/src/media-server/cstuff.vapi (from r132, /trunk/src/cstuff.vapi)
==============================================================================

Copied: trunk/src/media-server/gupnp-connection-manager.vala (from r132, /trunk/src/gupnp-connection-manager.vala)
==============================================================================

Copied: trunk/src/media-server/gupnp-content-directory.vala (from r132, /trunk/src/gupnp-content-directory.vala)
==============================================================================

Copied: trunk/src/media-server/gupnp-media-manager.vala (from r132, /trunk/src/gupnp-media-manager.vala)
==============================================================================

Copied: trunk/src/media-server/gupnp-media-provider.vala (from r132, /trunk/src/gupnp-media-provider.vala)
==============================================================================

Copied: trunk/src/media-server/gupnp-media-receiver-registrar.vala (from r132, /trunk/src/gupnp-media-receiver-registrar.vala)
==============================================================================

Copied: trunk/src/media-server/gupnp-media-server.vala (from r132, /trunk/src/gupnp-media-server.vala)
==============================================================================

Copied: trunk/src/media-server/gupnp-metadata-extractor.vala (from r132, /trunk/src/gupnp-metadata-extractor.vala)
==============================================================================