Revision 975 trunk/contrib/GNUmakefile

GNUmakefile (revision 975)
16 16

  
17 17
all: contribs build-ad2csv
18 18

  
19
contribs: build-statslib build-ecolib build-qfclib build-sample
19
contribs: build-statslib build-ecolib build-qfclib build-contrib
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-sample:
66
build-contrib:
67 67
ifneq ($(SHELL),sh.exe)
68
	$(MAKE) --directory=sample CXX=$(CXX) CXXFLAGS="-DOPT_LIB $(CXXFLAGS)" PREFIX_OBJ=$(LIBPATH)/optlp-contrib-sample-
69
	$(MAKE) --directory=sample CXX=$(CXX) CXXFLAGS="-DSAFE_ALL $(CXXFLAGS)" PREFIX_OBJ=$(LIBPATH)/saflp-contrib-sample-
68
	$(MAKE) --directory=src CXX=$(CXX) CXXFLAGS="-DOPT_LIB $(CXXFLAGS)" PREFIX_OBJ=$(LIBPATH)/optlp-contrib-
69
	$(MAKE) --directory=src CXX=$(CXX) CXXFLAGS="-DSAFE_ALL $(CXXFLAGS)" PREFIX_OBJ=$(LIBPATH)/saflp-contrib-
70 70
endif
71 71

  
72 72
test:
73
	$(MAKE) --directory=sample ADMB_HOME="$(ADMB_HOME)" test 
73
	$(MAKE) --directory=src ADMB_HOME="$(ADMB_HOME)" test 
74 74

  
75 75
test-needR:
76 76
	$(MAKE) --directory=ecolib ADMB_HOME="$(ADMB_HOME)" test
......
80 80
	@$(MAKE) --directory=ecolib clean
81 81
	@$(MAKE) --directory=qfclib clean
82 82
	@$(MAKE) --directory=statslib clean
83
	@$(MAKE) --directory=sample clean
83
	@$(MAKE) --directory=src clean

Also available in: Unified diff