Revision 1198

branches/threaded2merge/tests/GNUmakefile (revision 1198)
14 14
ifeq ($(CXX),CC)
15 15
	$(CXX) -c -library=stlport4 -I$(GTEST_DIR)/include -I$(GTEST_DIR) -o $@ $(GTEST_DIR)/src/gtest-all.cc
16 16
else
17
  ifeq (m32,$(findstring m32,$(CXXFLAGS)))
18
	$(CXX) -c -m32 -I$(GTEST_DIR)/include -I$(GTEST_DIR) -o $@ $(GTEST_DIR)/src/gtest-all.cc
19
  else
17 20
	$(CXX) -c -I$(GTEST_DIR)/include -I$(GTEST_DIR) -o $@ $(GTEST_DIR)/src/gtest-all.cc
21
  endif
18 22
endif
19 23

  
20 24
googletest-read-only:
......
156 160
	$(MAKE) --directory=cov_re clean
157 161
	$(MAKE) --directory=threads clean
158 162
	$(MAKE) --directory=gtests clean
163
	@rm -vf googletest-read-only/gtest-all.o
branches/threaded2merge/src/GNUmakefile (revision 1198)
437 437
tests:
438 438
ifndef USE_ADMB_HOME
439 439
	@#$(MAKE) ADMB_HOME="${PWD}/${DISK}" --directory=../contrib test
440
	$(MAKE) ADMB_HOME="${PWD}/${DISK}" --directory=../tests
440
	$(MAKE) CXXFLAGS="${CXXFLAGS}" ADMB_HOME="${PWD}/${DISK}" --directory=../tests
441 441
else
442 442
	@#$(MAKE) ADMB_HOME="${ADMB_HOME}" --directory=../contrib test
443
	$(MAKE) ADMB_HOME="${ADMB_HOME}" --directory=../tests
443
	$(MAKE) CXXFLAGS="${CXXFLAGS}" ADMB_HOME="${ADMB_HOME}" --directory=../tests
444 444
endif
445 445

  
446 446
install:

Also available in: Unified diff