diff options
| author | Rico Tzschichholz <ricotz@t-online.de> | 2013-07-02 14:19:05 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2013-07-02 14:19:05 +0200 |
| commit | 09a1365c3a8f78c77b5cf186b80b683e943dc9f0 (patch) | |
| tree | 4bc91af23c0d39a67daeed6d3db6ba076d2bbfa0 | |
| parent | c06389618601b4df3a799882b1afd2f8feba535b (diff) | |
| download | cogl-09a1365c3a8f78c77b5cf186b80b683e943dc9f0.tar.gz | |
build: Fix doc build and make dist
Reviewed-by: Neil Roberts <neil@linux.intel.com>
| -rw-r--r-- | doc/reference/cogl-gst/Makefile.am | 2 | ||||
| -rw-r--r-- | 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 80f07b94..36f561f2 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 89c2d132..9187ecb9 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 |