Revision 1093 trunk/src/GNUmakefile

GNUmakefile (revision 1093)
7 7
    TERMINAL=cygwin
8 8
  else
9 9
    TERMINAL=dos
10
    SHELL=cmd
10 11
  endif
11 12
endif
12 13

  
......
23 24
  PWD=$(shell pwd)
24 25
endif
25 26

  
26
ifeq ($(TERMINAL),dos)
27
CXXFLAGS:=-I..\build\dist\include $(CXXFLAGS)
28
else
29
CXXFLAGS:=-I../build/dist/include $(CXXFLAGS)
27
CXXFLAGS:=$(CXXFLAGS) -D__GNUDOS__ -Dlinux -D__SPDLL__ -DUSE_LAPLACE
28

  
29
ifdef BUILD_SHARED_LIBRARY
30
CXXFLAGS:=-fPIC $(CXXFLAGS)
30 31
endif
31 32

  
32
CXXFLAGS:=-D__GNUDOS__ -Dlinux -D__SPDLL__ -DUSE_LAPLACE $(CXXFLAGS)
33

  
34 33
ifneq ($(CXX),CC)
35 34
CXXFLAGS:=-Wall $(CXXFLAGS)
36 35
endif
37 36

  
38
ifdef BUILD_SHARED_LIBRARY
39
CXXFLAGS:=-fPIC $(CXXFLAGS)
40
endif
41

  
42 37
ifdef DEBUG
43 38
CXXFLAGS:=-g $(CXXFLAGS)
44 39
else
45 40
CXXFLAGS:=-O3 $(CXXFLAGS)
46 41
endif
47 42

  
43
CXXFLAGS_CONTRIB:=$(CXXFLAGS)
44

  
45
ifeq ($(TERMINAL),dos)
46
CXXFLAGS:=$(CXXFLAGS) -I..\build\dist\include
47
else
48
CXXFLAGS:=$(CXXFLAGS) -I../build/dist/include
49
endif
50

  
48 51
include df1b2-separable/objects.lst
49 52
ifeq ($(TERMINAL),dos)
50 53
OPTLP_DF1B2_SEPARABLE_OBJS=$(sort $(addprefix ..\build\objects\dist\optlp-df1b2-separable-,$(OBJ0)))
......
146 149
	if not exist ${DISK}\contrib\lib md ${DISK}\contrib\lib
147 150
	if not exist ${DISK}\contrib\bin md ${DISK}\contrib\bin
148 151
	if not exist ${DISK}\contrib\include md ${DISK}\contrib\include
149
	$(MAKE) CXXFLAGS="$(CXXFLAGS)" ADMB_HOME="$(PWD)\${DISK}" --directory=..\contrib
152
	$(MAKE) CXXFLAGS="$(CXXFLAGS_CONTRIB)" ADMB_HOME="$(PWD)\${DISK}" --directory=..\contrib
150 153
else
151 154
	mkdir -p ${DISK}/contrib/lib
152 155
	mkdir -p ${DISK}/contrib/bin
153 156
	mkdir -p ${DISK}/contrib/include
154
	$(MAKE) CXXFLAGS="$(CXXFLAGS)" ADMB_HOME="${PWD}/${DISK}" --directory=../contrib
157
	$(MAKE) CXXFLAGS="$(CXXFLAGS_CONTRIB)" ADMB_HOME="${PWD}/${DISK}" --directory=../contrib
155 158
endif
156 159

  
157 160
libs: $(OPTLP_DF1B2_SEPARABLE_OBJS) $(SAFLP_DF1B2_SEPARABLE_OBJS) $(OPTLP_LINAD99_OBJS) $(SAFLP_LINAD99_OBJS) $(OPTLP_NH99_OBJS) $(SAFLP_NH99_OBJS) $(OPTLP_TOOLS99_OBJS) $(SAFLP_TOOLS99_OBJS)

Also available in: Unified diff