[cogl] Remove all the options for building cogl standalone

[Robert Bragg <rbragg src gnome org>]

commit 8b4ee0964bdadf0b89a79f3fa0cd9d303b142c0b
Author: Robert Bragg <robert linux intel com>
Date:   Fri May 6 12:36:39 2011 +0100

    Remove all the options for building cogl standalone
    
    This removes all the remnants from being able to build Cogl standalone
    while it was part of the Clutter repository. Now that Cogl has been
    split out then standalone builds are the only option.

 Makefile.am                 |    6 +-----
 cogl-pango/Makefile.am      |   18 ------------------
 cogl/Makefile.am            |   26 --------------------------
 cogl/cogl-1.0-clutter.pc.in |   17 -----------------
 configure.ac                |    2 --
 5 files changed, 1 insertions(+), 68 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1aef5f3..690f2ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,9 @@
-SUBDIRS = cogl
+SUBDIRS = cogl examples po
 
 if BUILD_COGL_PANGO
 SUBDIRS += cogl-pango
 endif
 
-if COGL_STANDALONE_BUILD
-SUBDIRS += po examples
-endif
-
 ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
 
 EXTRA_DIST = README.in
diff --git a/cogl-pango/Makefile.am b/cogl-pango/Makefile.am
index 6a32e36..fe14bbc 100644
--- a/cogl-pango/Makefile.am
+++ b/cogl-pango/Makefile.am
@@ -15,44 +15,26 @@ source_h_priv = \
 	cogl-pango-glyph-cache.h    \
 	cogl-pango-pipeline-cache.h
 
-if COGL_STANDALONE_BUILD
 lib_LTLIBRARIES = libcogl-pango.la
-else
-noinst_LTLIBRARIES = libcogl-pango.la
-endif
 
 libcogl_pango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
 libcogl_pango_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
 libcogl_pango_la_LIBADD = $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
-if COGL_STANDALONE_BUILD
 libcogl_pango_la_LIBADD += $(top_builddir)/cogl/libcogl.la
 libcogl_pango_la_LDFLAGS = \
 	-export-dynamic \
 	-export-symbols-regex "^cogl.*"
 	-no-undefined \
 	-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@
-endif
 
 INCLUDES = \
 	-DG_DISABLE_SINGLE_INCLUDES	\
 	-DCLUTTER_COMPILATION		\
 	-DG_LOG_DOMAIN=\"CoglPango\"	\
 	-I$(top_srcdir)
-if !COGL_STANDALONE_BUILD
-INCLUDES += \
-	-I$(top_srcdir)/clutter		\
-	-I$(top_srcdir)/clutter/cogl	\
-	-I$(top_builddir)/clutter	\
-	-I$(top_builddir)/clutter/cogl
-endif
 
-if COGL_STANDALONE_BUILD
 cogl_pangoheadersdir = $(includedir)/cogl/cogl
 cogl_pangoheaders_HEADERS = $(source_h)
-else
-cogl_pangoheadersdir = $(includedir)/clutter- CLUTTER_API_VERSION@/cogl
-cogl_pangoheaders_HEADERS = $(source_h)
-endif
 
 pc_files = cogl-pango-1.0.pc \
 	   cogl-pango-$(COGL_API_VERSION).pc
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 70f666a..d21dd7b 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -23,18 +23,6 @@ INCLUDES = \
 	-I$(srcdir)/driver/$(COGL_DRIVER) 	\
 	$(NULL)
 
-if COGL_STANDALONE_BUILD
-INCLUDES += \
-	-I$(top_srcdir)/clutter/cogl		\
-	-I$(top_builddir)/clutter/cogl          \
-	$(NULL)
-else
-INCLUDES += \
-	-I$(top_srcdir)/clutter/cogl		\
-	-I$(top_builddir)/clutter/cogl          \
-	$(NULL)
-endif
-
 AM_CPPFLAGS = \
 	-DG_DISABLE_SINGLE_INCLUDES 	\
 	-DG_DISABLE_DEPRECATED		\
@@ -55,9 +43,7 @@ pc_files = \
 	cogl-1.0.pc \
 	cogl-gl-1.0.pc
 
-if COGL_STANDALONE_BUILD
 pc_files += cogl-$(COGL_API_VERSION).pc
-endif
 
 cogl-gl-1.0.pc: cogl-1.0.pc
 	$(QUIET_GEN)cp -f $< $(@F)
@@ -355,17 +341,12 @@ glib_enum_c = cogl-enum-types.c
 glib_enum_headers = $(cogl_public_h)
 include $(top_srcdir)/build/autotools/Makefile.am.enums
 
-if COGL_STANDALONE_BUILD
 lib_LTLIBRARIES += libcogl.la
-else
-noinst_LTLIBRARIES += libcogl.la
-endif
 
 libcogl_la_LIBADD = -lm $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
 if SUPPORT_GLX
 libcogl_la_LIBADD += -ldl
 endif
-if COGL_STANDALONE_BUILD
 # XXX: The aim is to eventually get rid of all private API exports
 # for cogl-pango.
 libcogl_la_LDFLAGS = \
@@ -373,7 +354,6 @@ libcogl_la_LDFLAGS = \
 	-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \
 	-export-dynamic \
 	-export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_foreach_sub_texture_in_region|_cogl_atlas_texture_new_with_size).*"
-endif
 
 libcogl_la_SOURCES = $(cogl_sources_c)
 nodist_libcogl_la_SOURCES = $(BUILT_SOURCES)
@@ -384,15 +364,9 @@ cogl_headers = \
 	$(srcdir)/cogl-deprecated.h \
 	$(NULL)
 
-if COGL_STANDALONE_BUILD
 coglincludedir = $(includedir)/cogl/cogl
 coglinclude_HEADERS = $(cogl_headers) $(cogl_experimental_h)
 nodist_coglinclude_HEADERS = cogl-defines.h cogl-enum-types.h
-else
-coglincludedir = $(includedir)/clutter- CLUTTER_API_VERSION@/cogl
-coglinclude_HEADERS = $(cogl_headers) $(cogl_experimental_h)
-nodist_coglinclude_HEADERS = cogl-defines.h cogl-enum-types.h
-endif
 
 -include $(INTROSPECTION_MAKEFILE)
 
diff --git a/configure.ac b/configure.ac
index 1e0c930..5c424e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -611,8 +611,6 @@ AM_CONDITIONAL(SUPPORT_X11, [test "x$SUPPORT_X11" = "xyes"])
 AM_CONDITIONAL(SUPPORT_XLIB, [test "x$SUPPORT_XLIB" = "xyes"])
 
 
-AM_CONDITIONAL(COGL_STANDALONE_BUILD, [true])
-
 dnl ================================================================
 dnl Compiler stuff.
 dnl ================================================================