Revision 978

trunk/contrib/Makefile (revision 978)
1 1
all: contribs
2 2

  
3
contribs: build-statslib build-qfclib build-ecolib
3
contribs: build-src build-statslib build-qfclib build-ecolib
4 4

  
5 5
build-statslib:
6 6
	pushd statslib& ..\..\utilities\make CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" ADMB_HOME="$(ADMB_HOME)" PREFIX_OBJ=$(PREFIX_OBJ)statslib-
......
14 14
	pushd qfclib& ..\..\utilities\make CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" ADMB_HOME="$(ADMB_HOME)" PREFIX_OBJ=$(PREFIX_OBJ)qfclib-
15 15
	copy qfclib\qfclib.h $(ADMB_HOME)\contrib\include
16 16

  
17
build-contributions:
18
	pushd contributions& ..\..\utilities\make CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" ADMB_HOME="$(ADMB_HOME)" PREFIX_OBJ=$(PREFIX_OBJ)contributions-
17
build-src:
18
	pushd src& ..\..\utilities\make CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" ADMB_HOME="$(ADMB_HOME)" PREFIX_OBJ=$(PREFIX_OBJ)contributions-
19
	copy src\contrib.h $(ADMB_HOME)\contrib\include
19 20

  
20 21
test:
21 22
	cd ecolib& $(MAKE) test
trunk/contrib/GNUmakefile (revision 978)
16 16

  
17 17
all: contribs build-ad2csv
18 18

  
19
contribs: build-statslib build-ecolib build-qfclib build-contrib
19
contribs: build-statslib build-ecolib build-qfclib build-src
20 20
ifneq ($(SHELL),sh.exe)
21 21
	$(AR) -rs $(DISK)/contrib/lib/libcontrib.a ../build/objects/dist/saflp-contrib-*.obj
22 22
	$(AR) -rs $(DISK)/contrib/lib/libcontribo.a ../build/objects/dist/optlp-contrib-*.obj
......
63 63
	$(MAKE) --directory=admb2r ADMB_HOME="$(ADMB_HOME)" gcc
64 64
endif
65 65

  
66
build-contrib:
67
ifneq ($(SHELL),sh.exe)
66
build-src:
68 67
	$(MAKE) --directory=src CXX=$(CXX) CXXFLAGS="-DOPT_LIB $(CXXFLAGS)" PREFIX_OBJ=$(LIBPATH)/optlp-contrib-
69 68
	$(MAKE) --directory=src CXX=$(CXX) CXXFLAGS="-DSAFE_ALL $(CXXFLAGS)" PREFIX_OBJ=$(LIBPATH)/saflp-contrib-
69
ifeq ($(SHELL),sh.exe)
70
	copy src\contrib.h $(DISK)\contrib\include
71
else
72
	cp src/contrib.h $(DISK)/contrib/include
70 73
endif
71 74

  
72 75
test:
trunk/contrib/src/GNUmakefile (revision 978)
3 3
endif
4 4

  
5 5
all: $(addprefix $(PREFIX_OBJ), contrib.obj)
6
	cp contrib.h $(ADMB_HOME)/contrib/include
7 6

  
8 7
test:
9 8
	ADMB_HOME="$(ADMB_HOME)" PATH="$(ADMB_HOME)/bin:$(PATH)" admb simple.tpl
trunk/src/Makefile (revision 978)
25 25
	copy df1b2-separable\sed* $(DESTDIR)\bin
26 26
	copy ..\scripts\cl\*.bat $(DESTDIR)\bin
27 27
	copy ..\scripts\admb\admb.bat $(DESTDIR)\bin
28
	copy ..\scripts\admb\root-admb.bat ..\admb.bat
28 29
	copy ..\utilities\sed.exe $(DESTDIR)\bin
29 30
	copy ..\utilities\*.dll $(DESTDIR)\bin
30 31
	pushd nh99& ..\..\utilities\make  --file=Makefile CC="$(CC) /TC " DESTDIR="..\$(DESTDIR)" bins& popd
......
80 81
contribdirs:
81 82
	IF NOT EXIST $(DESTDIR)\contrib\lib md $(DESTDIR)\contrib\lib
82 83
	IF NOT EXIST $(DESTDIR)\contrib\bin md $(DESTDIR)\contrib\bin
84
	IF NOT EXIST $(DESTDIR)\contrib\include md $(DESTDIR)\contrib\include
83 85

  
84 86
libcontribsaf:
85 87
	pushd ..\contrib& $(MAKE) ADMB_HOME="$(MAKEDIR)\$(DESTDIR)" CXXFLAGS="$(CXXFLAGS_SAF)" PREFIX_OBJ="..\$(OBJDESTDIR)\saflp-contrib-"& popd

Also available in: Unified diff