From b82f874b464b252c5f3bbb5e903197a048034430 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Thu, 22 Oct 2009 15:39:30 +0100 Subject: [PATCH] Remove cogl/{gl,gles}/Makefile.am These are no longer used anywhere. --- clutter/cogl/gl/Makefile.am | 62 ------------------------ clutter/cogl/gles/Makefile.am | 88 ----------------------------------- 2 files changed, 150 deletions(-) delete mode 100644 clutter/cogl/gl/Makefile.am delete mode 100644 clutter/cogl/gles/Makefile.am diff --git a/clutter/cogl/gl/Makefile.am b/clutter/cogl/gl/Makefile.am deleted file mode 100644 index 0bb839a38..000000000 --- a/clutter/cogl/gl/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -include $(top_srcdir)/build/autotools/Makefile.am.silent - -NULL = - -cogl_headers = \ - $(top_builddir)/clutter/cogl/cogl-defines-gl.h \ - $(top_srcdir)/clutter/cogl/cogl-color.h \ - $(top_srcdir)/clutter/cogl/cogl-deprecated.h \ - $(top_srcdir)/clutter/cogl/cogl-fixed.h \ - $(top_srcdir)/clutter/cogl/cogl-offscreen.h \ - $(top_srcdir)/clutter/cogl/cogl-path.h \ - $(top_srcdir)/clutter/cogl/cogl-shader.h \ - $(top_srcdir)/clutter/cogl/cogl-bitmap.h \ - $(top_srcdir)/clutter/cogl/cogl-texture.h \ - $(top_srcdir)/clutter/cogl/cogl-types.h \ - $(top_srcdir)/clutter/cogl/cogl-vertex-buffer.h \ - $(top_srcdir)/clutter/cogl/cogl-material.h \ - $(top_srcdir)/clutter/cogl/cogl-matrix.h \ - $(top_srcdir)/clutter/cogl/cogl-debug.h \ - $(NULL) - -cogl_priv_headers = \ - cogl-fbo.h \ - cogl-shader-private.h \ - cogl-program.h \ - cogl-context.h \ - $(NULL) - -cogl_sources = \ - cogl.c \ - cogl-primitives.c \ - cogl-texture-driver.c \ - cogl-fbo.c \ - cogl-shader.c \ - cogl-program.c \ - cogl-context-driver.c \ - $(NULL) - -INCLUDES = \ - -I$(top_srcdir)/clutter/cogl \ - -I$(top_srcdir)/clutter/cogl/common \ - -I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \ - -I$(top_srcdir)/clutter \ - -I$(top_builddir)/clutter \ - -I$(top_builddir)/clutter/cogl \ - -DG_DISABLE_SINGLE_INCLUDES \ - -DG_LOG_DOMAIN=\"Cogl-GL\" \ - -DCLUTTER_COMPILATION - -noinst_LTLIBRARIES = libclutter-cogl-gl.la - -libclutter_cogl_gl_la_CPPFLAGS = $(CLUTTER_CFLAGS) $(COGL_DEBUG_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS) -libclutter_cogl_gl_la_LIBADD = -lm $(CLUTTER_LIBS) $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la -libclutter_cogl_gl_la_DEPENDENCIES = $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la -libclutter_cogl_gl_la_SOURCES = \ - $(top_builddir)/clutter/cogl/cogl.h \ - $(cogl_headers) \ - $(cogl_priv_headers) \ - $(cogl_sources) \ - $(NULL) - -EXTRA_DIST = cogl-defines.h.in diff --git a/clutter/cogl/gles/Makefile.am b/clutter/cogl/gles/Makefile.am deleted file mode 100644 index bfe56c4a3..000000000 --- a/clutter/cogl/gles/Makefile.am +++ /dev/null @@ -1,88 +0,0 @@ -include $(top_srcdir)/build/autotools/Makefile.am.silent - -libclutterincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl -libclutterinclude_HEADERS = \ - $(top_builddir)/clutter/cogl/cogl.h \ - $(top_builddir)/clutter/cogl/cogl-defines-gles.h \ - $(top_builddir)/clutter/cogl/cogl-color.h \ - $(top_builddir)/clutter/cogl/cogl-deprecated.h \ - $(top_builddir)/clutter/cogl/cogl-fixed.h \ - $(top_builddir)/clutter/cogl/cogl-offscreen.h \ - $(top_builddir)/clutter/cogl/cogl-path.h \ - $(top_builddir)/clutter/cogl/cogl-shader.h \ - $(top_builddir)/clutter/cogl/cogl-bitmap.h \ - $(top_builddir)/clutter/cogl/cogl-texture.h \ - $(top_builddir)/clutter/cogl/cogl-types.h \ - $(top_builddir)/clutter/cogl/cogl-vertex-buffer.h \ - $(top_builddir)/clutter/cogl/cogl-material.h \ - $(top_builddir)/clutter/cogl/cogl-matrix.h \ - $(top_builddir)/clutter/cogl/cogl-debug.h - -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/clutter \ - -I$(top_srcdir)/clutter/cogl \ - -I$(top_srcdir)/clutter/cogl/common \ - -I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \ - -I$(top_builddir)/clutter \ - -I$(top_builddir)/clutter/cogl \ - -DG_DISABLE_SINGLE_INCLUDES \ - -DG_LOG_DOMAIN=\"Cogl-GLES\" \ - -DCLUTTER_COMPILATION - -noinst_LTLIBRARIES = libclutter-cogl-gles.la - -libclutter_cogl_gles_la_CPPFLAGS = $(CLUTTER_CFLAGS) $(COGL_DEBUG_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS) -libclutter_cogl_gles_la_LIBADD = -lm $(CLUTTER_LIBS) $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la -libclutter_cogl_gles_la_DEPENDENCIES = $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la -libclutter_cogl_gles_la_SOURCES = \ - $(top_builddir)/clutter/cogl/cogl.h \ - $(top_builddir)/clutter/cogl/cogl-defines-gles.h \ - $(top_builddir)/clutter/cogl/cogl-color.h \ - $(top_builddir)/clutter/cogl/cogl-deprecated.h \ - $(top_builddir)/clutter/cogl/cogl-fixed.h \ - $(top_builddir)/clutter/cogl/cogl-offscreen.h \ - $(top_builddir)/clutter/cogl/cogl-path.h \ - $(top_builddir)/clutter/cogl/cogl-shader.h \ - $(top_builddir)/clutter/cogl/cogl-bitmap.h \ - $(top_builddir)/clutter/cogl/cogl-texture.h \ - $(top_builddir)/clutter/cogl/cogl-types.h \ - $(top_builddir)/clutter/cogl/cogl-debug.h \ - cogl-fbo.h \ - cogl-context.h \ - cogl.c \ - cogl-primitives.c \ - cogl-texture-driver.c \ - cogl-fbo.c \ - cogl-context-driver.c \ - cogl-gles2-wrapper.h \ - cogl-program.h \ - cogl-program.c \ - cogl-shader-private.h \ - cogl-shader.c - -if USE_GLES2_WRAPPER -libclutter_cogl_gles_la_SOURCES += \ - cogl-gles2-wrapper.c \ - cogl-fixed-vertex-shader.h \ - cogl-fixed-vertex-shader.c \ - cogl-fixed-fragment-shader.h \ - cogl-fixed-fragment-shader.c -endif - -EXTRA_DIST = cogl-defines.h.in \ - stringify.sh \ - cogl-fixed-vertex-shader.glsl \ - cogl-fixed-fragment-shader.glsl - -BUILT_SOURCES = \ - cogl-fixed-vertex-shader.h \ - cogl-fixed-vertex-shader.c \ - cogl-fixed-fragment-shader.h \ - cogl-fixed-fragment-shader.c - -%.h: $(srcdir)/%.glsl - /bin/sh $(srcdir)/stringify.sh -h $< > $@ -%.c: $(srcdir)/%.glsl - /bin/sh $(srcdir)/stringify.sh $< > $@ -