[rygel] maemo6: Remove maemo-specific configuration

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 7342d60879282bdb4e3511f24fe92af9b8d28062
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Tue Feb 1 18:24:37 2011 +0200

    maemo6: Remove maemo-specific configuration
    
    No need for special configure flag to enable maemo configuration as it
    should be the default in maemo-specific branch.

 configure.ac                            |    7 --
 data/Makefile.am                        |   15 +----
 data/rygel-maemo.conf                   |  111 -------------------------------
 data/{rygel-default.conf => rygel.conf} |    0
 4 files changed, 3 insertions(+), 130 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ca2e43b..e2390ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,11 +96,6 @@ fi
 VAPIDIR="${datadir}/vala/vapi"
 AC_SUBST(VAPIDIR)
 
-# Maemo support
-AC_ARG_ENABLE(maemo,
-	[  --enable-maemo          enable maemo support],,
-        enable_maemo=no)
-
 # Debugging
 AC_ARG_ENABLE(debug,
 	[  --enable-debug          enable debugging],,
@@ -208,7 +203,6 @@ AC_ARG_ENABLE(gst-launch-plugin,
 AC_SUBST(abs_top_builddir)
 
 AM_CONDITIONAL([UNINSTALLED], [test "x$enable_uninstalled" = "xyes"])
-AM_CONDITIONAL([ENABLE_MAEMO], [test "x$enable_maemo" = "xyes"])
 AM_CONDITIONAL([BUILD_TEST_PLUGIN], [test "x$enable_test_plugin" = "xyes"])
 AM_CONDITIONAL([BUILD_TRACKER_PLUGIN],
                [test "x$enable_tracker_plugin" = "xyes"])
@@ -291,7 +285,6 @@ echo "
         Compiler:               ${CC}
         CFLAGS:                 ${CFLAGS}
         uninstalled:            ${enable_uninstalled}
-        maemo support:          ${enable_maemo}
         preferences ui:         ${BUILD_UI}
         SQL debugging:          ${enable_sql_debugging}
     Plugins:
diff --git a/data/Makefile.am b/data/Makefile.am
index 033b4a5..f8b3e89 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,14 +1,6 @@
 SUBDIRS = xml icons
 
-if ENABLE_MAEMO
-configfile = rygel-maemo.conf
-else
-configfile = rygel-default.conf
-endif
-
 sysconf_DATA = rygel.conf
-$(sysconf_DATA): $(configfile) Makefile
-	$(AM_V_GEN)cp $(srcdir)/$(configfile) $@
 
 shareddir = $(datadir)/rygel
 
@@ -31,11 +23,10 @@ desktop_in_files = rygel.desktop.in rygel-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = $(dbusservice_DATA) $(desktop_DATA) rygel.conf
-EXTRA_DIST = rygel-maemo.conf \
-	     rygel-default.conf \
-	     $(dbusservice_in_files) \
+CLEANFILES = $(dbusservice_DATA) $(desktop_DATA)
+EXTRA_DIST = $(dbusservice_in_files) \
 	     $(desktop_in_files) \
+	     $(sysconf_DATA) \
 	     $(pixmaps_DATA)
 
 
diff --git a/data/rygel-default.conf b/data/rygel.conf
similarity index 100%
rename from data/rygel-default.conf
rename to data/rygel.conf