rygel r15 - in trunk: . data data/xml src

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Tue Oct 28 20:58:17 2008
New Revision: 15
URL: http://svn.gnome.org/viewvc/rygel?rev=15&view=rev

Log:
Update/fix the build system for our dummy MS.

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/data/xml/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Oct 28 20:58:17 2008
@@ -1,7 +1,7 @@
 AC_PREREQ(2.53)
-AC_INIT(gupnp-tools, 0.3, http://www.gupnp.org/)
+AC_INIT(gupnp-media-server, 0.1, http://www.gupnp.org/)
 AM_INIT_AUTOMAKE()
-AC_CONFIG_SRCDIR(src/common/icons.h)
+AC_CONFIG_SRCDIR(src/main.c)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
@@ -13,46 +13,11 @@
 
 GUPNP_REQUIRED=0.6
 GUPNP_AV_REQUIRED=0.1
-GTK_REQUIRED=2.12
-LIBGLADE_REQUIRED=2.6.0
-ICON_THEME_REQUIRED=2.20
+GCONF_REQUIRED=2.22
 
 PKG_CHECK_MODULES(LIBGUPNP, gupnp-1.0 >= $GUPNP_REQUIRED)
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
-PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= $LIBGLADE_REQUIRED)
-PKG_CHECK_MODULES(GNOME_ICON_THEME, gnome-icon-theme >= $ICON_THEME_REQUIRED)
-
-AC_ARG_WITH( av,
-  AC_HELP_STRING([--disable-av],[Don't build AV tools]),
-  try_av=$withval, try_av=yes )
-
-HAVE_LIBGUPNP_AV=no
-if test x$try_av = xyes ; then
-    dnl check for gupnp-av
-    PKG_CHECK_MODULES(LIBGUPNP_AV, gupnp-av-1.0 >= $GUPNP_AV_REQUIRED ,
-      [
-        HAVE_LIBGUPNP_AV=yes
-        AC_SUBST(LIBGUPNP_AV_CFLAGS)
-        AC_SUBST(LIBGUPNP_AV_LIBS)
-      ],
-      [
-        HAVE_LIBGUPNP_AV=no
-        AC_MSG_WARN([gupnp-av $GUPNP_AV_REQUIRED or greater not found.])
-        AC_MSG_WARN([AV tools will not be built.])
-      ])
-else
-    AC_MSG_NOTICE([AV tools disabled.])
-fi
-
-if test x$HAVE_LIBGUPNP_AV = xno; then
-  BUILD_AV=no
-else
-  BUILD_AV=yes
-  AC_DEFINE(HAVE_LIBGUPNP_AV, , [Build AV tools])
-fi
-
-AC_SUBST(HAVE_LIBGUPNP_AV)
-AM_CONDITIONAL(BUILD_AV, test x$BUILD_AV = xyes)
+PKG_CHECK_MODULES(LIBGUPNP_AV, gupnp-av-1.0 >= $GUPNP_AV_REQUIRED)
+PKG_CHECK_MODULES(LIBGCONF, gconf-2.0 >= $GCONF_REQUIRED)
 
 # glib-genmarshal
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
@@ -77,7 +42,7 @@
 AM_CONDITIONAL([UNINSTALLED], [test "x$enable_uninstalled" = "xyes"])
 
 # Gettext
-GETTEXT_PACKAGE=gupnp-tools
+GETTEXT_PACKAGE=gupnp-media-server
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], 
   [Define the gettext package to be used])
@@ -89,14 +54,6 @@
 AC_OUTPUT([
 Makefile
 src/Makefile
-src/av-cp/Makefile
-src/common/Makefile
-src/network-light/Makefile
-src/universal-cp/Makefile
 data/Makefile
-data/gupnp-universal-cp.desktop.in
-data/gupnp-av-cp.desktop.in
-data/gupnp-network-light.desktop.in
-data/pixmaps/Makefile
 data/xml/Makefile
 ])

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Tue Oct 28 20:58:17 2008
@@ -1,23 +1,3 @@
-SUBDIRS = pixmaps xml
-
-shareddir = $(datadir)/gupnp-tools
-
-dist_shared_DATA = $(srcdir)/gupnp-universal-cp.glade \
-		   $(srcdir)/gupnp-network-light.glade \
-		   $(srcdir)/gupnp-av-cp.glade
-
-desktopdir = ${datadir}/applications
-desktop_in_files = gupnp-universal-cp.desktop.in \
-		   gupnp-av-cp.desktop.in \
-		   gupnp-network-light.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-# Rule to create the .desktop files
-$(desktop_DATA): $(desktop_in_files) Makefile
-	@sed -e "s,\$${prefix},${prefix},g" $(@:.desktop=.desktop.in) > $@
-
-EXTRA_DIST = $(desktop_in_files:.desktop.in=.desktop.in.in)
-
-CLEANFILES = $(desktop_DATA)
+SUBDIRS = xml
 
 MAINTAINERCLEANFILES = Makefile.in

Modified: trunk/data/xml/Makefile.am
==============================================================================
--- trunk/data/xml/Makefile.am	(original)
+++ trunk/data/xml/Makefile.am	Tue Oct 28 20:58:17 2008
@@ -1,8 +1,8 @@
-xml_DATA = network-light-desc.xml \
-	   Dimming-scpd.xml \
-	   SwitchPower-scpd.xml
+xml_DATA = description.xml \
+	   ConnectionManager.xml \
+	   ContentDirectory.xml
 
-xmldir = $(datadir)/gupnp-tools/xml
+xmldir = $(datadir)/gupnp-media-server/xml
 
 EXTRA_DIST = $(xml_DATA)
 

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Oct 28 20:58:17 2008
@@ -1,22 +1,20 @@
 if UNINSTALLED
 shareddir = $(abs_top_builddir)/data
 else
-shareddir = $(datadir)/gupnp-tools
+shareddir = $(datadir)/gupnp-media-server
 endif
 
-AM_CFLAGS = $(LIBGUPNP_CFLAGS) $(LIBGLADE_CFLAGS) -I$(top_srcdir) \
-	    -DDATA_DIR='"$(shareddir)"' -I../common
+AM_CFLAGS = $(LIBGUPNP_CFLAGS) $(LIBGUPNP_AV_CFLAGS) $(LIBGCONF_CFLAGS) \
+	    -I$(top_srcdir) -DDATA_DIR='"$(shareddir)"'
 
-bin_PROGRAMS = gupnp-network-light
+bin_PROGRAMS = gupnp-media-server
 
-gupnp_network_light_SOURCES = main.c \
-			      gui.c \
-			      upnp.c \
-			      main.h \
-			      gui.h \
-			      upnp.h
-gupnp_network_light_LDADD = $(LIBGLADE_LIBS) $(LIBGUPNP_LIBS) \
-			    ../common/libicons.a
-gupnp_network_light_LDFLAGS = -export-dynamic
+gupnp_media_server_SOURCES = main.c \
+			     gupnp-media-server.h \
+			     gupnp-media-server.c
+gupnp_media_server_LDADD = $(LIBGUPNP_LIBS) \
+			   $(LIBGUPNP_AV_LIBS) \
+			   $(LIBGCONF_LIBS)
+gupnp_media_server_LDFLAGS = -export-dynamic
 
 MAINTAINERCLEANFILES = Makefile.in