summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Dyer <cdyer@cs.cmu.edu>2012-03-04 21:35:50 -0500
committerChris Dyer <cdyer@cs.cmu.edu>2012-03-04 21:35:50 -0500
commit630df0c09911d1b6d813b6524492320d7ceae9c1 (patch)
tree286ed1d352f86743467e9aba2453fefe15e31bc0
parent9aca7f30dda576a453eee64bb4ff0e8bd11a9b85 (diff)
move crp stuff around
-rw-r--r--gi/clda/src/Makefile.am11
-rw-r--r--utils/Makefile.am5
-rw-r--r--utils/crp_test.cc (renamed from gi/clda/src/crp_test.cc)0
3 files changed, 4 insertions, 12 deletions
diff --git a/gi/clda/src/Makefile.am b/gi/clda/src/Makefile.am
index 3aab17da..cdca1f97 100644
--- a/gi/clda/src/Makefile.am
+++ b/gi/clda/src/Makefile.am
@@ -1,14 +1,3 @@
-if HAVE_GTEST
-noinst_PROGRAMS = \
- crp_test
-
-TESTS = crp_test
-
-crp_test_SOURCES = crp_test.cc
-crp_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
-
-endif
-
bin_PROGRAMS = clda
clda_SOURCES = clda.cc
diff --git a/utils/Makefile.am b/utils/Makefile.am
index bb067ed9..5153ae20 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -6,13 +6,14 @@ TESTS = ts phmt mfcr_test
if HAVE_GTEST
noinst_PROGRAMS += \
+ crp_test \
dict_test \
m_test \
weights_test \
logval_test \
small_vector_test
-TESTS += small_vector_test logval_test weights_test dict_test m_test
+TESTS += crp_test small_vector_test logval_test weights_test dict_test m_test
endif
reconstruct_weights_SOURCES = reconstruct_weights.cc
@@ -50,6 +51,8 @@ mfcr_test_SOURCES = mfcr_test.cc
mfcr_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
weights_test_SOURCES = weights_test.cc
weights_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
+crp_test_SOURCES = weights_test.cc
+crp_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
logval_test_SOURCES = logval_test.cc
logval_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
small_vector_test_SOURCES = small_vector_test.cc
diff --git a/gi/clda/src/crp_test.cc b/utils/crp_test.cc
index 561cd4dd..561cd4dd 100644
--- a/gi/clda/src/crp_test.cc
+++ b/utils/crp_test.cc