Revision 1383 trunk/src/GNUmakefile

GNUmakefile (revision 1383)
21 21
ifeq ($(SHELL),sh.exe)
22 22
  DIST=..\build\dist
23 23
  LIBSDIR=$(DIST)\lib
24
  LIBSDIR:=$(subst  ,\,$(LIBSDIR))
24
  LIBSDIR:=$(addsuffix \,$(LIBSDIR))
25 25
  OBJSDIR=..\build\objects\dist
26
  OBJSDIR:=$(subst  ,\,$(OBJSDIR))
26
  OBJSDIR:=$(addsuffix \,$(OBJSDIR))
27 27
else
28 28
  INSTALL_DIR=/usr/local/
29 29
  DIST=../build/dist
......
117 117
	if not exist ${DIST}\contrib\lib md ${DIST}\contrib\lib
118 118
	if not exist ${DIST}\contrib\bin md ${DIST}\contrib\bin
119 119
	if not exist ${DIST}\contrib\include md ${DIST}\contrib\include
120
	$(MAKE) CXXFLAGS_OPT_CONTRIB="$(subst -I,-I..\,$(CXXFLAGS_OPT_LIB))" CXXFLAGS_SAFE_CONTRIB="$(subst -I,-I..\,$(CXXFLAGS))" ADMB_HOME="$(PWD)\${DIST}" --directory=..\contrib
120
	$(MAKE) CXXFLAGS_OPT_CONTRIB="$(subst -I,-I..\,$(CXXFLAGS_OPT_LIB))" CXXFLAGS_SAFE_CONTRIB="$(subst -I,-I..\,$(CXXFLAGS))" DIST=${DIST} --directory=..\contrib
121 121
else
122 122
	mkdir -p ${DIST}/contrib/lib
123 123
	mkdir -p ${DIST}/contrib/bin
124 124
	mkdir -p ${DIST}/contrib/include
125
	$(MAKE) CXXFLAGS_OPT_CONTRIB="$(subst -I,-I../,$(CXXFLAGS_OPT_LIB))" CXXFLAGS_SAFE_CONTRIB="$(subst -I,-I../,$(CXXFLAGS))" ADMB_HOME="$(PWD)/${DIST}" --directory=../contrib
125
	$(MAKE) CXXFLAGS_OPT_CONTRIB="$(subst -I,-I../,$(CXXFLAGS_OPT_LIB))" CXXFLAGS_SAFE_CONTRIB="$(subst -I,-I../,$(CXXFLAGS))" DIST=${DIST} --directory=../contrib
126 126
endif
127 127

  
128 128
dist: libs bins docs
......
391 391
endif
392 392

  
393 393
tests:
394
ifndef USE_ADMB_HOME
395
	$(MAKE) ADMB_HOME="${PWD}/${DIST}" --directory=../contrib test
396
	$(MAKE) ADMB_HOME="${PWD}/${DIST}" --directory=../tests
394
ifeq ($(SHELL),sh.exe)
395
	$(MAKE) --directory=..\contrib test
396
	$(MAKE) --directory=..\tests
397 397
else
398
	$(MAKE) ADMB_HOME="${ADMB_HOME}" --directory=../contrib test
399
	$(MAKE) ADMB_HOME="${ADMB_HOME}" --directory=../tests
398
	$(MAKE) --directory=../contrib test
399
	$(MAKE) --directory=../tests
400 400
endif
401 401

  
402 402
install:

Also available in: Unified diff