From 77076c123f191c157dd4e6540586a66d2ff013ba Mon Sep 17 00:00:00 2001 From: "Zeeshan Ali (Khattak)" Date: Tue, 5 Aug 2008 15:51:57 +0000 Subject: [PATCH] Move the core Media Server code into a separate subdirectory. svn path=/trunk/; revision=244 --- ChangeLog | 29 ++++++++ configure.ac | 3 +- src/Makefile.am | 83 +--------------------- src/media-providers/tracker/Makefile.am | 5 +- src/media-server/Makefile.am | 82 +++++++++++++++++++++ src/{ => media-server}/cstuff.c | 0 src/{ => media-server}/cstuff.h | 0 src/{ => media-server}/cstuff.vapi | 0 .../gupnp-connection-manager.vala | 0 .../gupnp-content-directory.vala | 0 src/{ => media-server}/gupnp-media-manager.vala | 0 src/{ => media-server}/gupnp-media-provider.vala | 0 .../gupnp-media-receiver-registrar.vala | 0 src/{ => media-server}/gupnp-media-server.vala | 0 .../gupnp-metadata-extractor.vala | 0 15 files changed, 117 insertions(+), 85 deletions(-) create mode 100644 src/media-server/Makefile.am rename src/{ => media-server}/cstuff.c (100%) rename src/{ => media-server}/cstuff.h (100%) rename src/{ => media-server}/cstuff.vapi (100%) rename src/{ => media-server}/gupnp-connection-manager.vala (100%) rename src/{ => media-server}/gupnp-content-directory.vala (100%) rename src/{ => media-server}/gupnp-media-manager.vala (100%) rename src/{ => media-server}/gupnp-media-provider.vala (100%) rename src/{ => media-server}/gupnp-media-receiver-registrar.vala (100%) rename src/{ => media-server}/gupnp-media-server.vala (100%) rename src/{ => media-server}/gupnp-metadata-extractor.vala (100%) diff --git a/ChangeLog b/ChangeLog index fc5bfb0..a4683ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,34 @@ 2008-08-05 Zeeshan Ali Khattak + * configure.ac: + * src/Makefile.am: + * src/cstuff.c: + * src/cstuff.h: + * src/cstuff.vapi: + * src/gupnp-connection-manager.vala: + * src/gupnp-content-directory.vala: + * src/gupnp-media-manager.vala: + * src/gupnp-media-provider.vala: + * src/gupnp-media-receiver-registrar.vala: + * src/gupnp-media-server.vala: + * src/gupnp-metadata-extractor.vala: + * src/media-providers/tracker/Makefile.am: + * src/media-server/Makefile.am: + * src/media-server/cstuff.c: + * src/media-server/cstuff.h: + * src/media-server/cstuff.vapi: + * src/media-server/gupnp-connection-manager.vala: + * src/media-server/gupnp-content-directory.vala: + * src/media-server/gupnp-media-manager.vala: + * src/media-server/gupnp-media-provider.vala: + * src/media-server/gupnp-media-receiver-registrar.vala: + * src/media-server/gupnp-media-server.vala: + * src/media-server/gupnp-metadata-extractor.vala: + + Move the core Media Server code into a separate subdirectory. + +2008-08-05 Zeeshan Ali Khattak + * src/media-providers/Makefile.am: Remove Makefile.in on 'make maintainer-clean'. diff --git a/configure.ac b/configure.ac index 062285d..a5c1773 100644 --- a/configure.ac +++ b/configure.ac @@ -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 @@ AM_GLIB_DEFINE_LOCALEDIR([LOCALEDIR]) AC_OUTPUT([ Makefile src/Makefile +src/media-server/Makefile src/media-providers/Makefile src/media-providers/tracker/Makefile data/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 55632b6..5f139d5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 diff --git a/src/media-providers/tracker/Makefile.am b/src/media-providers/tracker/Makefile.am index 05702c5..064f1a5 100644 --- a/src/media-providers/tracker/Makefile.am +++ b/src/media-providers/tracker/Makefile.am @@ -5,7 +5,7 @@ plugin_LTLIBRARIES = libgupnp-media-tracker.la 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 @@ libgupnp_media_tracker_la_SOURCES = gupnp-media-tracker.h \ 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 $@ diff --git a/src/media-server/Makefile.am b/src/media-server/Makefile.am new file mode 100644 index 0000000..75c3ba0 --- /dev/null +++ b/src/media-server/Makefile.am @@ -0,0 +1,82 @@ +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 diff --git a/src/cstuff.c b/src/media-server/cstuff.c similarity index 100% rename from src/cstuff.c rename to src/media-server/cstuff.c diff --git a/src/cstuff.h b/src/media-server/cstuff.h similarity index 100% rename from src/cstuff.h rename to src/media-server/cstuff.h diff --git a/src/cstuff.vapi b/src/media-server/cstuff.vapi similarity index 100% rename from src/cstuff.vapi rename to src/media-server/cstuff.vapi diff --git a/src/gupnp-connection-manager.vala b/src/media-server/gupnp-connection-manager.vala similarity index 100% rename from src/gupnp-connection-manager.vala rename to src/media-server/gupnp-connection-manager.vala diff --git a/src/gupnp-content-directory.vala b/src/media-server/gupnp-content-directory.vala similarity index 100% rename from src/gupnp-content-directory.vala rename to src/media-server/gupnp-content-directory.vala diff --git a/src/gupnp-media-manager.vala b/src/media-server/gupnp-media-manager.vala similarity index 100% rename from src/gupnp-media-manager.vala rename to src/media-server/gupnp-media-manager.vala diff --git a/src/gupnp-media-provider.vala b/src/media-server/gupnp-media-provider.vala similarity index 100% rename from src/gupnp-media-provider.vala rename to src/media-server/gupnp-media-provider.vala diff --git a/src/gupnp-media-receiver-registrar.vala b/src/media-server/gupnp-media-receiver-registrar.vala similarity index 100% rename from src/gupnp-media-receiver-registrar.vala rename to src/media-server/gupnp-media-receiver-registrar.vala diff --git a/src/gupnp-media-server.vala b/src/media-server/gupnp-media-server.vala similarity index 100% rename from src/gupnp-media-server.vala rename to src/media-server/gupnp-media-server.vala diff --git a/src/gupnp-metadata-extractor.vala b/src/media-server/gupnp-metadata-extractor.vala similarity index 100% rename from src/gupnp-metadata-extractor.vala rename to src/media-server/gupnp-metadata-extractor.vala -- 2.7.4