Revision 1046

trunk/contrib/GNUmakefile (revision 1046)
15 15
LIBPATH=../../build/objects/dist
16 16
endif
17 17

  
18
ifeq ($(CXX),CC)
19
CXXFLAGS:=$(CXXFLAGS) -DUSE_LAPLACE -D__SPDLL__ -D__GNUDOS__ -Dlinux -I$(ADMB_HOME)/include
20
else
21
  ifneq ($(SHELL),sh.exe)
22
    CXXFLAGS:=$(CXXFLAGS) -Wall -DUSE_LAPLACE -D__SPDLL__ -D__GNUDOS__ -Dlinux -I\"$(ADMB_HOME)/include\"
23
  else
24
    CXXFLAGS:=$(CXXFLAGS) -Wall -DUSE_LAPLACE -D__SPDLL__ -D__GNUDOS__ -Dlinux -I\"$(ADMB_HOME)\include\"
25
  endif
26
endif
27

  
28 18
ad2csv: build-ad2csv
29 19

  
30 20
all: build-statslib build-ecolib build-qfclib build-src
......
37 27
endif
38 28

  
39 29
build-statslib:
40
	$(MAKE) --directory=statslib CXX=$(CXX) CXXFLAGS="-DSAFE_ALL $(CXXFLAGS)" PREFIX_OBJ=$(LIBPATH)/saflp-contrib-statslib-
41
	$(MAKE) --directory=statslib CXX=$(CXX) CXXFLAGS="-DOPT_LIB $(CXXFLAGS)" PREFIX_OBJ=$(LIBPATH)/optlp-contrib-statslib-
30
	$(MAKE) --directory=statslib CXX=$(CXX) CXXFLAGS="-DSAFE_ALL $(CXXFLAGS) -I\"$(ADMB_HOME)/include\"" PREFIX_OBJ=$(LIBPATH)/saflp-contrib-statslib-
31
	$(MAKE) --directory=statslib CXX=$(CXX) CXXFLAGS="-DOPT_LIB $(CXXFLAGS) -I\"$(ADMB_HOME)/include\"" PREFIX_OBJ=$(LIBPATH)/optlp-contrib-statslib-
42 32
ifeq ($(SHELL),sh.exe)
43 33
	copy statslib\statsLib.h $(DISK)\contrib\include
44 34
else
......
46 36
endif
47 37

  
48 38
build-ecolib:
49
	$(MAKE) --directory=ecolib CXX=$(CXX) CXXFLAGS="-DSAFE_ALL $(CXXFLAGS)" PREFIX_OBJ=$(LIBPATH)/saflp-contrib-ecolib-
50
	$(MAKE) --directory=ecolib CXX=$(CXX) CXXFLAGS="-DOPT_LIB $(CXXFLAGS)" PREFIX_OBJ=$(LIBPATH)/optlp-contrib-ecolib-
39
	$(MAKE) --directory=ecolib CXX=$(CXX) CXXFLAGS="-DSAFE_ALL $(CXXFLAGS) -I\"$(ADMB_HOME)/include\"" PREFIX_OBJ=$(LIBPATH)/saflp-contrib-ecolib-
40
	$(MAKE) --directory=ecolib CXX=$(CXX) CXXFLAGS="-DOPT_LIB $(CXXFLAGS) -I\"$(ADMB_HOME)/include\"" PREFIX_OBJ=$(LIBPATH)/optlp-contrib-ecolib-
51 41
ifeq ($(SHELL),sh.exe)
52 42
	copy ecolib\ecolib.h $(DISK)\contrib\include
53 43
else
......
55 45
endif
56 46

  
57 47
build-qfclib:
58
	$(MAKE) --directory=qfclib CXX=$(CXX) CXXFLAGS="-DSAFE_ALL $(CXXFLAGS)" PREFIX_OBJ=$(LIBPATH)/saflp-contrib-qfclib-
59
	$(MAKE) --directory=qfclib CXX=$(CXX) CXXFLAGS="-DOPT_LIB $(CXXFLAGS)" PREFIX_OBJ=$(LIBPATH)/optlp-contrib-qfclib-
48
	$(MAKE) --directory=qfclib CXX=$(CXX) CXXFLAGS="-DSAFE_ALL $(CXXFLAGS) -I\"$(ADMB_HOME)/include\"" PREFIX_OBJ=$(LIBPATH)/saflp-contrib-qfclib-
49
	$(MAKE) --directory=qfclib CXX=$(CXX) CXXFLAGS="-DOPT_LIB $(CXXFLAGS) -I\"$(ADMB_HOME)/include\"" PREFIX_OBJ=$(LIBPATH)/optlp-contrib-qfclib-
60 50
ifeq ($(SHELL),sh.exe)
61 51
	copy qfclib\qfclib.h $(DISK)\contrib\include
62 52
else
......
74 64
endif
75 65

  
76 66
build-src:
77
	$(MAKE) --directory=src CXX=$(CXX) CXXFLAGS="-DOPT_LIB $(CXXFLAGS)" PREFIX_OBJ=$(LIBPATH)/optlp-contrib-
78
	$(MAKE) --directory=src CXX=$(CXX) CXXFLAGS="-DSAFE_ALL $(CXXFLAGS)" PREFIX_OBJ=$(LIBPATH)/saflp-contrib-
67
	$(MAKE) --directory=src CXX=$(CXX) CXXFLAGS="-DOPT_LIB $(CXXFLAGS) -I\"$(ADMB_HOME)/include\"" PREFIX_OBJ=$(LIBPATH)/optlp-contrib-
68
	$(MAKE) --directory=src CXX=$(CXX) CXXFLAGS="-DSAFE_ALL $(CXXFLAGS) -I\"$(ADMB_HOME)/include\"" PREFIX_OBJ=$(LIBPATH)/saflp-contrib-
79 69
ifeq ($(SHELL),sh.exe)
80 70
	copy src\contrib.h $(DISK)\contrib\include
81 71
else
trunk/src/GNUmakefile (revision 1046)
1 1
.NOTPARALLEL: all libs contrib
2 2

  
3
MAKEFLAGS_J=-j
4

  
5 3
ifeq ($(SHELL),sh.exe)
6 4
  DISK=..\build\dist
7 5
  LIBPATH=..\build\objects\dist
......
85 83
	mkdir -p ${DISK}/contrib/lib
86 84
	mkdir -p ${DISK}/contrib/bin
87 85
	mkdir -p ${DISK}/contrib/include
88
	$(MAKE) ADMB_HOME="${PWD}/${DISK}" --directory=../contrib
86
	$(MAKE) CXXFLAGS="$(CXXFLAGS)" ADMB_HOME="${PWD}/${DISK}" --directory=../contrib
89 87
else
90 88
	if not exist ${DISK}\contrib md ${DISK}\contrib
91 89
	if not exist ${DISK}\contrib\lib md ${DISK}\contrib\lib
92 90
	if not exist ${DISK}\contrib\bin md ${DISK}\contrib\bin
93 91
	if not exist ${DISK}\contrib\include md ${DISK}\contrib\include
94
	$(MAKE) ADMB_HOME="$(PWD)\${DISK}" --directory=..\contrib
92
	$(MAKE) CXXFLAGS="$(CXXFLAGS)" ADMB_HOME="$(PWD)\${DISK}" --directory=..\contrib
95 93
endif
96 94

  
97 95
libs: admbsaf

Also available in: Unified diff