Revision 1129

trunk/tests/colfill/GNUmakefile (revision 1129)
4 4
all: clean $(TARGET) run gtest
5 5

  
6 6
gtest: gtest-all.o gtest.cpp
7
	CXXFLAGS=-I$(GTEST_DIR)/include ../../admb gtest.cpp gtest-all.o
7
	CXXFLAGS=-I$(GTEST_DIR)/include LDFLAGS=-pthread ../../admb gtest.cpp gtest-all.o
8 8
	./gtest
9 9

  
10 10
gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc
trunk/tests/GNUmakefile (revision 1129)
1 1
all: test-expm test-cov_re
2 2

  
3
gtest: gtest-colfill
4

  
5
gtest-colfill: googletest-read-only
6
	$(MAKE) --directory=colfill
7

  
8
googletest-read-only:
9
	svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only
10

  
3 11
svn: svn-geolocation
4 12

  
5 13
main: test-geolocation test-cov_re
......
107 115
beta3:
108 116
	OPTIONS=-s $(MAKE) --directory=$@
109 117

  
110
gtest: gtest-colfill
111

  
112
gtest-colfill: googletest-read-only
113
	$(MAKE) --directory=colfill
114

  
115
googletest-read-only:
116
	svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only
117

  
118 118
clean:
119 119
	$(MAKE) --directory=geolocation clean
120 120
	$(MAKE) --directory=expm clean
trunk/scripts/admb/adlink (revision 1129)
13 13

  
14 14
if [ -f "$ADMB_HOME/bin/admb-cfg.sh" ]; then
15 15
  source "$ADMB_HOME/bin/admb-cfg.sh"
16
  CXX=$ADMB_CFG_CXX
17
  LDFLAGS=$LDFLAGS $ADMB_CFG_LDFLAGS
16 18
else
17 19
  CXX=c++
18 20
fi
trunk/scripts/admb/adcomp (revision 1129)
13 13

  
14 14
if [ -f "$ADMB_HOME/bin/admb-cfg.sh" ]; then
15 15
  source "$ADMB_HOME/bin/admb-cfg.sh"
16
  CXX=$ADMB_CFG_CXX
17
  CXXFLAGS=$CXXFLAGS $ADMB_CFG_CXXFLAGS
16 18
else
17 19
  CXX=c++
18 20
fi
trunk/src/GNUmakefile (revision 1129)
384 384
	cp ../scripts/admb/adlink ${DISK}/bin
385 385
  endif
386 386
	rm -f ${DISK}/bin/admb-cfg.sh
387
	echo "CXX=$(CXX)" > ${DISK}/bin/admb-cfg.sh
388
	echo "CXXFLAGS=$(CXXFLAGS)" >> ${DISK}/bin/admb-cfg.sh
387
	echo "ADMB_CFG_CXX=$(CXX)" > ${DISK}/bin/admb-cfg.sh
388
	echo "ADMB_CFG_CXXFLAGS=$(CXXFLAGS)" >> ${DISK}/bin/admb-cfg.sh
389 389
  ifeq ($(OS),Windows_NT)
390
	echo "LDFLAGS=-static $(LDFLAGS)" >> ${DISK}/bin/admb-cfg.sh
390
	echo "ADMB_CFG_LDFLAGS=-static $(LDFLAGS)" >> ${DISK}/bin/admb-cfg.sh
391 391
  else
392
	echo "LDFLAGS=$(LDFLAGS)" >> ${DISK}/bin/admb-cfg.sh
392
	echo "ADMB_CFG_LDFLAGS=$(LDFLAGS)" >> ${DISK}/bin/admb-cfg.sh
393 393
  endif
394 394
	$(MAKE) --directory=df1b2-separable CC=$(CC) DISKDIR=../${DISK} bins
395 395
	$(MAKE) --directory=nh99 CC=$(CC) DISKDIR=../${DISK} bins

Also available in: Unified diff