Revision 1376

trunk/tests/GNUmakefile (revision 1376)
115 115
	OPTIONS=-s $(MAKE) --directory=$@
116 116

  
117 117
clean:
118
ifeq ($(SHELL),sh.exe)
119
	$(MAKE) --directory=expm --file=Makefile clean
120
else
121
	$(MAKE) --directory=expm clean
122
endif
123

  
124
clean2:
118 125
	$(MAKE) --directory=geolocation clean
119
	$(MAKE) --directory=expm clean
120 126
	$(MAKE) --directory=priors clean
121 127
	$(MAKE) --directory=beta_regression clean
122 128
	$(MAKE) --directory=hysimple clean
trunk/src/GNUmakefile (revision 1376)
1
ifeq ($(SHELL),sh.exe)
2
  PWD=$(shell cd)
3
  PATH:=$(PWD)\..\utilities;$(PATH)
4
  ifdef MINGW_HOME
5
    PATH:=$(MINGW_HOME)\bin;$(PATH)
1
ifeq ($(OS),Windows_NT)
2
  ifeq ($(SHELL),sh.exe)
3
    PWD=$(shell cd)
4
    ifdef MINGW_HOME
5
      PATH:=$(MINGW_HOME)\bin;$(PATH)
6
    else
7
     PATH:=$(PWD)\..\utilities\mingw\bin;$(PATH)
8
    endif
9
    PATH:=$(PWD)\..\utilities;$(PATH)
6 10
  else
7
    HAS_CXX=$(shell $(CXX) --version && echo %ERRORLEVEL%)
8
    HAS_CC=$(shell $(CC) --version && echo %ERRORLEVEL%)
9
    ifeq ("$(HAS_CXX)","")
10
      HAS_CXX2=$(shell $(PWD)\..\utilities\mingw\bin\g++ --version && echo %ERRORLEVEL%)
11
      HAS_CC2=$(shell $(PWD)\..\utilities\mingw\bin\gcc --version && echo %ERRORLEVEL%)
12
      ifneq ("$(HAS_CXX2)","")
13
        PATH:=$(PWD)\..\utilities\mingw\bin;$(PATH)
14
      endif
11
    PWD=$(shell pwd)
12
    ifdef MINGW_HOME
13
      PATH:=$(MINGW_HOME)/bin:$(PATH)
14
    else
15
     PATH:=$(PWD)/../utilities/mingw/bin:$(PATH)
15 16
    endif
17
    PATH:=$(PWD)/../utilities:$(PATH)
16 18
  endif
19
endif
20

  
21
ifeq ($(SHELL),sh.exe)
17 22
  DIST=..\build\dist
18 23
  LIBSDIR=$(DIST)\lib
19 24
  LIBSDIR:=$(subst  ,\,$(LIBSDIR))
......
24 29
  DIST=../build/dist
25 30
  LIBSDIR=$(DIST)/lib/
26 31
  OBJSDIR=../build/objects/dist/
27
  PWD=$(shell pwd)
28 32
endif
29 33

  
30 34
ifdef CXXFLAGS
......
143 147
	if not exist ${DIST}\bin md ${DIST}\bin
144 148
	copy df1b2-separable\seddf1b* ${DIST}\bin
145 149
	copy df1b2-separable\sedf1b2* ${DIST}\bin
146
	if exist ${DIST}\bin\admb-cfg.bat del ${DIST}\bin\admb-cfg.bat
147 150
	echo set ADMB_CFG_CXX=$(CXX)>${DIST}\bin\admb-cfg.bat
148 151
	echo set ADMB_CFG_CXXFLAGS=$(CXXFLAGS)>>${DIST}\bin\admb-cfg.bat
149 152
	echo set ADMB_CFG_LDFLAGS=$(LDFLAGS)>>${DIST}\bin\admb-cfg.bat
......
170 173
  else
171 174
	cp ../scripts/admb/adlink ${DIST}/bin
172 175
  endif
173
	rm -f ${DIST}/bin/admb-cfg.sh
174
	echo "ADMB_CFG_CXX=$(CXX)">${DIST}/bin/admb-cfg.sh
175
	echo "ADMB_CFG_CXXFLAGS=$(CXXFLAGS)">>${DIST}/bin/admb-cfg.sh
176
	echo "ADMB_CFG_CXX=\"$(CXX)\"">${DIST}/bin/admb-cfg.sh
177
	echo "ADMB_CFG_CXXFLAGS=\"$(CXXFLAGS)\"">>${DIST}/bin/admb-cfg.sh
176 178
  ifeq ($(OS),Windows_NT)
177
	echo "ADMB_CFG_LDFLAGS=-static $(LDFLAGS)">>${DIST}/bin/admb-cfg.sh
179
	echo "ADMB_CFG_LDFLAGS=\"-static $(LDFLAGS)\"">>${DIST}/bin/admb-cfg.sh
178 180
  else
179
	echo "ADMB_CFG_LDFLAGS=$(LDFLAGS)">>${DIST}/bin/admb-cfg.sh
181
	echo "ADMB_CFG_LDFLAGS=\"$(LDFLAGS)\"">>${DIST}/bin/admb-cfg.sh
180 182
  endif
181 183
	$(MAKE) --directory=df1b2-separable CC=$(CC) DISKDIR=../${DIST} bins
182 184
	$(MAKE) --directory=nh99 CC=$(CC) DISKDIR=../${DIST} bins
183 185
  ifeq ($(OS),Windows_NT)
184
	cp ../scripts/mingw/set-admb-mingw.bat ${DIST}/bin
185 186
	cp ../utilities/sed.exe ${DIST}/bin
186 187
	cp ../utilities/libiconv2.dll ${DIST}/bin
187 188
	cp ../utilities/libintl3.dll ${DIST}/bin
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff