gnomemm r1606 - in clutter-cairomm/trunk: . clutter examples

[murrayc svn gnome org]

Author: murrayc
Date: Mon Jul 14 08:51:52 2008
New Revision: 1606
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1606&view=rev

Log:
2008-07-14  Murray Cumming  <murrayc murrayc com>

* Makefile.am:
* examples/Makefile.am_fragment: This is the new clutter-cairomm 
module, by moving it out of cluttermm.
It does not build yet, because clutter-cairo-0.8 does not exist yet.

Removed:
   clutter-cairomm/trunk/clutter/
Modified:
   clutter-cairomm/trunk/ChangeLog
   clutter-cairomm/trunk/Makefile.am
   clutter-cairomm/trunk/configure.in
   clutter-cairomm/trunk/examples/Makefile.am_fragment

Modified: clutter-cairomm/trunk/Makefile.am
==============================================================================
--- clutter-cairomm/trunk/Makefile.am	(original)
+++ clutter-cairomm/trunk/Makefile.am	Mon Jul 14 08:51:52 2008
@@ -1,4 +1,4 @@
-SUBDIRS		= tools clutter clutter-cairo docs examples tests
+SUBDIRS		= tools clutter-cairo docs examples tests
 DIST_SUBDIRS	= $(SUBDIRS) scripts
 
 EXTRA_DIST	=  \

Modified: clutter-cairomm/trunk/configure.in
==============================================================================
--- clutter-cairomm/trunk/configure.in	(original)
+++ clutter-cairomm/trunk/configure.in	Mon Jul 14 08:51:52 2008
@@ -36,7 +36,6 @@
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
 dnl Specify a configuration file (no autoheader)
-AM_CONFIG_HEADER(clutter/cluttermmconfig.h)
 AM_CONFIG_HEADER(clutter-cairo/cluttermm-cairo-config.h)
 AM_MAINTAINER_MODE
 AL_ACLOCAL_INCLUDE(scripts)
@@ -72,11 +71,6 @@
 #  Dependancy checks
 #########################################################################
 
-PKG_CHECK_MODULES(CLUTTERMM,
-                  clutter-0.8)
-AC_SUBST(CLUTTERMM_CFLAGS)
-AC_SUBST(CLUTTERMM_LIBS)
-
 PKG_CHECK_MODULES(CLUTTERMM_CAIRO,
                   [clutter-cairo-0.8
                    cairomm-1.0])
@@ -107,12 +101,6 @@
 AC_OUTPUT([
   Makefile
 
-  clutter/Makefile
-  clutter/cluttermm-$API_VER.pc:clutter/cluttermm.pc.in
-  clutter/src/Makefile
-  clutter/cluttermm/Makefile
-  clutter/cluttermm/private/Makefile
-
   clutter-cairo/Makefile
   clutter-cairo/cluttermm-cairo-$API_VER.pc:clutter-cairo/cluttermm-cairo.pc.in
   clutter-cairo/src/Makefile

Modified: clutter-cairomm/trunk/examples/Makefile.am_fragment
==============================================================================
--- clutter-cairomm/trunk/examples/Makefile.am_fragment	(original)
+++ clutter-cairomm/trunk/examples/Makefile.am_fragment	Mon Jul 14 08:51:52 2008
@@ -1,11 +1,10 @@
-local_cluttermm_libs = $(top_builddir)/clutter/cluttermm/libcluttermm-$(API_VER).la \
-					   $(top_builddir)/clutter-cairo/cluttermm-cairo/libcluttermm-cairo-$(API_VER).la
+local_cluttermm_libs = $(top_builddir)/clutter-cairo/cluttermm-cairo/libcluttermm-cairo-$(API_VER).la
 
-LIBS  = $(CLUTTERMM_LIBS) $(CLUTTERMM_CAIRO_LIBS) $(local_cluttermm_libs) 
+LIBS  = $(CLUTTERMM_CAIRO_LIBS) $(local_cluttermm_libs) 
 
 all_includes = -I$(top_builddir)/clutter -I$(top_srcdir)/clutter \
 			   -I$(top_builddir)/clutter-cairo -I$(top_srcdir)/clutter-cairo \
-               $(CLUTTERMM_CFLAGS) $(CLUTTERMM_CAIRO_CFLAGS)
+              $(CLUTTERMM_CAIRO_CFLAGS)
 
 DEFS = @DEFS@
 DEFAULT_INCLUDES =