[cogl/cogl-1.16] build: Fix doc build and make dist
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.16] build: Fix doc build and make dist
- Date: Tue, 2 Jul 2013 12:21:16 +0000 (UTC)
commit 09a1365c3a8f78c77b5cf186b80b683e943dc9f0
Author: Rico Tzschichholz <ricotz t-online de>
Date: Tue Jul 2 14:19:05 2013 +0200
build: Fix doc build and make dist
Reviewed-by: Neil Roberts <neil linux intel com>
doc/reference/cogl-gst/Makefile.am | 2 +-
tests/conform/Makefile.am | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/doc/reference/cogl-gst/Makefile.am b/doc/reference/cogl-gst/Makefile.am
index 80f07b9..36f561f 100644
--- a/doc/reference/cogl-gst/Makefile.am
+++ b/doc/reference/cogl-gst/Makefile.am
@@ -88,7 +88,7 @@ AM_CPPFLAGS=\
$(COGL_GST_DEP_CFLAGS)
GTKDOC_LIBS=\
- $(top_builddir)/cogl/libcogl2.la \
+ $(top_builddir)/cogl/libcogl.la \
$(top_builddir)/cogl-gst/libcogl-gst.la \
$(COGL_DEP_LIBS) \
$(COGL_GST_DEP_LIBS)
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index 89c2d13..9187ecb 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -155,8 +155,7 @@ TEST_PROGS = test-conformance
.PHONY: test
-EXTRA_DIST = test-launcher.sh.in run-tests.sh
-DISTCLEANFILES = test-launcher.sh .gitignore
+DISTCLEANFILES = .gitignore
dist-hook: ../../build/win32/vs9/test-conformance-cogl.vcproj
../../build/win32/vs10/test-conformance-cogl.vcxproj
../../build/win32/vs10/test-conformance-cogl.vcxproj.filters
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]