Mercurial > hg > octave-lyh
changeset 8618:f8b3ece45bda
use separate prefix for shllib and shlbin files
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 28 Jan 2009 17:42:18 -0500 |
parents | 4b26e9fbbb37 |
children | 930a8114197b |
files | ChangeLog Makeconf.in configure.in libcruft/ChangeLog libcruft/Makefile.in liboctave/ChangeLog liboctave/Makefile.in src/ChangeLog src/Makefile.in |
diffstat | 9 files changed, 101 insertions(+), 58 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-01-28 John W. Eaton <jwe@octave.org> + + * configure.in (SHLLIBPRE, SHLBINPRE): New variables. AC_SUBST them. + (*-*-cygwin*): Set LIBPRE and SHLBINPRE to cyg and SHLLIBPRE to lib. + Use SHLLIBPRE and SHLLIB in definition of SONAME_FLAGS. + (*-*-msdosmsvc): Make SHLBINPRE and SHLLIBPRE empty. + Adjust definition of SONAME_FLAGS for SHLLIBPRE. + * Makeconf.in (SHLLIBPRE, SHLBINPRE): Substitute new variables here. + From Marco Atzeri <marco_atzeri@yahoo.it>. + 2009-01-27 Benjamin Lindner <lindnerb@users.sourceforge.net> * configure.in: Add of -lregex to REGEX_LIBS.
--- a/Makeconf.in +++ b/Makeconf.in @@ -101,6 +101,8 @@ LIBEXT = a LIBPRE = @LIBPRE@ +SHLLIBPRE = @SHLLIBPRE@ +SHLBINPRE = @SHLBINPRE@ # Fortran to C translator and associated flags.
--- a/configure.in +++ b/configure.in @@ -1172,6 +1172,8 @@ SHLBIN_VER='$(SHLBIN).$(version)' SHLLINKEXT= LIBPRE=lib +SHLLIBPRE=lib +SHLBINPRE=lib SH_LD='$(CXX)' SH_LDFLAGS=-shared DL_LD='$(SH_LD)' @@ -1225,19 +1227,19 @@ SONAME_FLAGS='-install_name $(octlibdir)/$@' library_path_var=DYLD_LIBRARY_PATH ;; - *-*-cygwin* | *-*-mingw*) + *-*-mingw* | *-*-cygwin*) + case "$canonical_host_type" in + *-*-cygwin*) + LIBPRE=cyg + SHLLIBPRE=lib + SHLBINPRE=cyg + ;; + esac DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" - CXXPICFLAG= - CPICFLAG= - FPICFLAG= - SHLEXT=dll - SHLLIB=dll.a - SHLBIN=dll SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" - SHLLINKEXT=.dll - SONAME_FLAGS='-Wl,--out-implib=$@.a' - library_path_var=PATH + SONAME_FLAGS='-Wl,--out-implib=$(SHLLIBPRE)$(basename $@)$(SHLLIB)' ;; + *-*-msdosmsvc) DL_LDFLAGS="-shared" CPICFLAG= @@ -1247,6 +1249,8 @@ SHLLIB=lib SHLBIN=dll LIBPRE= + SHLLIBPRE= + SHLBINPRE= SH_LDFLAGS="-shared" if test -n "`echo $CFLAGS | grep -e '-g'`" -o -n "`echo $CXXFLAGS | grep -e '-g'`"; then DL_LDFLAGS="$DL_LDFLAGS -g" @@ -1350,6 +1354,8 @@ AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER]) AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT]) AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE]) +AC_MSG_NOTICE([defining SHLLIBPRE to be $SHLLIBPRE]) +AC_MSG_NOTICE([defining SHLBINPRE to be $SHLBINPRE]) AC_MSG_NOTICE([defining SH_LD to be $SH_LD]) AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS]) AC_MSG_NOTICE([defining DL_LD to be $DL_LD]) @@ -1376,6 +1382,8 @@ AC_SUBST(SHLBIN_VER) AC_SUBST(SHLLINKEXT) AC_SUBST(LIBPRE) +AC_SUBST(SHLLIBPRE) +AC_SUBST(SHLBINPRE) AC_SUBST(SH_LD) AC_SUBST(SH_LDFLAGS) AC_SUBST(DL_LD)
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,9 @@ +2009-01-28 John W. Eaton <jwe@octave.org> + + * Makefile.in (LIBRARIES, install, uninstall): use SHLLIBPRE and + SHLBINPRE library prefixes. + From Marco Atzeri <marco_atzeri@yahoo.it>. + 2008-12-21 Jaroslav Hajek <highegg@gmail.com> * lapack/chegs2.f lapack/chegst.f lapack/chegv.f lapack/dsygs2.f
--- a/libcruft/Makefile.in +++ b/libcruft/Makefile.in @@ -97,9 +97,9 @@ ifeq ($(SHARED_LIBS), true) ifeq ($(STATIC_LIBS), true) - LIBRARIES = $(LIBPRE)cruft.$(LIBEXT) $(LIBPRE)cruft.$(SHLEXT_VER) + LIBRARIES = $(LIBPRE)cruft.$(LIBEXT) $(SHLLIBPRE)cruft.$(SHLEXT_VER) else - LIBRARIES = $(LIBPRE)cruft.$(SHLEXT_VER) + LIBRARIES = $(SHLLIBPRE)cruft.$(SHLEXT_VER) endif else ifeq ($(STATIC_LIBS), true) @@ -124,11 +124,11 @@ $(AR) $(ARFLAGS) $@ $^ $(RANLIB) $@ -$(LIBPRE)cruft.$(SHLEXT_VER): $(LIBPRE)cruft.$(SHLEXT) +$(SHLLIBPRE)cruft.$(SHLEXT_VER): $(SHLLIBPRE)cruft.$(SHLEXT) rm -f $@ $(LN_S) $< $@ -$(LIBPRE)cruft.$(SHLEXT): $(CRUFT_PICOBJ) +$(SHLLIBPRE)cruft.$(SHLEXT): $(CRUFT_PICOBJ) rm -f $@ $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(LINK_DEPS) @@ -152,16 +152,16 @@ $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \ fi if $(SHARED_LIBS); then \ - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)cruft.$(SHLLIB_VER); \ $(INSTALL) \ - $(LIBPRE)cruft.$(SHLLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER); \ - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB); \ + $(SHLLIBPRE)cruft.$(SHLLIB) $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)cruft.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)cruft.$(SHLLIB); \ (cd $(DESTDIR)$(octlibdir); \ - $(LN_S) $(LIBPRE)cruft.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB)); \ + $(LN_S) $(SHLLIBPRE)cruft.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)cruft.$(SHLLIB)); \ if test x$(SHLBIN) != x ; then \ - rm -f $(DESTDIR)$(bindir)/$(LIBPRE)cruft.$(SHLBIN); \ + rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)cruft.$(SHLBIN); \ $(INSTALL_PROGRAM) \ - $(LIBPRE)cruft.$(SHLBIN) $(DESTDIR)$(bindir)/$(LIBPRE)cruft.$(SHLBIN); \ + $(SHLBINPRE)cruft.$(SHLBIN) $(DESTDIR)$(bindir)/$(SHLBINPRE)cruft.$(SHLBIN); \ fi; \ fi @@ -170,11 +170,11 @@ uninstall:: rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB) - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER) + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)cruft.$(SHLLIB) + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)cruft.$(SHLLIB_VER) if test x$(SHLBIN) != x; then \ - rm -f $(DESTDIR)$(bindir)/$(LIBPRE)cruft.$(SHLBIN); \ - rm -f $(DESTDIR)$(bindir)/$(LIBPRE)cruft.$(SHLBIN_VER); \ + rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)cruft.$(SHLBIN); \ + rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)cruft.$(SHLBIN_VER); \ fi tags TAGS:: $(SOURCES) @@ -188,7 +188,8 @@ clean mostlyclean distclean:: rm -f $(LIBPRE)cruft.$(LIBEXT) - rm -f $(LIBPRE)cruft.$(SHLEXT_VER) $(LIBPRE)cruft.$(SHLEXT) + rm -f $(SHLLIBPRE)cruft.$(SHLEXT_VER) $(SHLLIBPRE)cruft.$(SHLEXT) + rm -f $(SHLBINPRE)cruft.$(SHLBIN_VER) $(SHLBINPRE)cruft.$(SHLBIN) rm -f $(CRUFT_DEFS) cruft.def mkf77def distclean maintainer-clean::
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,9 @@ +2009-01-28 John W. Eaton <jwe@octave.org> + + * Makefile.in (LIBRARIES, install, uninstall): Use SHLLIBPRE + and SHLBINPRE library prefixes. + From Marco Atzeri <marco_atzeri@yahoo.it>. + 2009-01-28 Jaroslav Hajek <highegg@gmail.com> * dMatrix.cc (Matrix::Matrix (const RowVector&)): Use shallow copy.
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -249,17 +249,19 @@ ifeq ($(SHARED_LIBS), true) ifeq ($(STATIC_LIBS), true) - libraries: $(LIBPRE)octave.$(LIBEXT) $(LIBPRE)octave.$(SHLEXT_VER) + LIBRARIES = $(LIBPRE)octave.$(LIBEXT) $(SHLLIBPRE)octave.$(SHLEXT_VER) else - libraries: $(LIBPRE)octave.$(SHLEXT_VER) + LIBRARIES = $(SHLLIBPRE)octave.$(SHLEXT_VER) endif else ifeq ($(STATIC_LIBS), true) - libraries: $(LIBPRE)octave.$(LIBEXT) + LIBRARIES = $(LIBPRE)octave.$(LIBEXT) else - libraries: + LIBRARIES = endif endif + +libraries: $(LIBRARIES) .PHONY: libraries $(LIBPRE)octave.$(LIBEXT): $(LIBOCTAVE_OBJECTS) @@ -267,11 +269,11 @@ $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $(LIBOCTAVE_OBJECTS) $(RANLIB) $@ -$(LIBPRE)octave.$(SHLEXT_VER): $(LIBPRE)octave.$(SHLEXT) +$(SHLLIBPRE)octave.$(SHLEXT_VER): $(SHLLIBPRE)octave.$(SHLEXT) rm -f $@ $(LN_S) $< $@ -$(LIBPRE)octave.$(SHLEXT): $(LIBOCTAVE_PICOBJ) +$(SHLLIBPRE)octave.$(SHLEXT): $(LIBOCTAVE_PICOBJ) rm -f $@ $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ \ $(LIBOCTAVE_PICOBJ) $(LINK_DEPS) @@ -301,15 +303,15 @@ $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \ fi if $(SHARED_LIBS); then \ - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octave.$(SHLLIB_VER); \ $(INSTALL) \ - $(LIBPRE)octave.$(SHLLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB_VER); \ - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB); \ - (cd $(DESTDIR)$(octlibdir) ; $(LN_S) $(LIBPRE)octave.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB)); \ + $(SHLLIBPRE)octave.$(SHLLIB) $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octave.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octave.$(SHLLIB); \ + (cd $(DESTDIR)$(octlibdir) ; $(LN_S) $(SHLLIBPRE)octave.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octave.$(SHLLIB)); \ if test x$(SHLBIN) != x ; then \ - rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octave.$(SHLBIN); \ + rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)octave.$(SHLBIN); \ $(INSTALL_PROGRAM) \ - $(LIBPRE)octave.$(SHLBIN) $(DESTDIR)$(bindir)/$(LIBPRE)octave.$(SHLBIN); \ + $(SHLBINPRE)octave.$(SHLBIN) $(DESTDIR)$(bindir)/$(SHLBINPRE)octave.$(SHLBIN); \ fi; \ fi .PHONY: install-lib @@ -328,11 +330,11 @@ uninstall: rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT) - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB) - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB_VER) + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octave.$(SHLLIB) + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octave.$(SHLLIB_VER) if test x$(SHLBIN) != x; then \ - rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octave.$(SHLBIN); \ - rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octave.$(SHLBIN_VER); \ + rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)octave.$(SHLBIN); \ + rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)octave.$(SHLBIN_VER); \ fi for f in $(INCLUDES_FOR_INSTALL); do rm -f $(DESTDIR)$(octincludedir)/octave/$$f; done .PHONY: uninstall @@ -344,7 +346,9 @@ etags $(SOURCES) clean: - rm -f $(LIBPRE)octave.$(LIBEXT) $(LIBPRE)octave.$(SHLEXT_VER) $(LIBPRE)octave.$(SHLEXT) + rm -f $(LIBPRE)octave.$(LIBEXT) + rm -f $(SHLLIBPRE)octave.$(SHLEXT_VER) $(SHLLIBPRE)octave.$(SHLEXT) + rm -f $(SHLBINPRE)octave.$(SHLBIN_VER) $(SHLBINPRE)octave.$(SHLBIN) rm -f $(LIBOCTAVE_OBJECTS) $(MAKEDEPS) $(LIBOCTAVE_PICOBJ) stmp-pic -rmdir pic .PHONY: clean
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-01-28 John W. Eaton <jwe@octave.org> + + * Makefile.in (install, uninstall): Handle SHLLIBPRE and SHLBINPRE + library prefixes. From Marco Atzeri <marco_atzeri@yahoo.it>. + 2009-01-28 Jaroslav Hajek <highegg@gmail.com> * DLD-FUNCTIONS/lookup.cc (Flookup): Fix doc string.
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -335,9 +335,9 @@ ifeq ($(SHARED_LIBS), true) ifeq ($(STATIC_LIBS), true) - LIBRARIES = $(LIBPRE)octinterp.$(LIBEXT) $(LIBPRE)octinterp.$(SHLEXT_VER) + LIBRARIES = $(LIBPRE)octinterp.$(LIBEXT) $(SHLLIBPRE)octinterp.$(SHLEXT_VER) else - LIBRARIES = $(LIBPRE)octinterp.$(SHLEXT_VER) + LIBRARIES = $(SHLLIBPRE)octinterp.$(SHLEXT_VER) endif else ifeq ($(STATIC_LIBS), true) @@ -356,11 +356,11 @@ $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^ $(RANLIB) $@ -$(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBPRE)octinterp.$(SHLEXT) +$(SHLLIBPRE)octinterp.$(SHLEXT_VER): $(SHLLIBPRE)octinterp.$(SHLEXT) rm -f $@ $(LN_S) $< $@ -$(LIBPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA) +$(SHLLIBPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA) rm -f $@ $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS) @@ -480,15 +480,15 @@ $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \ fi if $(SHARED_LIBS); then \ - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLEXT_VER); \ - $(INSTALL) $(LIBPRE)octinterp.$(SHLLIB) \ - $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB_VER); \ - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB); \ - (cd $(DESTDIR)$(octlibdir) ; $(LN_S) $(LIBPRE)octinterp.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB)); \ + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLEXT_VER); \ + $(INSTALL) $(SHLLIBPRE)octinterp.$(SHLLIB) \ + $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLLIB); \ + (cd $(DESTDIR)$(octlibdir) ; $(LN_S) $(SHLLIBPRE)octinterp.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLLIB)); \ if test x$(SHLBIN) != x ; then \ - rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octinterp.$(SHLBIN); \ + rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)octinterp.$(SHLBIN); \ $(INSTALL_PROGRAM) \ - $(LIBPRE)octinterp.$(SHLBIN) $(DESTDIR)$(bindir)/$(LIBPRE)octinterp.$(SHLBIN); \ + $(SHLBINPRE)octinterp.$(SHLBIN) $(DESTDIR)$(bindir)/$(SHLBINPRE)octinterp.$(SHLBIN); \ fi; \ fi .PHONY: install-lib @@ -517,11 +517,11 @@ rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT) rm -f $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT) rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT) - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB) - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB_VER) + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLLIB) + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLLIB_VER) if test x$(SHLBIN) != x ; then \ - rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octinterp.$(SHLBIN); \ - rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octinterp.$(SHLBIN_VER); \ + rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)octinterp.$(SHLBIN); \ + rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)octinterp.$(SHLBIN_VER); \ fi for f in $(INCLUDES_FOR_INSTALL) defaults.h oct-conf.h oct-gperf.h; do \ rm -f $(DESTDIR)$(octincludedir)/octave/$$f; \ @@ -547,7 +547,8 @@ clean: rm -f $(LIBPRE)octinterp.$(LIBEXT) - rm -f $(LIBPRE)octinterp.$(SHLEXT_VER) $(LIBPRE)octinterp.$(SHLEXT) + rm -f $(SHLLIBPRE)octinterp.$(SHLEXT_VER) $(SHLLIBPRE)octinterp.$(SHLEXT) + rm -f $(SHLBINPRE)octinterp.$(SHLBIN_VER) $(SHLBINPRE)octinterp.$(SHLBIN) rm -f $(OBJECTS) $(DLD_OBJ) $(MAKEDEPS) $(DOC_FILES) $(OCT_FILES) rm -f $(PICOBJ) $(DLD_PICOBJ) stmp-pic gendoc$(EXEEXT) rm -f builtins.cc ops.cc defaults.h oct-conf.h def-files