Changeset 1767 for trunk

Timestamp:

17/11/11 01:40:51 (6 months ago)

Author:

Freddie Akeroyd

Message:

Add additional -L flag to shared library directory. This seems to
be needed on ubuntu to make sure the just built (rather than an
already installed) library is used during the libtool relink on install
Refs #305

Location:

trunk

Files:

• applications/NXconvert/Makefile.am (modified) (1 diff)
• bindings/cpp/Makefile.am (modified) (1 diff)
• bindings/java/Makefile.am (modified) (1 diff)

trunk/applications/NXconvert/Makefile.am

@@ -39 +39 @@
 libnxconvert_la_SOURCES = nxconvert_common.cpp nxconvert_common.h
 libnxconvert_la_LIBADD = $(LIBNEXUSCPP) $(LIBNEXUS)
-libnxconvert_la_LDFLAGS = @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ -version-info $(NXLTVERSINFO)
+libnxconvert_la_LDFLAGS = @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ -version-info $(NXLTVERSINFO) -L$(top_builddir)/bindings/cpp/.libs -L$(top_builddir)/src/.libs
 
 nxconvert_SOURCES = nxconvert.cpp nxconvert_common.h

trunk/bindings/cpp/Makefile.am

@@ -42 +42 @@
 libNeXusCPP_la_SOURCES=NeXusFile.hpp NeXusFile.cpp NeXusException.hpp NeXusException.cpp NeXusStream.hpp NeXusStream.cpp
 libNeXusCPP_la_LIBADD=$(LIBNEXUS)
-libNeXusCPP_la_LDFLAGS=@SHARED_LDFLAGS@ -version-info $(NXLTVERSINFO)
+libNeXusCPP_la_LDFLAGS=@SHARED_LDFLAGS@ -version-info $(NXLTVERSINFO) -L$(top_builddir)/src/.libs
 
 AM_CPPFLAGS=-I. -I$(top_srcdir)/include -DIN_NEXUS_CPP_LIBRARY=1

trunk/bindings/java/Makefile.am

@@ -64 +64 @@
                        native/hdfexceptionImp.h
 libjnexus_la_LIBADD     = $(top_builddir)/src/libNeXus.la
-libjnexus_la_LDFLAGS    = @SHARED_LDFLAGS@ -version-info $(NXLTVERSINFO) $(JNEXUS_LDFLAGS)
+libjnexus_la_LDFLAGS    = @SHARED_LDFLAGS@ -version-info $(NXLTVERSINFO) $(JNEXUS_LDFLAGS) -L$(top_builddir)/src/.libs
 libjnexus_la_CFLAGS     = -I$(top_srcdir)/include -Inative @JAVAINCLUDE@ \
                         @HDF4_CPPFLAGS@ @HDF5_CPPFLAGS@ $(JNEXUS_CFLAGS)