diff options
| author | Chris Dyer <cdyer@cs.cmu.edu> | 2012-03-04 21:35:50 -0500 |
|---|---|---|
| committer | Chris Dyer <cdyer@cs.cmu.edu> | 2012-03-04 21:35:50 -0500 |
| commit | 5b2daa43c608d648a077d37ed8ab0217f8ce8104 (patch) | |
| tree | 8eca1b31be1b33cd769264a8969f77fa89e2a89f | |
| parent | 3c918889d86fe1deaa5d26162bf85865f1aa33bd (diff) | |
move crp stuff around
| -rw-r--r-- | gi/clda/src/Makefile.am | 11 | ||||
| -rw-r--r-- | utils/Makefile.am | 5 | ||||
| -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 |