2007-03-23 Emmanuele Bassi <ebassi@openedhand.com>

Assorted build fixes to pass distcheck.

	* clutter/glx/Makefile.am: Install the clutter-glx.h header.

	* clutter/Makefile.am: Actually apply linker flags.

	* configure.ac: Use a more readable CLUTTER_API_VERSION instead
	of CLUTTER_MAJORMINOR; require gobject-2.0 with glib-2.0 >= 2.10,
	as we are using GObject and the slice allocator from glib 2.10.

	* clutter.pc.in: Add the apiversion variable.

clutter/Makefile.am

@@ -26,7 +26,7 @@ INCLUDES = \
 	$(NULL)
 
 LDADD = \
-	-version-info $(LT_VERSION_INFO) \
+	-version-info $(CLUTTER_LT_VERSION) \
 	-export-dynamic \
 	-rpath $(libdir) \
 	$(NULL)
@@ -149,20 +149,15 @@ source_h_priv = \
 	$(NULL)
 
 
-libclutter_glx_0_3_la_LIBADD = \
-	$(CLUTTER_LIBS) \
-	pango/libpangoclutter.la \
-	glx/libclutter-glx.la
-	
-libclutter_glx_0_3_la_SOURCES = \
-	$(source_c) \
-	$(source_h) \
-        $(source_h_priv)
+libclutter_glx_0_3_la_LIBADD = $(CLUTTER_LIBS) pango/libpangoclutter.la glx/libclutter-glx.la	
+libclutter_glx_0_3_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
+libclutter_glx_0_3_la_LDFLAGS = $(LDADD)
 
 #libclutter_egl_0_3_la_LIBADD = \
 #	$(CLUTTER_LIBS) \
 #	pango/libpangoclutter.la \
 #	egl/libclutter-egl.la
+#libclutter_egl_0_3_la_LDADD = $(LDADD)
 #libclutter_egl_0_3_la_SOURCES = \
 #	$(source_c) \
 #	$(source_h) \
@@ -172,7 +167,7 @@ lib_LTLIBRARIES = $(clutterbackendlib)
 
 EXTRA_LTLIBRARIES = libclutter-glx-0.3.la
 
-clutterdir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter
+clutterdir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter
 clutter_HEADERS = \
 	$(source_h) \
 	clutter-enum-types.h \

clutter/glx/Makefile.am

@@ -1,4 +1,5 @@
-libclutterincludedir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter
+libclutterincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter
+libclutterinclude_HEADERS = clutter-glx.h
 
 INCLUDES = \
 	-DG_LOG_DOMAIN=\"ClutterGLX\" \