From c5227260216d2125bd89eeb52d5d5d5062339710 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 12 Jun 2011 16:12:52 +0900
Subject: [PATCH] Move the testclip program into its own directory.

Same as with the audio test program, this is to avoid issues with
-prefer-pic.
---
 config.d/ac_config_files.m4       |  1 +
 libs/models/Makefile.am           |  8 +-------
 libs/models/test/Makefile.am      | 11 +++++++++++
 libs/models/{ => test}/testclip.c |  2 +-
 libs/models/{ => test}/trace-id.c |  0
 5 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 libs/models/test/Makefile.am
 rename libs/models/{ => test}/testclip.c (99%)
 rename libs/models/{ => test}/trace-id.c (100%)

diff --git a/config.d/ac_config_files.m4 b/config.d/ac_config_files.m4
index 80321e545..7f69f515f 100644
--- a/config.d/ac_config_files.m4
+++ b/config.d/ac_config_files.m4
@@ -17,6 +17,7 @@
 	libs/models/alias/Makefile
 	libs/models/brush/Makefile
 	libs/models/sprite/Makefile
+	libs/models/test/Makefile
 	libs/net/Makefile
 	libs/net/nc/Makefile
 	libs/net/nm/Makefile
diff --git a/libs/models/Makefile.am b/libs/models/Makefile.am
index 65e6faee6..f833fc80c 100644
--- a/libs/models/Makefile.am
+++ b/libs/models/Makefile.am
@@ -1,15 +1,9 @@
 AUTOMAKE_OPTIONS= foreign
 
-SUBDIRS= alias brush sprite
+SUBDIRS= alias brush sprite . test
 AM_CFLAGS= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 
-check_PROGRAMS=testclip
-
-testclip_SOURCES=testclip.c
-testclip_LDADD= libQFmodels.la $(top_builddir)/libs/util/libQFutil.la
-testclip_DEPENDENCIES=
-
 lib_LTLIBRARIES=	libQFmodels.la @VID_MODEL_TARGETS@
 EXTRA_LTLIBRARIES=	libQFmodels_gl.la libQFmodels_sw.la
 EXTRA_DIST=	trace-id.c
diff --git a/libs/models/test/Makefile.am b/libs/models/test/Makefile.am
new file mode 100644
index 000000000..b15de5e18
--- /dev/null
+++ b/libs/models/test/Makefile.am
@@ -0,0 +1,11 @@
+AUTOMAKE_OPTIONS= foreign
+
+INCLUDES= -I$(srcdir) -I$(top_srcdir)/include
+
+check_PROGRAMS=testclip
+
+testclip_SOURCES=testclip.c
+testclip_LDADD= $(top_builddir)/libs/models/libQFmodels.la $(top_builddir)/libs/util/libQFutil.la
+testclip_DEPENDENCIES= $(top_builddir)/libs/models/libQFmodels.la $(top_builddir)/libs/util/libQFutil.la
+
+TESTS=$(check_PROGRAMS)
diff --git a/libs/models/testclip.c b/libs/models/test/testclip.c
similarity index 99%
rename from libs/models/testclip.c
rename to libs/models/test/testclip.c
index b8ff79afa..ab644ae0b 100644
--- a/libs/models/testclip.c
+++ b/libs/models/test/testclip.c
@@ -10,7 +10,7 @@
 #ifdef TEST_ID
 # include "trace-id.c"
 #else
-# include "trace.c"
+# include "../trace.c"
 #endif
 
 mclipnode_t clipnodes0[] = {
diff --git a/libs/models/trace-id.c b/libs/models/test/trace-id.c
similarity index 100%
rename from libs/models/trace-id.c
rename to libs/models/test/trace-id.c