[clutter/wip/cogl-winsys-egl: 13/30] fix example makefile
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/wip/cogl-winsys-egl: 13/30] fix example makefile
- Date: Wed, 20 Apr 2011 12:59:10 +0000 (UTC)
commit f8a28f517b3118ad42e6a276fb60ab52c830f2fb
Author: Robert Bragg <robert linux intel com>
Date: Mon Apr 18 15:38:10 2011 +0100
fix example makefile
clutter/cogl/examples/Makefile.am | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/clutter/cogl/examples/Makefile.am b/clutter/cogl/examples/Makefile.am
index 7633a0e..a36befe 100644
--- a/clutter/cogl/examples/Makefile.am
+++ b/clutter/cogl/examples/Makefile.am
@@ -1,31 +1,31 @@
include $(top_srcdir)/build/autotools/Makefile.am.silent
-UNIT_TESTS = \
- hello.c
-
-if X11_TESTS
-UNIT_TESTS += x11-foreign.c
-endif
-
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/clutter/cogl \
-I$(top_builddir)/clutter/cogl
+AM_CFLAGS = \
+ $(COGL_DEP_CFLAGS) \
+ $(COGL_EXTRA_CFLAGS) \
+ -DCOGL_ENABLE_EXPERIMENTAL_2_0_API
+
+AM_CPPFLAGS = \
+ -DG_DISABLE_SINGLE_INCLUDES \
+ -DCOGL_DISABLE_DEPRECATED
+
+
common_ldadd = \
$(top_builddir)/cogl/libcogl.la \
$(top_builddir)/pango/libcoglpango.la
noinst_PROGRAMS = hello
+hello_SOURCES = hello.c
+hello_LDADD = $(common_ldadd)
+
if X11_TESTS
noinst_PROGRAMS += x11-foreign
+x11_foreign_SOURCES = x11-foreign.c
+x11_foreign_LDADD = $(common_ldadd)
endif
-
-hello_SOURCES = $(UNIT_TESTS)
-hello_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) -DCOGL_ENABLE_EXPERIMENTAL_2_0_API
-hello_CPPFLAGS = \
- -DG_DISABLE_SINGLE_INCLUDES \
- -DCOGL_DISABLE_DEPRECATED
-#hello_LDADD = $(COGL_DEP_LIBS) $(common_ldadd)
-hello_LDADD = $(common_ldadd)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]