Revision 1378

trunk/contrib/ad2csv/Makefile (revision 1378)
1 1
SHELL=cmd
2 2

  
3 3
all:
4
	..\..\admb ad2csv.cpp main.cpp
4
	..\..\admb.cmd ad2csv.cpp main.cpp
5 5
	copy ad2csv.exe ..\..\build\dist\contrib\bin
6

  
6 7
clean:
7 8
	del ad2csv.obj
8 9
	del main.obj
trunk/tests/expm/Makefile (revision 1378)
1
ADMB_HOME=$(ADMB_HOME)
2
PATH=$(ADMB_HOME)\bin;$(PATH)
3

  
4 1
all: expm
5 2

  
6 3
expm: expm.tpl
7
	admb expm.tpl
4
	..\..\admb expm.tpl
8 5
	expm
9 6

  
10 7
clean:
trunk/tests/expm/GNUmakefile (revision 1378)
3 3
all: clean $(TARGET) run
4 4

  
5 5
$(TARGET): $(TARGET).tpl $(TARGET).dat
6
	ADMB_HOME="$(ADMB_HOME)" PATH="$(ADMB_HOME)/bin:${PATH}" admb -s $(TARGET)
6
	../../admb $(TARGET)
7 7

  
8 8
run:
9 9
	@printf "Started run:\n"
trunk/src/GNUmakefile (revision 1378)
31 31
  OBJSDIR=../build/objects/dist/
32 32
endif
33 33

  
34
ifdef CXX
35
  USER_CXX:= $(CXX)
36
endif
34 37
ifdef CXXFLAGS
38
  USER_CXXFLAGS:= $(CXXFLAGS)
35 39
  CXXFLAGS:= $(CXXFLAGS)
36 40
endif
41
ifdef LDFLAGS
42
  USER_LDFLAGS:= $(LDFLAGS)
43
endif
37 44

  
38 45
ifdef DEBUG
39 46
  CXXFLAGS:= -g$(CXXFLAGS)
40 47
else
41 48
  ifeq ($(CXX),openCC)
42
    CXXFLAGS_PRE:= -O2$(CXXFLAGS)
49
    CXXFLAGS:= -O2$(CXXFLAGS)
43 50
  else
44
    CXXFLAGS_PRE:= -O3$(CXXFLAGS)
51
    CXXFLAGS:= -O3$(CXXFLAGS)
45 52
  endif
46 53
endif
47 54

  
......
53 60
CXXFLAGS:= -Wall $(CXXFLAGS)
54 61
endif
55 62

  
56
CXXFLAGS_DEFINES:=-D__GNUDOS__ -Dlinux -D__SPDLL__ -DUSE_LAPLACE
63
CXXFLAGS:= $(CXXFLAGS) -DSAFE_ALL -D__GNUDOS__ -Dlinux -D__SPDLL__ -DUSE_LAPLACE
57 64

  
58 65
ifeq ($(SHELL),sh.exe)
59
CXXFLAGS_INCLUDES:=-I..\build\dist\include
66
CXXFLAGS:= $(CXXFLAGS) -I..\build\dist\include
60 67
else
61
CXXFLAGS_INCLUDES:=-I../build/dist/include
68
CXXFLAGS:= $(CXXFLAGS) -I../build/dist/include
62 69
endif
63 70

  
64
CXXFLAGS_OPT:=$(CXXFLAGS) -DOPT_LIB $(CXXFLAGS_DEFINES) $(CXXFLAGS_INCLUDES)
65
CXXFLAGS_SAFE:=$(CXXFLAGS) -DSAFE_ALL $(CXXFLAGS_DEFINES) $(CXXFLAGS_INCLUDES)
71
CXXFLAGS_OPT_LIB:=$(subst -DSAFE_ALL,-DOPT_LIB,$(CXXFLAGS))
66 72

  
67 73
include df1b2-separable/objects.lst
68 74
OBJECTS=$(addprefix optlp-df1b2-separable-,$(OBJ0)) $(addprefix saflp-df1b2-separable-,$(OBJ0))
......
111 117
	if not exist ${DIST}\contrib\lib md ${DIST}\contrib\lib
112 118
	if not exist ${DIST}\contrib\bin md ${DIST}\contrib\bin
113 119
	if not exist ${DIST}\contrib\include md ${DIST}\contrib\include
114
	$(MAKE) CXXFLAGS_OPT_CONTRIB="$(subst -I,-I..\,$(CXXFLAGS_OPT))" CXXFLAGS_SAFE_CONTRIB="$(subst -I,-I..\,$(CXXFLAGS_SAFE))" ADMB_HOME="$(PWD)\${DIST}" --directory=..\contrib
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff