Changeset 22847 for main/trunk/greenstone3/build.xml
- Timestamp:
- 2010-09-03T15:47:50+12:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r22846 r22847 216 216 </and> 217 217 </condition> 218 218 219 219 <condition property="static.arg" value="LDFLAGS=-static" else=" "> 220 220 <isset property="compile.static"/> … … 224 224 <if><bool><isset property="use.support.lib"/></bool> 225 225 <if><bool><isset property="env.CFLAGS"/></bool> 226 <property name="cflags.arg" value=" CFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CFLAGS}"/>226 <property name="cflags.arg" value="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CFLAGS}"/> 227 227 <else> 228 <property name="cflags.arg" value=" CFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include"/>228 <property name="cflags.arg" value="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include"/> 229 229 </else> 230 230 </if> … … 236 236 <if><bool><isset property="use.support.lib"/></bool> 237 237 <if><bool><isset property="env.CPPFLAGS"/></bool> 238 <property name="cppflags.arg" value=" CPPFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CPPFLAGS}"/>238 <property name="cppflags.arg" value="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CPPFLAGS}"/> 239 239 <else> 240 <property name="cppflags.arg" value=" CPPFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include"/>240 <property name="cppflags.arg" value="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include"/> 241 241 </else> 242 242 </if> … … 248 248 <if><bool><isset property="use.support.lib"/></bool> 249 249 <if><bool><isset property="env.CXXFLAGS"/></bool> 250 <property name="cxxflags.arg" value=" CXXFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CXXFLAGS}"/>250 <property name="cxxflags.arg" value="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CXXFLAGS}"/> 251 251 <else> 252 <property name="cxxflags.arg" value=" CXXFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include"/>252 <property name="cxxflags.arg" value="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include"/> 253 253 </else> 254 254 </if> 255 255 <else> 256 256 <property name="cxxflags.arg" value=" "/> 257 </else> 258 </if> 259 260 <if><bool><isset property="use.support.lib"/></bool> 261 <if><bool><isset property="env.LDFLAGS"/></bool> 262 <property name="ldflags.arg" value="-L${basedir}/ext/gnome-lib/${os.bin.dir}/lib ${env.LDFLAGS}"/> 263 <else> 264 <property name="ldflags.arg" value="-L${basedir}/ext/gnome-lib/${os.bin.dir}/lib"/> 265 </else> 266 </if> 267 <else> 268 <property name="ldflags.arg" value=" "/> 257 269 </else> 258 270 </if> … … 1345 1357 <arg value="--bindir=${basedir}/bin"/> 1346 1358 <arg value="${static.arg}"/> 1347 <env key="CFLAGS" value="${cflags.arg}"/>1348 <env key="CPPFLAGS" value="${cppflags.arg}"/>1349 <env key="CXXFLAGS" value="${cxxflags.arg}"/>1350 1359 </exec> 1351 1360 <exec executable="make" dir="${src.packages.home}/search4j" failonerror="true"/> … … 1440 1449 <arg value="--bindir=${gs2build.home}/bin/${os.bin.dir}"/> <!-- what value to use?? --> 1441 1450 <arg line="${gs2.opt.args}"/> 1442 <arg line="${static.arg} "/>1451 <arg line="${static.arg} ${ldflags.arg}"/> 1443 1452 <env key="CFLAGS" value="${cflags.arg}"/> 1444 1453 <env key="CPPFLAGS" value="${cppflags.arg}"/> … … 1480 1489 <env key="CPPFLAGS" value="${cppflags.arg}"/> 1481 1490 <env key="CXXFLAGS" value="${cxxflags.arg}"/> 1491 <env key="LDFLAGS" value="${ldflags.arg}"/> 1482 1492 </exec> 1483 1493 <!-- windows: --> … … 1761 1771 <arg value="--prefix=${gs2build.home}"/> 1762 1772 <arg line="${gs2.opt.args}"/> 1763 <arg line="${static.arg}"/> 1773 <arg line="${static.arg} ${ldflags.arg}"/> 1774 <env key="CFLAGS" value="${cflags.arg}"/> 1775 <env key="CPPFLAGS" value="${cppflags.arg}"/> 1776 <env key="CXXFLAGS" value="${cxxflags.arg}"/> 1764 1777 </exec> 1765 1778 </target> … … 1772 1785 <env key="CPPFLAGS" value="${cppflags.arg}"/> 1773 1786 <env key="CXXFLAGS" value="${cxxflags.arg}"/> 1787 <env key="LDFLAGS" value="${ldflags.arg}"/> 1774 1788 </exec> 1775 1789
Note:
See TracChangeset
for help on using the changeset viewer.