From 64924f0e98ed06924d8968d22e5ee257ee858db1 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sun, 12 Sep 2010 19:25:47 +0100
Subject: [PATCH] build: Do not build a noinst library for the tesselator

Let's try to keep Cogl's build as non-recursive as possible, in the hope
that one day we'll be able to make it fully non-recursive along with the
rest of Clutter.
---
 clutter/cogl/cogl/Makefile.am            | 59 ++++++++++++++++++++----
 clutter/cogl/cogl/tesselator/Makefile.am | 41 ----------------
 configure.ac                             |  1 -
 3 files changed, 50 insertions(+), 51 deletions(-)
 delete mode 100644 clutter/cogl/cogl/tesselator/Makefile.am

diff --git a/clutter/cogl/cogl/Makefile.am b/clutter/cogl/cogl/Makefile.am
index 6b25a63d2..68d727a3b 100644
--- a/clutter/cogl/cogl/Makefile.am
+++ b/clutter/cogl/cogl/Makefile.am
@@ -2,13 +2,16 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 NULL =
 
-SUBDIRS = driver tesselator
+SUBDIRS = driver
 
 BUILT_SOURCES =
+
 EXTRA_DIST =
 CLEANFILES =
 DISTCLEANFILES =
 
+noinst_LTLIBRARIES =
+
 # pkg-config ==================================================================
 pc_files = \
 	cogl-$(COGL_DRIVER)-$(CLUTTER_API_VERSION).pc \
@@ -48,7 +51,6 @@ AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
 
 BUILT_SOURCES += cogl-defines.h
 DISTCLEANFILES += cogl-defines.h
-
 EXTRA_DIST += cogl-defines.h.in
 
 # public headers
@@ -73,12 +75,52 @@ cogl_public_h = \
 	$(srcdir)/cogl.h			\
 	$(NULL)
 
+# winsys sources, common to all backends
+cogl_winsys_common_sources = \
+	$(srcdir)/winsys/cogl-winsys.h				\
+	$(srcdir)/winsys/cogl-context-winsys.h          	\
+	$(srcdir)/winsys/cogl-context-winsys.c          	\
+	$(srcdir)/winsys/cogl-winsys-feature-functions.h	\
+	$(NULL)
+
+# tesselator sources
+cogl_tesselator_sources = \
+	$(srcdir)/tesselator/dict-list.h 	\
+	$(srcdir)/tesselator/dict.c 		\
+	$(srcdir)/tesselator/dict.h 		\
+	$(srcdir)/tesselator/geom.c 		\
+	$(srcdir)/tesselator/geom.h 		\
+	$(srcdir)/tesselator/gluos.h 		\
+	$(srcdir)/tesselator/memalloc.h 	\
+	$(srcdir)/tesselator/mesh.c 		\
+	$(srcdir)/tesselator/mesh.h 		\
+	$(srcdir)/tesselator/normal.c 		\
+	$(srcdir)/tesselator/normal.h 		\
+	$(srcdir)/tesselator/priorityq-heap.h 	\
+	$(srcdir)/tesselator/priorityq-sort.h 	\
+	$(srcdir)/tesselator/priorityq.c 	\
+	$(srcdir)/tesselator/priorityq.h 	\
+	$(srcdir)/tesselator/render.c 		\
+	$(srcdir)/tesselator/render.h 		\
+	$(srcdir)/tesselator/sweep.c 		\
+	$(srcdir)/tesselator/sweep.h 		\
+	$(srcdir)/tesselator/tess.c 		\
+	$(srcdir)/tesselator/tess.h 		\
+	$(srcdir)/tesselator/tesselator.h 	\
+	$(srcdir)/tesselator/tessmono.c 	\
+	$(srcdir)/tesselator/tessmono.h 	\
+	$(srcdir)/tesselator/GL/glu.h 		\
+	$(NULL)
+
+EXTRA_DIST += \
+	$(srcdir)/tesselator/README \
+	$(srcdir)/tesselator/priorityq-heap.c
+
+# sources
 cogl_sources_c = \
+	$(cogl_winsys_common_sources)			\
+	$(cogl_tesselator_sources)			\
 	$(srcdir)/cogl-debug.h 				\
-	$(srcdir)/winsys/cogl-winsys.h			\
-	$(srcdir)/winsys/cogl-context-winsys.h          \
-	$(srcdir)/winsys/cogl-context-winsys.c          \
-	$(srcdir)/winsys/cogl-winsys-feature-functions.h \
 	$(srcdir)/cogl-handle.h 			\
 	$(srcdir)/cogl-context.h			\
 	$(srcdir)/cogl-context.c			\
@@ -174,12 +216,11 @@ glib_enum_c = cogl-enum-types.c
 glib_enum_headers = $(cogl_public_h)
 include $(top_srcdir)/build/autotools/Makefile.am.enums
 
-noinst_LTLIBRARIES = libclutter-cogl.la
+noinst_LTLIBRARIES += libclutter-cogl.la
 
 libclutter_cogl_la_LIBADD = \
 	-lm $(CLUTTER_LIBS) \
-	$(top_builddir)/clutter/cogl/cogl/driver/$(COGL_DRIVER)/libclutter-cogl-driver.la \
-	$(top_builddir)/clutter/cogl/cogl/tesselator/libtesselator.la
+	$(top_builddir)/clutter/cogl/cogl/driver/$(COGL_DRIVER)/libclutter-cogl-driver.la
 
 libclutter_cogl_la_SOURCES = $(cogl_sources_c)
 nodist_libclutter_cogl_la_SOURCES = $(BUILT_SOURCES)
diff --git a/clutter/cogl/cogl/tesselator/Makefile.am b/clutter/cogl/cogl/tesselator/Makefile.am
deleted file mode 100644
index c7445063d..000000000
--- a/clutter/cogl/cogl/tesselator/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
-
-noinst_LTLIBRARIES = libtesselator.la
-
-INCLUDES = \
-	-I$(top_srcdir)/clutter/cogl             \
-	-I$(srcdir)/winsys                       \
-	-I$(srcdir)/driver/$(COGL_DRIVER)        \
-	-I$(srcdir)/clutter/cogl/cogl/tesselator \
-	-I$(top_builddir)/clutter/cogl
-
-libtesselator_la_SOURCES = \
-	dict-list.h \
-	dict.c \
-	dict.h \
-	geom.c \
-	geom.h \
-	gluos.h \
-	memalloc.h \
-	mesh.c \
-	mesh.h \
-	normal.c \
-	normal.h \
-	priorityq-heap.h \
-	priorityq-sort.h \
-	priorityq.c \
-	priorityq.h \
-	render.c \
-	render.h \
-	sweep.c \
-	sweep.h \
-	tess.c \
-	tess.h \
-	tesselator.h \
-	tessmono.c \
-	tessmono.h \
-	GL/glu.h
-
-EXTRA_DIST = \
-	README \
-	priorityq-heap.c
diff --git a/configure.ac b/configure.ac
index 91b797361..322a4d536 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1131,7 +1131,6 @@ AC_CONFIG_FILES([
         clutter/cogl/cogl/driver/Makefile
         clutter/cogl/cogl/driver/gl/Makefile
         clutter/cogl/cogl/driver/gles/Makefile
-        clutter/cogl/cogl/tesselator/Makefile
         clutter/cogl/pango/Makefile
         clutter/json/Makefile
         tests/Makefile