Changeset 1752


Ignore:
Timestamp:
13/11/11 12:14:11 (6 months ago)
Author:
Freddie Akeroyd
Message:

Pass down configure options and set library version. Refs #302

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.am

    r1600 r1752  
    4343# Add any flags here that you want passed to configure when you do  
    4444# a "make distcheck" 
    45 # DISTCHECK_CONFIGURE_FLAGS=--without-java 
     45DISTCHECK_CONFIGURE_FLAGS=@CONFIGURE_ARGS@ 
     46 
    4647MAINTAINERCLEANFILES = \ 
    4748 ChangeLog \ 

  • trunk/applications/NXconvert/Makefile.am

    r1636 r1752  
    3939libnxconvert_la_SOURCES = nxconvert_common.cpp nxconvert_common.h 
    4040libnxconvert_la_LIBADD = $(LIBNEXUSCPP) $(LIBNEXUS) 
    41 libnxconvert_la_LDFLAGS = @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ $(LDFLAGS) 
     41libnxconvert_la_LDFLAGS = @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ -version-info $(NXLTVERSINFO) 
    4242 
    4343nxconvert_SOURCES = nxconvert.cpp nxconvert_common.h 

  • trunk/bindings/cpp/Makefile.am

    r1443 r1752  
    3535LIBNEXUS=$(top_builddir)/src/libNeXus.la 
    3636lib_LTLIBRARIES=libNeXusCPP.la 
    37 AM_LDFLAGS=-version-info $(NXLTVERSINFO) 
    3837 
    3938# nxincludedir=$(includedir)/nexus 
    … …  
    4342libNeXusCPP_la_SOURCES=NeXusFile.hpp NeXusFile.cpp NeXusException.hpp NeXusException.cpp NeXusStream.hpp NeXusStream.cpp 
    4443libNeXusCPP_la_LIBADD=$(LIBNEXUS) 
    45 libNeXusCPP_la_LDFLAGS=@SHARED_LDFLAGS@ $(LDFLAGS) 
     44libNeXusCPP_la_LDFLAGS=@SHARED_LDFLAGS@ -version-info $(NXLTVERSINFO) 
    4645 
    4746AM_CPPFLAGS=-I. -I$(top_srcdir)/include -DIN_NEXUS_CPP_LIBRARY=1 

  • trunk/bindings/f77/Makefile.am

    r1636 r1752  
    2929#==================================================================== 
    3030lib_LTLIBRARIES=libNeXus77.la 
    31 AM_LDFLAGS=-version-info $(NXLTVERSINFO) 
    3231 
    3332libNeXus77_la_SOURCES=napif.f 
    3433libNeXus77_la_LIBADD=$(top_builddir)/src/libNeXus.la # @FLIBS@ 
    35 libNeXus77_la_LDFLAGS=@SHARED_LDFLAGS@ $(LDFLAGS) 
     34libNeXus77_la_LDFLAGS=@SHARED_LDFLAGS@ -version-info $(NXLTVERSINFO) 
    3635 
    3736include_HEADERS = napif.inc 

  • trunk/bindings/f90/Makefile.am

    r1636 r1752  
    2929#==================================================================== 
    3030lib_LTLIBRARIES = libNeXus90.la 
    31 AM_LDFLAGS=-version-info $(NXLTVERSINFO) 
    3231 
    3332libNeXus90_la_SOURCES = NXmodule.f90 NXUmodule.f90 
    3433libNeXus90_la_LIBADD = $(top_builddir)/src/libNeXus.la 
    35 libNeXus90_la_LDFLAGS = @SHARED_LDFLAGS@ $(LDFLAGS) 
     34libNeXus90_la_LDFLAGS = @SHARED_LDFLAGS@ -version-info $(NXLTVERSINFO) 
    3635libNeXus90_la_LINK = $(FCLINK) 
    3736 

  • trunk/bindings/java/Makefile.am

    r1636 r1752  
    5858# jni definitions 
    5959lib_LTLIBRARIES         = libjnexus.la 
    60 AM_LDFLAGS=-version-info $(NXLTVERSINFO) 
    6160libjnexus_la_SOURCES    = native/hdfnativeImp.c \ 
    6261                       native/hdfexceptionImp.c \ 
    … …  
    6564                       native/hdfexceptionImp.h 
    6665libjnexus_la_LIBADD     = $(top_builddir)/src/libNeXus.la 
    67 libjnexus_la_LDFLAGS    = @SHARED_LDFLAGS@ $(LDFLAGS) $(JNEXUS_LDFLAGS) 
     66libjnexus_la_LDFLAGS    = @SHARED_LDFLAGS@ -version-info $(NXLTVERSINFO) $(JNEXUS_LDFLAGS) 
    6867libjnexus_la_CFLAGS     = -I$(top_srcdir)/include -Inative @JAVAINCLUDE@ \ 
    6968                        @HDF4_CPPFLAGS@ @HDF5_CPPFLAGS@ $(JNEXUS_CFLAGS) 

  • trunk/build_rpm.in

    r1720 r1752  
    2929# 
    3030if test -z "$1"; then 
    31     build_args="--with-python --with-java-home=/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/ --with-doxygen" 
     31    build_args='@CONFIGURE_ARGS@' 
    3232else 
    3333    build_args="$1" 

  • trunk/configure.ac

    r1751 r1752  
    3737 
    3838# used by libtool - need to get if from 4.3.0 better 
    39 NXLTVERSINFO="4:3:4" 
     39#NXLTVERSINFO="1:0:1" 
     40#NXLTVERSINFO="4:3:4" 
     41NXLTVERSINFO="5:0:5" 
    4042 
    4143AC_CONFIG_AUX_DIR(config) 
    … …  
    779781 
    780782LINUX_DISTRIBUTION 
     783 
     784CONFIGURE_ARGS="$ac_configure_args" 
     785AC_SUBST(CONFIGURE_ARGS) 
    781786 
    782787AC_CONFIG_FILES([Makefile 

  • trunk/src/Makefile.am

    r1636 r1752  
    3030 
    3131AM_CPPFLAGS=-I$(top_srcdir)/include @HDF4_CPPFLAGS@ @HDF5_CPPFLAGS@ @XML_CPPFLAGS@ -DIN_NEXUS_LIBRARY 
    32 AM_LDFLAGS=-version-info $(NXLTVERSINFO) 
    3332AM_CFLAGS=-prefer-pic 
    3433 
    … …  
    7877 
    7978libNeXus_la_SOURCES = napi.c napiu.c nxstack.c nxstack.h stptok.c  nxdataset.c nxdataset.h nx_stptok.h $(H4SRC) $(H5SRC) $(XMLSRC) $(MINGW_SRC) 
    80 libNeXus_la_LDFLAGS = -export-symbols nexus_symbols.sym @SHARED_LDFLAGS@ @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ $(LDFLAGS) 
     79libNeXus_la_LDFLAGS = -export-symbols nexus_symbols.sym @SHARED_LDFLAGS@ @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ -version-info $(NXLTVERSINFO) 
    8180libNeXus_la_DEPENDENCIES = nexus_symbols.sym 
    8281 
Note: See TracChangeset for help on using the changeset viewer.