Revision 919

trunk/src/GNUmakefile (revision 919)
47 47
	rm -rf `find ${DISK} -type d -name .svn`
48 48

  
49 49
contrib: includes bins libs
50
	mkdir -p ${DISK}/contrib/include
51 50
	mkdir -p ${DISK}/contrib/lib
52 51
	mkdir -p ${DISK}/contrib/bin
53 52
	$(MAKE) ADMB_HOME="${PWD}/${DISK}" --directory=../contrib
trunk/src/Makefile (revision 919)
76 76
contrib: contribdirs libcontribsaf libcontribopt
77 77

  
78 78
contribdirs:
79
	IF NOT EXIST $(DESTDIR)\contrib\include md $(DESTDIR)\contrib\include
80 79
	IF NOT EXIST $(DESTDIR)\contrib\lib md $(DESTDIR)\contrib\lib
81 80
	IF NOT EXIST $(DESTDIR)\contrib\bin md $(DESTDIR)\contrib\bin
82 81

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

  
3 3
contribs: build-statslib build-qfclib build-ecolib
4
	copy contrib.h $(ADMB_HOME)\contrib\include
5 4

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

  
17
build-contributions:
18
	pushd contributions& ..\..\utilities\make CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" ADMB_HOME="$(ADMB_HOME)" PREFIX_OBJ=$(PREFIX_OBJ)contributions-
19

  
18 20
test:
19 21
	cd ecolib& $(MAKE) test
20 22
	cd qfclib& $(MAKE) test
trunk/contrib/GNUmakefile (revision 919)
11 11
all: contribs build-ad2csv
12 12

  
13 13
contribs: build-statslib build-ecolib build-qfclib build-sample
14
ifeq ($(SHELL),sh.exe)
15
	copy contrib.h $(ADMB_HOME)\contrib\include
16
else
14
ifneq ($(SHELL),sh.exe)
17 15
	$(AR) -rs $(ADMB_HOME)/contrib/lib/libcontrib.a ../build/objects/dist/saflp-contrib-*.obj
18 16
	$(AR) -rs $(ADMB_HOME)/contrib/lib/libcontribo.a ../build/objects/dist/optlp-contrib-*.obj
19
	cp contrib.h $(ADMB_HOME)/contrib/include
20 17
endif
21 18

  
22 19

  

Also available in: Unified diff