[avida-cvs] avida CVS commits: /current/source/testsuites/unit_testsuites Makefile.am /current/source/testsuites/unit_testsuites/level_0 Makefile.am /current/source/testsuites/unit_testsuites/level_1 Makefile.am

[kaben]

kaben		Tue Dec 30 01:09:34 2003 EDT

  Modified files:              
    /avida/current/source/testsuites/unit_testsuites	Makefile.am 
    /avida/current/source/testsuites/unit_testsuites/level_0	
                                                            	Makefile.am 
    /avida/current/source/testsuites/unit_testsuites/level_1	
                                                            	Makefile.am 
  Log:
  
  Removed support for mockpp libraries in various Makefile.ams.
  
  
  
Index: avida/current/source/testsuites/unit_testsuites/Makefile.am
diff -u avida/current/source/testsuites/unit_testsuites/Makefile.am:1.1 avida/current/source/testsuites/unit_testsuites/Makefile.am:1.2
--- avida/current/source/testsuites/unit_testsuites/Makefile.am:1.1	Tue Nov 25 09:37:59 2003
+++ avida/current/source/testsuites/unit_testsuites/Makefile.am	Tue Dec 30 01:09:33 2003
@@ -17,10 +17,7 @@
 	$(BLD_DIR)/tools/libtools.a \
 	$(BLD_DIR)/main/libmain.a \
 	$(BLD_DIR)/third-party/trio/libtrio.a \
-  $(BLD_DIR)/third-party/yaktest/libyaktest.a \
-  $(BLD_DIR)/third-party/mockpp/libmockpp.a \
-  $(BLD_DIR)/third-party/mockpp/compat/libcompat.a \
-  $(BLD_DIR)/third-party/mockpp/util/libutil.a
+  $(BLD_DIR)/third-party/yaktest/libyaktest.a
 
 LINK = $(CXXLINK)
 LDADD = $(UNITTEST_LIBS)
Index: avida/current/source/testsuites/unit_testsuites/level_0/Makefile.am
diff -u avida/current/source/testsuites/unit_testsuites/level_0/Makefile.am:1.1 avida/current/source/testsuites/unit_testsuites/level_0/Makefile.am:1.2
--- avida/current/source/testsuites/unit_testsuites/level_0/Makefile.am:1.1	Tue Nov 25 09:37:59 2003
+++ avida/current/source/testsuites/unit_testsuites/level_0/Makefile.am	Tue Dec 30 01:09:34 2003
@@ -15,10 +15,7 @@
 	$(BLD_DIR)/tools/libtools.a \
 	$(BLD_DIR)/main/libmain.a \
 	$(BLD_DIR)/third-party/trio/libtrio.a \
-  $(BLD_DIR)/third-party/yaktest/libyaktest.a \
-  $(BLD_DIR)/third-party/mockpp/libmockpp.a \
-  $(BLD_DIR)/third-party/mockpp/compat/libcompat.a \
-  $(BLD_DIR)/third-party/mockpp/util/libutil.a
+  $(BLD_DIR)/third-party/yaktest/libyaktest.a
 
 LINK = $(CXXLINK)
 LDADD = $(UNITTEST_LIBS)
Index: avida/current/source/testsuites/unit_testsuites/level_1/Makefile.am
diff -u avida/current/source/testsuites/unit_testsuites/level_1/Makefile.am:1.1 avida/current/source/testsuites/unit_testsuites/level_1/Makefile.am:1.2
--- avida/current/source/testsuites/unit_testsuites/level_1/Makefile.am:1.1	Tue Nov 25 09:38:00 2003
+++ avida/current/source/testsuites/unit_testsuites/level_1/Makefile.am	Tue Dec 30 01:09:34 2003
@@ -13,18 +13,13 @@
 TOOLS_INC = -I$(TOOLS_DIR)
 MAIN_DIR = $(SOURCE_DIR)/main
 MAIN_INC = -I$(MAIN_DIR)
-MOCKPP_DIR = $(SOURCE_DIR)/third-party
-MOCKPP_INC = -I$(MOCKPP_DIR)
 
-INCLUDES = $(EVENT_INC) $(CPU_INC) $(TOOLS_INC) $(MAIN_INC) $(MOCKPP_INC) $(SOURCE_INC) 
+INCLUDES = $(EVENT_INC) $(CPU_INC) $(TOOLS_INC) $(MAIN_INC) $(SOURCE_INC) 
 
 BLD_DIR = ../../..
 
 UNITTEST_LIBS = \
-  $(BLD_DIR)/third-party/yaktest/libyaktest.a \
-  $(BLD_DIR)/third-party/mockpp/libmockpp.a \
-  $(BLD_DIR)/third-party/mockpp/compat/libcompat.a \
-  $(BLD_DIR)/third-party/mockpp/util/libutil.a
+  $(BLD_DIR)/third-party/yaktest/libyaktest.a
 
 # cInstruction test
 #if DEFAULT_TESTS