From 4d98bdd9e5620391705eca4ae34fcde4b4ebbce3 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Mon, 2 Sep 2013 17:33:07 +0100 Subject: [PATCH] Fix building the conformance and unit tests on mingw32 The unit tests were failing to build with mingw32 because the libtest-fixtures was being included both by libcogl and the test-conformance and test-unit executables. That meant that the symbols were defined twice and it wouldn't link. The rule which depends on test-unit being built needs to be called test-unit.exe on Windows so this patch fixes it to use the $(EXEEXT) variable to get the right name. Reviewed-by: Robert Bragg (cherry picked from commit 575bac47fee0b425f4fd30761e5819443e6c045f) Conflicts: tests/conform/Makefile.am tests/unit/Makefile.am --- tests/conform/Makefile.am | 1 - tests/unit/Makefile.am | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am index c4fae0ec1..5678630ae 100644 --- a/tests/conform/Makefile.am +++ b/tests/conform/Makefile.am @@ -143,7 +143,6 @@ test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) test_conformance_LDADD = \ $(COGL_DEP_LIBS) \ $(top_builddir)/cogl/libcogl.la \ - $(top_builddir)/test-fixtures/libtest-fixtures.la \ $(LIBM) if !USE_GLIB test_conformance_LDADD += $(top_builddir)/deps/glib/libglib.la diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 7ed2e0e6f..1a7fbeffc 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -17,7 +17,7 @@ endif wrappers: stamp-test-unit @true -stamp-test-unit: Makefile test-unit +stamp-test-unit: Makefile test-unit$(EXEEXT) @mkdir -p wrappers source $(top_builddir)/cogl/libcogl.la ; \ $(NM) $(top_builddir)/cogl/.libs/"$$dlname"| \ @@ -73,7 +73,6 @@ test_unit_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) test_unit_LDADD = \ $(COGL_DEP_LIBS) \ $(top_builddir)/cogl/libcogl.la \ - $(top_builddir)/test-fixtures/libtest-fixtures.la \ $(LIBM) if !USE_GLIB test_unit_LDADD += $(top_builddir)/deps/glib/libglib.la