Revision 1306

trunk/src/GNUmakefile (revision 1306)
20 20
  DISK=..\build\dist
21 21
  LIBPATH=..\build\objects\dist
22 22
  PWD=$(shell cd)
23
  PATH:=$(PATH);..\utilities\mingw\bin;..\utilities
23
  ifndef NO_UTILITIES
24
  PATH:=..\utilities\mingw\bin;..\utilities;$(PATH)
25
  endif
24 26
else
25 27
  DISK=../build/dist
26 28
  LIBPATH=../build/objects/dist
......
222 224

  
223 225
ifeq ($(TERMINAL),dos)
224 226
..\build\objects\dist\optlp-nh99-banner.obj: nh99\banner.cpp
225
	$(CXX) -c $(CXXFLAGS_OPT) -DADMB_VERSION=$(shell cat ../../VERSION) -DADMB_REVISION=$(shell test -e ../../REVISION && cat ../../REVISION) -o$@ $<
227
	$(CXX) -c $(CXXFLAGS_OPT) -DADMB_VERSION=$(shell cat ../VERSION) -DADMB_REVISION=$(shell test -f ../REVISION && cat ../REVISION) -o$@ $<
226 228

  
227 229
..\build\objects\dist\saflp-nh99-banner.obj: nh99\banner.cpp
228
	$(CXX) -c $(CXXFLAGS_SAFE) -DADMB_VERSION=$(shell cat ../../VERSION) -DADMB_REVISION=$(shell test -e ../../REVISION && cat ../../REVISION) -o$@ $<
230
	$(CXX) -c $(CXXFLAGS_SAFE) -DADMB_VERSION=$(shell cat ../VERSION) -DADMB_REVISION=$(shell test -f ../REVISION && cat ../REVISION) -o$@ $<
229 231

  
230 232
..\build\objects\dist\optlp-sparse-hs_sparse.obj: sparse\hs_sparse.cpp
231 233
	$(CXX) -c $(CXXFLAGS_OPT) -o$@ $<
......
258 260
	$(CXX) -c $(CXXFLAGS_SAFE) -o$@ $<
259 261
else
260 262
../build/objects/dist/optlp-nh99-banner.obj: nh99/banner.cpp
261
	$(CXX) -c $(CXXFLAGS_OPT) -DADMB_VERSION=$(shell cat ../../VERSION) -DADMB_REVISION=$(shell test -e ../../REVISION && cat ../../REVISION) -o$@ $<
263
	$(CXX) -c $(CXXFLAGS_OPT) -DADMB_VERSION=$(shell cat ../VERSION) -DADMB_REVISION=$(shell test -f ../REVISION && cat ../REVISION) -o$@ $<
262 264

  
263 265
../build/objects/dist/saflp-nh99-banner.obj: nh99/banner.cpp
264
	$(CXX) -c $(CXXFLAGS_SAFE) -DADMB_VERSION=$(shell cat ../../VERSION) -DADMB_REVISION=$(shell test -e ../../REVISION && cat ../../REVISION) -o$@ $<
266
	$(CXX) -c $(CXXFLAGS_SAFE) -DADMB_VERSION=$(shell cat ../VERSION) -DADMB_REVISION=$(shell test -f ../REVISION && cat ../REVISION) -o$@ $<
265 267

  
266 268
../build/objects/dist/optlp-sparse-hs_sparse.obj: sparse/hs_sparse.cpp
267 269
	$(CXX) -c $(CXXFLAGS_OPT) -o$@ $<
......
408 410

  
409 411
verify:
410 412
ifeq ($(TERMINAL),dos)
411
	$(MAKE) ADMB_HOME="$(CURDIR)\${DISK}" PATH="$(CURDIR)\${DISK}\bin:$(PATH):$(CURDIR)\..\utilities:$(CURDIR)\..\utilities\mingw\bin" -C $(DISK)\examples --file=Makefile all
413
  ifdef NO_UTILITIES
414
	$(MAKE) ADMB_HOME="$(CURDIR)\${DISK}" PATH="$(CURDIR)\${DISK}\bin:$(PATH)" -C $(DISK)\examples --file=Makefile all
415
  else
416
	$(MAKE) ADMB_HOME="$(CURDIR)\${DISK}" PATH="$(CURDIR)\${DISK}\bin:$(CURDIR)\..\utilities:$(CURDIR)\..\utilities\mingw\bin:$(PATH)" -C $(DISK)\examples --file=Makefile all
417
  endif
412 418
	pushd ..\build\dist & ..\..\scripts\get-outputs.bat > "..\..\benchmarks-saf.txt" & popd
413
	$(MAKE) ADMB_HOME="$(CURDIR)\${DISK}" PATH="$(CURDIR)\${DISK}\bin:$(PATH):$(CURDIR)\..\utilities:$(CURDIR)\..\utilities\mingw\bin" FAST_OPTION=1 -C $(DISK)\examples --file=Makefile all
419
  ifdef NO_UTILITIES
420
	$(MAKE) ADMB_HOME="$(CURDIR)\${DISK}" PATH="$(CURDIR)\${DISK}\bin:$(PATH)" FAST_OPTION=1 -C $(DISK)\examples --file=Makefile all
421
  else
422
	$(MAKE) ADMB_HOME="$(CURDIR)\${DISK}" PATH="$(CURDIR)\${DISK}\bin:$(CURDIR)\..\utilities:$(CURDIR)\..\utilities\mingw\bin:$(PATH)" FAST_OPTION=1 -C $(DISK)\examples --file=Makefile all
423
  endif
414 424
	pushd ..\build\dist & ..\..\scripts\get-outputs.bat > "..\..\benchmarks-saf.txt" & popd
415 425
else
416 426
	PATH="${PWD}/${DISK}/bin:$(PATH)" $(MAKE) -C $(DISK)/examples all

Also available in: Unified diff