Revision 1419 trunk/src/GNUmakefile

GNUmakefile (revision 1419)
107 107

  
108 108
all: revision dist contrib
109 109
	@echo ADMB build completed.
110
	@echo For installation, check README.txt.
110
	@echo Check README.txt for usage and installation information.
111 111

  
112 112
shared: includes objects
113 113
	$(CXX) -shared -o${DIST}/lib/libadmb.so ../build/objects/dist/saflp-*.obj
114 114
	$(CXX) -shared -o${DIST}/lib/libadmbo.so ../build/objects/dist/optlp-*.obj
115 115
	@echo ADMB shared build completed.
116
	@echo For installation, check README.txt.
116
	@echo Check README.txt for usage and installation information.
117 117

  
118 118
revision:
119 119
ifeq ($(SHELL),sh.exe)
......
209 209
	copy ..\scripts\admb\admb.bat ${DIST}\bin\admb.cmd
210 210
	copy ..\scripts\admb\root-admb.bat ..\admb.cmd
211 211
	copy ..\scripts\admb\root-admb.bat ${DIST}\admb.cmd
212
	copy ..\scripts\admb\adlink.bat ${DIST}\bin\adlink.cmd
213
	copy ..\scripts\admb\adcomp.bat ${DIST}\bin\adcomp.cmd
212 214
	$(MAKE) --directory=df1b2-separable CC=$(CC) DIST=..\${DIST} bins
213 215
	$(MAKE) --directory=nh99 CC=$(CC) DIST=..\${DIST} bins
214 216
else
......
221 223
	echo "ADMB_CFG_CXXFLAGS=\"$(USER_CXXFLAGS)\"">>${DIST}/bin/admb-cfg.sh
222 224
  ifeq ($(OS),Windows_NT)
223 225
	echo "ADMB_CFG_LDFLAGS=\"-static $(USER_LDFLAGS)\"">>${DIST}/bin/admb-cfg.sh
226
	echo "MINGW_HOME=\"$(MINGW_HOME)\"">>${DIST}/bin/admb-cfg.sh
224 227
	cp ../utilities/sed.exe ${DIST}/bin
225 228
	cp ../utilities/libiconv2.dll ${DIST}/bin
226 229
	cp ../utilities/libintl3.dll ${DIST}/bin
......
228 231
	cp ../scripts/admb/admb ${DIST}/bin/admb.sh
229 232
	cp ../scripts/admb/root-admb ../admb.sh
230 233
	cp ../scripts/admb/root-admb ${DIST}/admb.sh
234
	cp ../scripts/admb/adcomp ${DIST}/bin/adcomp.sh
235
	cp ../scripts/admb/adlink ${DIST}/bin/adlink.sh
231 236
	cp ../scripts/admb/admb.bat ${DIST}/bin/admb.cmd
232 237
	cp ../scripts/admb/root-admb.bat ../admb.cmd
233 238
	cp ../scripts/admb/root-admb.bat ${DIST}/admb.cmd
239
	cp ../scripts/admb/adcomp.bat ${DIST}/bin/adcomp.cmd
240
	cp ../scripts/admb/adlink.bat ${DIST}/bin/adlink.cmd
234 241
  else
235 242
	echo "ADMB_CFG_LDFLAGS=\"$(USER_LDFLAGS)\"">>${DIST}/bin/admb-cfg.sh
243
	echo "MINGW_HOME=\"$(MINGW_HOME)\"">>${DIST}/bin/admb-cfg.sh
236 244
	cp ../scripts/admb/admb ${DIST}/bin
237 245
	cp ../scripts/admb/adlink ${DIST}/bin
238 246
	cp ../scripts/admb/adcomp ${DIST}/bin
......
246 254
docs:
247 255

  
248 256
docs2:
249
ifeq ($(SHELL),sh.exe)
250
	$(MAKE) --directory=..\docs
251
else
252
	$(MAKE) --directory=../docs
253
endif
257
	$(MAKE) --directory=docs
254 258

  
255 259
includes:
256 260
ifeq ($(SHELL),sh.exe)

Also available in: Unified diff