~jtaylor/ubuntu/oneiric/flightgear/fix-749249

* patch utils/propmerge/Makefile.in
- fix build with ld --as-needed (LP: #749249)
* rebuild fixes LP: #827667

added added

removed removed

196

top_builddir = @top_builddir@

197

top_srcdir = @top_srcdir@

198

propmerge_SOURCES = propmerge.cxx

199

propmerge_LDADD = -lsgprops -lsgxml -lsgio -lsgmisc -lsgdebug -lsgstructure

199

propmerge_LDADD = -lsgprops -lsgxml -lsgio -lsgdebug -lsgstructure

200

# required for --as-needed default: https://bugs.launchpad.net/ubuntu/+bug/749249

201

# we don't directly need sgmisc here but its missing links cannot easily be fixed due

202

# to circular dependencies in simgear, use LIBS as it is last on the commandline

203

LIBS += -Wl,--no-as-needed -lsgmisc

200

204

all: all-am

201

205

202

206

.SUFFIXES: