gnomemm r1603 - in clutter-gtkmm/trunk: . scripts

[murrayc svn gnome org]

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

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

* Makefile.am:
* configure.in: Split clutter-gtkmm into this module, out of the 
main cluttermm module, because some people need the extra modularity.
This does not yet build (and will probalby need more work) because 
there is no clutter-gtk-0.8 yet.


Modified:
   clutter-gtkmm/trunk/ChangeLog
   clutter-gtkmm/trunk/Makefile.am
   clutter-gtkmm/trunk/configure.in
   clutter-gtkmm/trunk/scripts/ltmain.sh

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

Modified: clutter-gtkmm/trunk/configure.in
==============================================================================
--- clutter-gtkmm/trunk/configure.in	(original)
+++ clutter-gtkmm/trunk/configure.in	Mon Jul 14 08:30:07 2008
@@ -73,20 +73,11 @@
 #  Dependancy checks
 #########################################################################
 
-PKG_CHECK_MODULES(CLUTTERMM,
-                  gtkmm-2.4 >= 2.10.9
-                  clutter-0.7)
-AC_SUBST(CLUTTERMM_CFLAGS)
-AC_SUBST(CLUTTERMM_LIBS)
-
-PKG_CHECK_MODULES(CLUTTERMM_CAIRO,
-                  [gtkmm-2.4
-                   clutter-cairo-0.7
-                   cairomm-1.0])
-
 PKG_CHECK_MODULES(CLUTTERMM_GTK,
                   [gtkmm-2.4
-                   clutter-gtk-0.7])
+                   clutter-gtk-0.8])
+AC_SUBST(CLUTTERMM_GTK_CFLAGS)
+AC_SUBST(CLUTTERMM_GTK_LIBS)
 
 # the API version of the library.  Libraries and pkg-config files will have this
 # value appended to them, e.g. libclutter-0.6.so
@@ -113,18 +104,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
-  clutter-cairo/cluttermm-cairo/Makefile
-  clutter-cairo/cluttermm-cairo/private/Makefile
-
   clutter-gtk/Makefile
   clutter-gtk/cluttermm-gtk-$API_VER.pc:clutter-gtk/cluttermm-gtk.pc.in
   clutter-gtk/src/Makefile

Modified: clutter-gtkmm/trunk/scripts/ltmain.sh
==============================================================================
--- clutter-gtkmm/trunk/scripts/ltmain.sh	(original)
+++ clutter-gtkmm/trunk/scripts/ltmain.sh	Mon Jul 14 08:30:07 2008
@@ -1 +1 @@
-link /usr/share/libtool/config/ltmain.sh
\ No newline at end of file
+link /opt/gnome220/share/libtool/ltmain.sh
\ No newline at end of file