[gnome-games] [same-gnome-clutter] [lightsoff] Distribute schema.in files, remove C version of same-gnome-clutter

commit 16267c5a7aefa1243b05becb56767d5111a735cc
Author: Tim Horton <hortont424@xxxxxxxxx>
Date:   Fri Jul 31 19:44:05 2009 -0400

    [same-gnome-clutter] [lightsoff] Distribute schema.in files, remove C 
version of same-gnome-clutter

 configure.in                                       |    1 -
 lightsoff/Makefile.am                              |    5 +-
 same-gnome-clutter/Makefile.am                     |   13 +-
 .../same-gnome-clutter-c.desktop.in.in             |   13 -
 same-gnome-clutter/same.c                          |  292 --------------------
 5 files changed, 9 insertions(+), 315 deletions(-)
---
diff --git a/configure.in b/configure.in
index ab87d19..80b4b4f 100644
--- a/configure.in
+++ b/configure.in
@@ -1249,7 +1249,6 @@ same-gnome-clutter/data/themes/tango/Makefile
 same-gnome-clutter/data/themes/test/Makefile
 same-gnome-clutter/same-gnome-clutter
 same-gnome-clutter/same-gnome-clutter.desktop.in
-same-gnome-clutter/same-gnome-clutter-c.desktop.in
 same-gnome-clutter/src/Path.js
 lightsoff/Makefile
 lightsoff/help/Makefile
diff --git a/lightsoff/Makefile.am b/lightsoff/Makefile.am
index e90a768..77bce96 100644
--- a/lightsoff/Makefile.am
+++ b/lightsoff/Makefile.am
@@ -23,8 +23,10 @@ bin_SCRIPTS = \
        src/lightsoff
 
 schema_in_files = lightsoff.schemas.in
+if HAVE_GNOME
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+endif
 
 desktop_in_files = lightsoff.desktop.in.in
 desktopdir = $(datadir)/applications
@@ -45,7 +47,8 @@ EXTRA_DIST = \
        src/Settings.js \
        data/settings.ui \
        data/lightsoff.ui \
-       src/ThemeLoader.js
+       src/ThemeLoader.js \
+       $(schema_in_files)
 
 install-schemas-local: $(schema_DATA)
 if GCONF_SCHEMAS_INSTALL
diff --git a/same-gnome-clutter/Makefile.am b/same-gnome-clutter/Makefile.am
index dd4b700..c06af94 100644
--- a/same-gnome-clutter/Makefile.am
+++ b/same-gnome-clutter/Makefile.am
@@ -18,18 +18,15 @@ same_DATA = \
     src/Path.js \
     src/ThemeLoader.js
 
-same_gnome_clutter_c_SOURCES = same.c
-same_gnome_clutter_c_CFLAGS = `pkg-config --cflags clutter-0.9 glib-2.0`
-same_gnome_clutter_c_LDFLAGS = `pkg-config --libs clutter-0.9 glib-2.0`
-
 bin_SCRIPTS = same-gnome-clutter
-bin_PROGRAMS = same-gnome-clutter-c
 
 schema_in_files = same-gnome-clutter.schemas.in
+if HAVE_GNOME
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+endif
 
-desktop_in_files = same-gnome-clutter.desktop.in.in 
same-gnome-clutter-c.desktop.in.in
+desktop_in_files = same-gnome-clutter.desktop.in.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
@@ -46,8 +43,8 @@ EXTRA_DIST = \
     data/settings.ui \
     src/Score.js \
     src/Path.js.in \
-    src/ThemeLoader.js
-
+    src/ThemeLoader.js \
+    $(schema_in_files)
 
 install-schemas-local: $(schema_DATA)
 if GCONF_SCHEMAS_INSTALL
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list

Want to limit the commits to a few modules? Go to above URL, log in to edit 
your options and select the modules ('topics') you want.