Revision 1475

trunk/src/GNUmakefile (revision 1475)
100 100

  
101 101
all: dist
102 102
ifeq ($(SHELL),cmd)
103
	-svnversion .. > ${DIST}\REVISION
104 103
	if not exist $(DIST)\utilities md $(DIST)\utilities
105 104
	xcopy ..\utilities $(DIST)\utilities /S /Y /D
106
	if not exist $(DIST)\include\contrib md $(DIST)\include\contrib
107
	echo " ">$(DIST)\include\contrib\contrib.h
108 105
else
109
	-svnversion .. > ${DIST}/REVISION
110 106
	cp -vR ../utilities ${DIST}
111
	mkdir -p $(DIST)/include/contrib
112
	touch $(DIST)/include/contrib/contrib.h
113 107
endif
114 108
	@echo ADMB build completed.
115 109
	@echo Check README.txt for usage and installation information.
116 110

  
117 111
shared: all
118 112
ifeq ($(SHELL),cmd)
119
	cd ..\build\objects\dist & $(CXX) -static -shared -o ..\..\dist\lib\admbo.dll optlp-*.obj
120
	cd ..\build\objects\dist & $(CXX) -static -shared -o ..\..\dist\lib\admb.dll saflp-*.obj
113
	pushd ..\build\objects\dist & $(CXX) -static -shared -o..\..\dist\lib\admbo.dll optlp-*.obj
114
	pushd ..\build\objects\dist & $(CXX) -static -shared -o..\..\dist\lib\admb.dll saflp-*.obj
121 115
else
122 116
	$(CXX) -shared -o../build/dist/lib/libadmbo.so ../build/objects/dist/optlp-*.obj
123 117
	$(CXX) -shared -o../build/dist/lib/libadmb.so ../build/objects/dist/saflp-*.obj
......
157 151
	copy ..\scripts\admb\root-admb.bat ${DIST}\admb.cmd
158 152
	copy ..\scripts\admb\adlink.bat ${DIST}\bin\adlink.cmd
159 153
	copy ..\scripts\admb\adcomp.bat ${DIST}\bin\adcomp.cmd
154
	if not exist $(DIST)\include\contrib md $(DIST)\include\contrib
155
	echo " ">$(DIST)\include\contrib\contrib.h
160 156
	$(MAKE) --directory=df1b2-separable CC=gcc DIST=..\${DIST} bins
161 157
	$(MAKE) --directory=nh99 CC=gcc DIST=..\${DIST} bins
162 158
else
......
187 183
	ln -sf bin/admb ${DIST}
188 184
	ln -sf build/dist/bin/admb ..
189 185
  endif
186
	mkdir -p $(DIST)/include/contrib
187
	touch $(DIST)/include/contrib/contrib.h
190 188
	$(MAKE) --directory=df1b2-separable CC=$(CC) DIST=../${DIST} bins
191 189
	$(MAKE) --directory=nh99 CC=$(CC) DIST=../${DIST} bins
192 190
endif
trunk/contrib/GNUmakefile (revision 1475)
33 33

  
34 34
shared: all
35 35
ifeq ($(SHELL),cmd)
36
	$(CXX) -static -shared -o src\$(CONTRIB_LIB)\contrib.dll src\$(CONTRIB_OBJS_DIR)\saflp-contrib-*.obj ..\build\dist\lib\admb.dll
37
	$(CXX) -static -shared -o src\$(CONTRIB_LIB)\contribo.dll src\$(CONTRIB_OBJS_DIR)\optlp-contrib-*.obj ..\build\dist\lib\admbo.dll
36
	pushd ..\build\objects\contrib & $(CXX) -static -shared -o ..\..\dist\contrib\lib\contrib.dll saflp-*.obj ..\..\dist\lib\admb.dll
37
	pushd ..\build\objects\contrib & $(CXX) -static -shared -o ..\..\dist\contrib\lib\contribo.dll optlp-*.obj ..\..\dist\lib\admbo.dll
38 38
else
39
	$(CXX) -shared -o../build/dist/contrib/lib/libcontrib.so ../build/objects/contrib/saflp-contrib-*.obj ../build/dist/lib/libadmb.so
40
	$(CXX) -shared -o../build/dist/contrib/lib/libcontribo.so ../build/objects/contrib/optlp-contrib-*.obj ../build/dist/lib/libadmbo.so
39
	$(CXX) -shared -o../build/dist/contrib/lib/libcontrib.so saflp-*.obj ../build/dist/lib/libadmb.so
40
	$(CXX) -shared -o../build/dist/contrib/lib/libcontribo.so optlp-*.obj ../build/dist/lib/libadmbo.so
41 41
endif
42 42
	@echo ADMB contrib shared build completed.
43 43

  

Also available in: Unified diff