Revision 1389 trunk/src/GNUmakefile

GNUmakefile (revision 1389)
8 8
    ifdef MINGW_HOME
9 9
      PATH:=$(MINGW_HOME)\bin;$(PATH)
10 10
    else
11
     PATH:=$(PWD)\..\utilities\mingw\bin;$(PATH)
11
      PATH:=$(PWD)\..\utilities\mingw\bin;$(PATH)
12 12
    endif
13
    PATH:=$(PWD)\..\utilities;$(PATH)
13
    PATH:=$(PATH);$(PWD)\..\utilities
14 14
  else
15 15
    PWD=$(shell pwd)
16 16
    ifdef MINGW_HOME
17 17
      PATH:=$(MINGW_HOME)/bin:$(PATH)
18 18
    else
19
     PATH:=$(PWD)/../utilities/mingw/bin:$(PATH)
19
      PATH:=$(PWD)/../utilities/mingw/bin:$(PATH)
20 20
    endif
21
    PATH:=$(PWD)/../utilities:$(PATH)
21
    PATH:=$(PATH):$(PWD)/../utilities
22 22
  endif
23 23
endif
24 24

  
......
38 38
ifdef CXX
39 39
  USER_CXX:= $(CXX)
40 40
endif
41

  
41 42
ifdef CXXFLAGS
42 43
  USER_CXXFLAGS:= $(CXXFLAGS)
43 44
  CXXFLAGS:= $(CXXFLAGS)
44 45
endif
46

  
45 47
ifdef LDFLAGS
46 48
  USER_LDFLAGS:= $(LDFLAGS)
47 49
endif
......
121 123
	if not exist ${DIST}\contrib\lib md ${DIST}\contrib\lib
122 124
	if not exist ${DIST}\contrib\bin md ${DIST}\contrib\bin
123 125
	if not exist ${DIST}\contrib\include md ${DIST}\contrib\include
124
	$(MAKE) CXXFLAGS_OPT_CONTRIB="$(subst -I,-I..\,$(CXXFLAGS_OPT_LIB))" CXXFLAGS_SAFE_CONTRIB="$(subst -I,-I..\,$(CXXFLAGS))" DIST=${DIST} --directory=..\contrib
126
	$(MAKE) DIST=${DIST} --directory=..\contrib
125 127
else
126 128
	mkdir -p ${DIST}/contrib/lib
127 129
	mkdir -p ${DIST}/contrib/bin
128 130
	mkdir -p ${DIST}/contrib/include
129
	$(MAKE) CXXFLAGS_OPT_CONTRIB="$(subst -I,-I../,$(CXXFLAGS_OPT_LIB))" CXXFLAGS_SAFE_CONTRIB="$(subst -I,-I../,$(CXXFLAGS))" DIST=${DIST} --directory=../contrib
131
	$(MAKE) DIST=${DIST} --directory=../contrib
130 132
endif
131 133

  
132 134
dist: libs bins docs
135
ifeq ($(SHELL),sh.exe)
136
	if not exist ${DIST}\contrib md ${DIST}\contrib
137
	xcopy ..\contrib $(DIST)\contrib /S /Y /D
138
	if not exist ${DIST}\docs md ${DIST}\docs
139
	xcopy ..\docs $(DIST)\docs /S /Y /D
140
	if not exist ${DIST}\examples md ${DIST}\examples
141
	xcopy ..\examples $(DIST)\examples /S /Y /D
142
	if not exist ${DIST}\src md ${DIST}\src
143
	xcopy ..\src $(DIST)\src /S /Y /D
144
	if not exist ${DIST}\scripts md ${DIST}\scripts
145
	xcopy ..\scripts $(DIST)\scripts /S /Y /D
146
	if not exist ${DIST}\tests md ${DIST}\tests
147
	xcopy ..\tests $(DIST)\tests /S /Y /D
148
	if not exist ${DIST}\utilities md ${DIST}\utilities
149
	xcopy ..\utilities $(DIST)\utilities /S /Y /D
150
	copy /Y ..\LICENSE.txt ${DIST}
151
	copy /Y ..\README.txt ${DIST}
152
	copy /Y ..\CHANGES.txt ${DIST}
153
	copy /Y ..\VERSION ${DIST}
154
	copy /Y ..\Makefile ${DIST}
155
else
156
	cp -R ../contrib ${DIST}
157
	cp -R ../docs ${DIST} 
158
	cp -R ../examples ${DIST}
159
	cp -R ../src ${DIST}
160
	cp -R ../scripts ${DIST}
161
	cp -R ../tests ${DIST}
162
	cp -R ../utilities ${DIST}
163
	cp -f ../LICENSE.txt ${DIST}
164
	cp -f ../README.txt ${DIST}
165
	cp -f ../CHANGES.txt ${DIST}
166
	cp -f ../VERSION ${DIST}
167
	cp -f ../Makefile ${DIST}
168
endif
133 169

  
134 170
libs: includes objects_dir objects
135 171
ifeq ($(SHELL),sh.exe)
......
161 197
	echo set ADMB_CFG_CXXFLAGS=$(USER_CXXFLAGS)>>${DIST}\bin\admb-cfg.bat
162 198
	echo set ADMB_CFG_LDFLAGS=$(USER_LDFLAGS)>>${DIST}\bin\admb-cfg.bat
163 199
	echo set MINGW_HOME=$(MINGW_HOME)>>${DIST}\bin\admb-cfg.bat
164
	$(MAKE) --directory=df1b2-separable CC=$(CC) DISKDIR=..\${DIST} bins
165
	$(MAKE) --directory=nh99 CC=$(CC) DISKDIR=..\${DIST} bins
166
	copy ..\scripts\mingw\set-admb-mingw.bat ${DIST}\bin
167 200
	copy ..\utilities\sed.exe ${DIST}\bin
168 201
	copy ..\utilities\libiconv2.dll ${DIST}\bin
169 202
	copy ..\utilities\libintl3.dll ${DIST}\bin
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff