# HG changeset patch
# User address@hidden
# Date 1241691029 -7200
# Node ID 9fb519c57664ab29cf11244b4046ce352074f2aa
# Parent  9861b3ec72a6ccef96da1c7e65a57b6298766c5a
Added SHLPRE for SHLEXT instead of SHLLIBPRE

diff -r 9861b3ec72a6 -r 9fb519c57664 ChangeLog
--- a/ChangeLog	Wed May 06 09:55:26 2009 +0200
+++ b/ChangeLog	Thu May 07 12:10:29 2009 +0200
@@ -1,3 +1,10 @@
+2009-05-06  Marco Atzeri  <address@hidden>
+        * configure.in: SHLLIBPRE replaced by SHLPRE for .$(SHLEXT)
+        * Makeconf.in: same 
+        * libcruft/Makefile.in: same
+        * liboctave/Makefile.in: same
+        * src/Makefile.in: same
+
 2009-05-05  Jaroslav Hajek  <address@hidden>
 
 	* configure.in: Include the whole 3.x g++ series as problematic.
diff -r 9861b3ec72a6 -r 9fb519c57664 Makeconf.in
--- a/Makeconf.in	Wed May 06 09:55:26 2009 +0200
+++ b/Makeconf.in	Thu May 07 12:10:29 2009 +0200
@@ -101,6 +101,7 @@
 
 LIBEXT = a
 LIBPRE = @LIBPRE@
+SHLPRE = @SHLPRE@
 SHLLIBPRE = @SHLLIBPRE@
 SHLBINPRE = @SHLBINPRE@
 
@@ -626,9 +627,9 @@
   -e "s|%FIND%|${FIND}|g" \
   -e "s|%SED%|${SED}|g" \
   -e "s|%library_path_var%|${library_path_var}|g" \
-  -e "s|%liboctinterp%|${SHLLIBPRE}octinterp.${SHLEXT}|g" \
-  -e "s|%liboctave%|${SHLLIBPRE}octave.${SHLEXT}|g" \
-  -e "s|%libcruft%|${SHLLIBPRE}cruft.${SHLEXT}|g" \
+  -e "s|%liboctinterp%|${SHLPRE}octinterp.${SHLEXT}|g" \
+  -e "s|%liboctave%|${SHLPRE}octave.${SHLEXT}|g" \
+  -e "s|%libcruft%|${SHLPRE}cruft.${SHLEXT}|g" \
   -e "s|%srcdir%|${srcdir}|" \
   -e "s|%top_srcdir%|${top_srcdir}|" \
   -e "s|%abs_top_srcdir%|${abs_top_srcdir}|" \
diff -r 9861b3ec72a6 -r 9fb519c57664 configure.in
--- a/configure.in	Wed May 06 09:55:26 2009 +0200
+++ b/configure.in	Thu May 07 12:10:29 2009 +0200
@@ -1191,6 +1191,7 @@
 SHLBIN_VER='$(SHLBIN).$(version)'
 SHLLINKEXT=
 LIBPRE=lib
+SHLPRE=lib
 SHLLIBPRE=lib
 SHLBINPRE=lib
 SH_LD='$(CXX)'
@@ -1251,14 +1252,13 @@
     CXXPICFLAG=
     FPICFLAG=
     LIBPRE=lib
-    SHLLIBPRE=cyg
-    SHLBINPRE=lib
+    SHLPRE=cyg
     SHLEXT=dll
     SHLLIB=dll.a
     SHLBIN=a    
     DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc"
     SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
-    SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLLIBPRE)%,$(SHLBINPRE)%,$@).a'
+    SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLPRE)%,$(SHLBINPRE)%,$@).a'
   ;;
   *-*-mingw*)
     CPICFLAG=
@@ -1282,6 +1282,7 @@
     SHLLIB=lib
     SHLBIN=dll
     LIBPRE=
+    SHLPRE=
     SHLLIBPRE=
     SHLBINPRE=
     SH_LDFLAGS="-shared"
@@ -1398,6 +1399,7 @@
 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 SHLPRE to be $SHLPRE])
 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])
@@ -1426,6 +1428,7 @@
 AC_SUBST(SHLBIN_VER)
 AC_SUBST(SHLLINKEXT)
 AC_SUBST(LIBPRE)
+AC_SUBST(SHLPRE)
 AC_SUBST(SHLLIBPRE)
 AC_SUBST(SHLBINPRE)
 AC_SUBST(SH_LD)
diff -r 9861b3ec72a6 -r 9fb519c57664 libcruft/Makefile.in
--- a/libcruft/Makefile.in	Wed May 06 09:55:26 2009 +0200
+++ b/libcruft/Makefile.in	Thu May 07 12:10:29 2009 +0200
@@ -97,9 +97,9 @@
 
 ifeq ($(SHARED_LIBS), true)
   ifeq ($(STATIC_LIBS), true)
-    LIBRARIES = $(LIBPRE)cruft.$(LIBEXT) $(SHLLIBPRE)cruft.$(SHLEXT_VER)
+    LIBRARIES = $(LIBPRE)cruft.$(LIBEXT) $(SHLPRE)cruft.$(SHLEXT_VER)
   else
-    LIBRARIES = $(SHLLIBPRE)cruft.$(SHLEXT_VER)
+    LIBRARIES = $(SHLPRE)cruft.$(SHLEXT_VER)
   endif
 else
   ifeq ($(STATIC_LIBS), true)
@@ -124,11 +124,11 @@
 	$(AR) $(ARFLAGS) $@ $^
 	$(RANLIB) $@
 
-$(SHLLIBPRE)cruft.$(SHLEXT_VER): $(SHLLIBPRE)cruft.$(SHLEXT)
+$(SHLPRE)cruft.$(SHLEXT_VER): $(SHLPRE)cruft.$(SHLEXT)
 	rm -f $@
 	$(LN_S) $< $@
 
-$(SHLLIBPRE)cruft.$(SHLEXT): $(CRUFT_PICOBJ)
+$(SHLPRE)cruft.$(SHLEXT): $(CRUFT_PICOBJ)
 	rm -f $@
 	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(LINK_DEPS)
 
@@ -188,7 +188,7 @@
 
 clean mostlyclean distclean maintainer-clean::
 	rm -f $(LIBPRE)cruft.$(LIBEXT)
-	rm -f $(SHLLIBPRE)cruft.$(SHLEXT_VER) $(SHLLIBPRE)cruft.$(SHLEXT)
+	rm -f $(SHLPRE)cruft.$(SHLEXT_VER) $(SHLPRE)cruft.$(SHLEXT)
 	rm -f $(SHLBINPRE)cruft.$(SHLBIN_VER) $(SHLBINPRE)cruft.$(SHLBIN)
 	rm -f $(CRUFT_DEFS) cruft.def mkf77def
 
diff -r 9861b3ec72a6 -r 9fb519c57664 liboctave/Makefile.in
--- a/liboctave/Makefile.in	Wed May 06 09:55:26 2009 +0200
+++ b/liboctave/Makefile.in	Thu May 07 12:10:29 2009 +0200
@@ -249,9 +249,9 @@
 
 ifeq ($(SHARED_LIBS), true)
   ifeq ($(STATIC_LIBS), true)
-    LIBRARIES = $(LIBPRE)octave.$(LIBEXT) $(SHLLIBPRE)octave.$(SHLEXT_VER)
+    LIBRARIES = $(LIBPRE)octave.$(LIBEXT) $(SHLPRE)octave.$(SHLEXT_VER)
   else
-    LIBRARIES = $(SHLLIBPRE)octave.$(SHLEXT_VER)
+    LIBRARIES = $(SHLPRE)octave.$(SHLEXT_VER)
   endif
 else
   ifeq ($(STATIC_LIBS), true)
@@ -269,11 +269,11 @@
 	$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $(LIBOCTAVE_OBJECTS)
 	$(RANLIB) $@
 
-$(SHLLIBPRE)octave.$(SHLEXT_VER): $(SHLLIBPRE)octave.$(SHLEXT)
+$(SHLPRE)octave.$(SHLEXT_VER): $(SHLPRE)octave.$(SHLEXT)
 	rm -f $@
 	$(LN_S) $< $@
 
-$(SHLLIBPRE)octave.$(SHLEXT): $(LIBOCTAVE_PICOBJ)
+$(SHLPRE)octave.$(SHLEXT): $(LIBOCTAVE_PICOBJ)
 	rm -f $@
 	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ \
 	$(LIBOCTAVE_PICOBJ) $(LINK_DEPS)
@@ -347,7 +347,7 @@
 
 clean:
 	rm -f $(LIBPRE)octave.$(LIBEXT)
-	rm -f $(SHLLIBPRE)octave.$(SHLEXT_VER) $(SHLLIBPRE)octave.$(SHLEXT)
+	rm -f $(SHLPRE)octave.$(SHLEXT_VER) $(SHLPRE)octave.$(SHLEXT)
 	rm -f $(SHLBINPRE)octave.$(SHLBIN_VER) $(SHLBINPRE)octave.$(SHLBIN)
 	rm -f $(LIBOCTAVE_OBJECTS) $(MAKEDEPS) $(LIBOCTAVE_PICOBJ) stmp-pic
 	-rmdir pic
diff -r 9861b3ec72a6 -r 9fb519c57664 src/Makefile.in
--- a/src/Makefile.in	Wed May 06 09:55:26 2009 +0200
+++ b/src/Makefile.in	Thu May 07 12:10:29 2009 +0200
@@ -339,9 +339,9 @@
 
 ifeq ($(SHARED_LIBS), true)
   ifeq ($(STATIC_LIBS), true)
-    LIBRARIES = $(LIBPRE)octinterp.$(LIBEXT) $(SHLLIBPRE)octinterp.$(SHLEXT_VER)
+    LIBRARIES = $(LIBPRE)octinterp.$(LIBEXT) $(SHLPRE)octinterp.$(SHLEXT_VER)
   else
-    LIBRARIES = $(SHLLIBPRE)octinterp.$(SHLEXT_VER)
+    LIBRARIES = $(SHLPRE)octinterp.$(SHLEXT_VER)
   endif
 else
   ifeq ($(STATIC_LIBS), true)
@@ -360,11 +360,11 @@
 	$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^
 	$(RANLIB) $@
 
-$(SHLLIBPRE)octinterp.$(SHLEXT_VER): $(SHLLIBPRE)octinterp.$(SHLEXT)
+$(SHLPRE)octinterp.$(SHLEXT_VER): $(SHLPRE)octinterp.$(SHLEXT)
 	rm -f $@
 	$(LN_S) $< $@
 
-$(SHLLIBPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
+$(SHLPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
 	rm -f $@
 	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
 
@@ -484,7 +484,7 @@
 	  $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
 	fi
 	if $(SHARED_LIBS); then \
-	  rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLEXT_VER); \
+	  rm -f $(DESTDIR)$(octlibdir)/$(SHLPRE)octinterp.$(SHLEXT_VER); \
 	  $(INSTALL) $(SHLLIBPRE)octinterp.$(SHLLIB) \
 	    $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLLIB_VER); \
 	  rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLLIB); \
@@ -551,7 +551,7 @@
 
 clean:
 	rm -f $(LIBPRE)octinterp.$(LIBEXT)
-	rm -f $(SHLLIBPRE)octinterp.$(SHLEXT_VER) $(SHLLIBPRE)octinterp.$(SHLEXT)
+	rm -f $(SHLPRE)octinterp.$(SHLEXT_VER) $(SHLPRE)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)