# HG changeset patch
# User jwe
# Date 1160763087 0
# Node ID 583c98eeeae208573be8e42eb828ae1e8a7fb060
# Parent  435294ca4ee674a4f30e72e5baee09df74ec552f
[project @ 2006-10-13 18:11:26 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-13  Michael Goffioul  <michael.goffioul@swing.be>
+
+	* configure.in [_MSC_VER]: Disable some warnings.
+	(*-*-msdos): New case for shared libraries.
+	(LIBPRE): New variable.
+	* Makeconf.in: Substitute it.
+
 2006-10-12  John W. Eaton  <jwe@octave.org>
 
 	* configure.in (AH_BOTTOM): Don't unconditionally #define
diff --git a/Makeconf.in b/Makeconf.in
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -81,6 +81,7 @@
 SHLLINKEXT=
 
 LIBEXT = a
+LIBPRE = @LIBPRE@
 
 # Fortran to C translator and associated flags.
 
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.525 $)
+AC_REVISION($Revision: 1.526 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -952,6 +952,7 @@
 SHLLIB_VER='$(SHLLIB).$(version)'
 SHLBIN_VER='$(SHLBIN).$(version)'
 SHLLINKEXT=
+LIBPRE=lib
 SH_LD='$(CXX)'
 SH_LDFLAGS=-shared
 DL_LD='$(SH_LD)'
@@ -1008,6 +1009,17 @@
     SONAME_FLAGS='-Wl,--out-implib=$@.a'
     library_path_var=PATH
   ;;
+  *-*-msdos)
+    DL_LDFLAGS="-shared -g"
+    CPICFLAG=
+    CXXPICFLAG=
+    FPICFLAG=
+    SHLEXT=dll
+    SHLLIB=lib
+    SHLBIN=dll
+    LIBPRE=
+    SH_LDFLAGS="-shared -g"
+  ;;
   *-*-linux* | *-*-gnu*)
     MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic"
     SONAME_FLAGS='-Wl,-soname -Wl,$@'
@@ -1097,6 +1109,7 @@
 AC_MSG_NOTICE([defining SHLLIB_VER to be $SHLLIB_VER])
 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 DLFCN_DIR to be $DLFCN_DIR])
 AC_MSG_NOTICE([defining SH_LD to be $SH_LD])
 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS])
@@ -1119,6 +1132,7 @@
 AC_SUBST(SHLLIB_VER)
 AC_SUBST(SHLBIN_VER)
 AC_SUBST(SHLLINKEXT)
+AC_SUBST(LIBPRE)
 AC_SUBST(DLFCN_DIR)
 AC_SUBST(SH_LD)
 AC_SUBST(SH_LDFLAGS)
@@ -1765,6 +1779,15 @@
 #define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT
 #endif
 
+#if defined (_MSC_VER)
+/* missing parameters in macros */
+#pragma warning (disable: 4003)
+/* missing implementations in template instantiation */
+#pragma warning (disable: 4996)
+/* deprecated function names (FIXME?) */
+#pragma warning (disable: 4661)
+#endif
+
 #include "oct-types.h"
 ])
 
diff --git a/libcruft/ChangeLog b/libcruft/ChangeLog
--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-13  Michael Goffioul  <michael.goffioul@swing.be>
+
+	* Makefile.in: Adapt rules to use $(LIBPRE).
+
 2006-09-11  John W. Eaton  <jwe@octave.org>
 
 	* blas-xtra/xddot.f, blas-xtra/xzdotu.f: New files.
diff --git a/libcruft/Makefile.in b/libcruft/Makefile.in
--- a/libcruft/Makefile.in
+++ b/libcruft/Makefile.in
@@ -20,7 +20,7 @@
 
 # List of the directories that contain Fortran source.  Simply copying
 # a new .f file into one of these directories is sufficient to have it
-# added to libcruft.a.  If you add a new directory here, you also need
+# added to $(LIBPRE)cruft.a.  If you add a new directory here, you also need
 # generate a new configure script in the top-level directory (edit
 # configure.in and run autoconf).
 
@@ -75,13 +75,13 @@
 
 ifeq ($(SHARED_LIBS), true)
   ifeq ($(STATIC_LIBS), true)
-    LIBRARIES = libcruft.$(LIBEXT) libcruft.$(SHLEXT_VER)
+    LIBRARIES = $(LIBPRE)cruft.$(LIBEXT) $(LIBPRE)cruft.$(SHLEXT_VER)
   else
-    LIBRARIES = libcruft.$(SHLEXT_VER)
+    LIBRARIES = $(LIBPRE)cruft.$(SHLEXT_VER)
   endif
 else
   ifeq ($(STATIC_LIBS), true)
-    LIBRARIES = libcruft.$(LIBEXT)
+    LIBRARIES = $(LIBPRE)cruft.$(LIBEXT)
   else
     LIBRARIES =
   endif
@@ -91,16 +91,16 @@
 	$(MAKE) $(LIBRARIES)
 .PHONY: libraries
 
-libcruft.$(LIBEXT): $(CRUFT_OBJ)
+$(LIBPRE)cruft.$(LIBEXT): $(CRUFT_OBJ)
 	rm -f $@
 	$(AR) $(ARFLAGS) $@ $^
 	$(RANLIB) $@
 
-libcruft.$(SHLEXT_VER): libcruft.$(SHLEXT)
+$(LIBPRE)cruft.$(SHLEXT_VER): $(LIBPRE)cruft.$(SHLEXT)
 	rm -f $@
 	$(LN_S) $< $@
 
-libcruft.$(SHLEXT): $(CRUFT_PICOBJ)
+$(LIBPRE)cruft.$(SHLEXT): $(CRUFT_PICOBJ)
 	rm -f $@
 	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(LINK_DEPS)
 
@@ -118,22 +118,22 @@
 install::
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
 	if $(STATIC_LIBS); then \
-	  rm -f $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
-	  $(INSTALL_DATA) libcruft.$(LIBEXT) \
-	    $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
-	  $(RANLIB) $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
+	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
+	  $(INSTALL_DATA) $(LIBPRE)cruft.$(LIBEXT) \
+	    $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
+	  $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
 	fi
 	if $(SHARED_LIBS); then \
-	  rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB_VER); \
+	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER); \
 	  $(INSTALL) \
-	    libcruft.$(SHLLIB) $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB_VER); \
-	  rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB); \
+	    $(LIBPRE)cruft.$(SHLLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER); \
+	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB); \
 	  (cd $(DESTDIR)$(octlibdir); \
-	  $(LN_S) libcruft.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB)); \
+	  $(LN_S) $(LIBPRE)cruft.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB)); \
 	  if  test x$(SHLBIN) != x ; then \
-	    rm -f $(DESTDIR)$(bindir)/libcruft.$(SHLBIN); \
+	    rm -f $(DESTDIR)$(bindir)/$(LIBPRE)cruft.$(SHLBIN); \
 	    $(INSTALL_PROGRAM) \
-	      libcruft.$(SHLBIN) $(DESTDIR)$(bindir)/libcruft.$(SHLBIN); \
+	      $(LIBPRE)cruft.$(SHLBIN) $(DESTDIR)$(bindir)/$(LIBPRE)cruft.$(SHLBIN); \
 	  fi; \
 	fi
 
@@ -141,12 +141,12 @@
 	$(MAKE) INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s" install
 
 uninstall::
-	rm -f $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT)
-	rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB)
-	rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB_VER)
+	rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT)
+	rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB)
+	rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER)
 	if test x$(SHLBIN) != x; then \
-	  rm -f $(DESTDIR)$(bindir)/libcruft.$(SHLBIN); \
-	  rm -f $(DESTDIR)$(bindir)/libcruft.$(SHLBIN_VER); \
+	  rm -f $(DESTDIR)$(bindir)/$(LIBPRE)cruft.$(SHLBIN); \
+	  rm -f $(DESTDIR)$(bindir)/$(LIBPRE)cruft.$(SHLBIN_VER); \
 	fi
 
 tags TAGS:: $(SOURCES)
@@ -159,8 +159,9 @@
 	etags $(SOURCES)
 
 clean mostlyclean distclean::
-	rm -f libcruft.$(LIBEXT) $(CRUFT_OBJ)
-	rm -f libcruft.$(SHLEXT_VER) libcruft.$(SHLEXT)
+	rm -f $(LIBPRE)cruft.$(LIBEXT) $(CRUFT_OBJ)
+	rm -f $(LIBPRE)cruft.$(SHLEXT_VER) $(LIBPRE)cruft.$(SHLEXT)
+	rm -f cruft.def
 
 distclean maintainer-clean::
 	rm -f Makefile Makerules so_locations
diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-13  Michael Goffioul  <michael.goffioul@swing.be>
+
+	* Makefile.in: Adapt rules to use $(LIBPRE).
+
 2006-10-03  David Bateman <dbateman@free.fr>
 
 	* MatrixType.cc (MatrixType::MatrixType): Avoid crash if np == 0
diff --git a/liboctave/Makefile.in b/liboctave/Makefile.in
--- a/liboctave/Makefile.in
+++ b/liboctave/Makefile.in
@@ -213,33 +213,33 @@
   ifeq ($(STATIC_LIBS), true)
     libraries: \
 	stamp-prereq \
-	liboctave.$(LIBEXT) liboctave.$(SHLEXT_VER)
+	$(LIBPRE)octave.$(LIBEXT) $(LIBPRE)octave.$(SHLEXT_VER)
   else
     libraries: \
 	stamp-prereq \
-	liboctave.$(SHLEXT_VER)
+	$(LIBPRE)octave.$(SHLEXT_VER)
   endif
 else
   ifeq ($(STATIC_LIBS), true)
     libraries: \
 	stamp-prereq \
-	liboctave.$(LIBEXT)
+	$(LIBPRE)octave.$(LIBEXT)
   else
     libraries: stamp-prereq
   endif
 endif
 .PHONY: libraries
 
-liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
+$(LIBPRE)octave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
 	rm -f $@
 	$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $(LIBOCTAVE_OBJECTS)
 	$(RANLIB) $@
 
-liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT)
+$(LIBPRE)octave.$(SHLEXT_VER): $(LIBPRE)octave.$(SHLEXT)
 	rm -f $@
 	$(LN_S) $< $@
 
-liboctave.$(SHLEXT): $(LIBOCTAVE_PICOBJ)
+$(LIBPRE)octave.$(SHLEXT): $(LIBOCTAVE_PICOBJ)
 	rm -f $@
 	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ \
 	$(LIBOCTAVE_PICOBJ) $(LINK_DEPS)
@@ -259,21 +259,21 @@
 install-lib:
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
 	if $(STATIC_LIBS); then \
-	  rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
-	  $(INSTALL_DATA) liboctave.$(LIBEXT) \
-	    $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
-	  $(RANLIB) $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
+	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
+	  $(INSTALL_DATA) $(LIBPRE)octave.$(LIBEXT) \
+	    $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
+	  $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
 	fi
 	if $(SHARED_LIBS); then \
-	  rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER); \
+	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB_VER); \
 	  $(INSTALL) \
-	    liboctave.$(SHLLIB) $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER); \
-	  rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB); \
-	  (cd $(DESTDIR)$(octlibdir) ; $(LN_S) liboctave.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB)); \
+	    $(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)); \
 	  if  test x$(SHLBIN) != x ; then \
-	    rm -f $(DESTDIR)$(bindir)/liboctave.$(SHLBIN); \
+	    rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octave.$(SHLBIN); \
 	    $(INSTALL_PROGRAM) \
-	      liboctave.$(SHLBIN) $(DESTDIR)$(bindir)/liboctave.$(SHLBIN); \
+	      $(LIBPRE)octave.$(SHLBIN) $(DESTDIR)$(bindir)/$(LIBPRE)octave.$(SHLBIN); \
 	  fi; \
 	fi
 .PHONY: install-lib
@@ -291,12 +291,12 @@
 .PHONY: install-inc
 
 uninstall:
-	rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT)
-	rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB)
-	rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER)
+	rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT)
+	rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB)
+	rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB_VER)
 	if test x$(SHLBIN) != x; then \
-	  rm -f $(DESTDIR)$(bindir)/liboctave.$(SHLBIN); \
-	  rm -f $(DESTDIR)$(bindir)/liboctave.$(SHLBIN_VER); \
+	  rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octave.$(SHLBIN); \
+	  rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octave.$(SHLBIN_VER); \
 	fi
 	for f in $(INCLUDES); do rm -f $(DESTDIR)$(octincludedir)/octave/$$f; done
 .PHONY: uninstall
@@ -308,7 +308,7 @@
 	etags $(SOURCES)
 
 clean:
-	rm -f liboctave.$(LIBEXT) liboctave.$(SHLEXT_VER) liboctave.$(SHLEXT)
+	rm -f $(LIBPRE)octave.$(LIBEXT) $(LIBPRE)octave.$(SHLEXT_VER) $(LIBPRE)octave.$(SHLEXT)
 	rm -f $(LIBOCTAVE_OBJECTS) $(MAKEDEPS) $(LIBOCTAVE_PICOBJ) stmp-pic
 	-rmdir pic
 .PHONY: clean
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-13  Michael Goffioul  <michael.goffioul@swing.be>
+
+	* Makefile.in: Adapt rules to use $(LIBPRE).
+
 2006-10-11  John W. Eaton  <jwe@octave.org>
 
 	* mex.h (UINT64_T, uint64_T, INT64_T, int64_T, UINT32_T, uint32_T,
diff --git a/src/Makefile.in b/src/Makefile.in
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -273,13 +273,13 @@
 
 ifeq ($(SHARED_LIBS), true)
   ifeq ($(STATIC_LIBS), true)
-    LIBRARIES = liboctinterp.$(LIBEXT) liboctinterp.$(SHLEXT_VER)
+    LIBRARIES = $(LIBPRE)octinterp.$(LIBEXT) $(LIBPRE)octinterp.$(SHLEXT_VER)
   else
-    LIBRARIES = liboctinterp.$(SHLEXT_VER)
+    LIBRARIES = $(LIBPRE)octinterp.$(SHLEXT_VER)
   endif
 else
   ifeq ($(STATIC_LIBS), true)
-    LIBRARIES = liboctinterp.$(LIBEXT)
+    LIBRARIES = $(LIBPRE)octinterp.$(LIBEXT)
   else
     ## This is not going to work, but hey, you asked for it...
     LIBRARIES =
@@ -289,16 +289,16 @@
 libraries: $(LIBRARIES)
 .PHONY: libraries
 
-liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
+$(LIBPRE)octinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
 	rm -f $@
 	$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^
 	$(RANLIB) $@
 
-liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT)
+$(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBPRE)octinterp.$(SHLEXT)
 	rm -f $@
 	$(LN_S) $< $@
 
-liboctinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
+$(LIBPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
 	rm -f $@
 	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
 
@@ -408,21 +408,21 @@
 install-lib:
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
 	if $(STATIC_LIBS); then \
-	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
-	  $(INSTALL_DATA) liboctinterp.$(LIBEXT) \
-	    $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
-	  $(RANLIB) $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
+	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
+	  $(INSTALL_DATA) $(LIBPRE)octinterp.$(LIBEXT) \
+	    $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
+	  $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
 	fi
 	if $(SHARED_LIBS); then \
-	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLEXT_VER); \
-	  $(INSTALL) liboctinterp.$(SHLLIB) \
-	    $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLLIB_VER); \
-	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLLIB); \
-	  (cd $(DESTDIR)$(octlibdir) ; $(LN_S) liboctinterp.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLLIB)); \
+	  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)); \
 	  if  test x$(SHLBIN) != x ; then \
-	    rm -f $(DESTDIR)$(bindir)/liboctinterp.$(SHLBIN); \
+	    rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octinterp.$(SHLBIN); \
 	    $(INSTALL_PROGRAM) \
-	      liboctinterp.$(SHLBIN) $(DESTDIR)$(bindir)/liboctinterp.$(SHLBIN); \
+	      $(LIBPRE)octinterp.$(SHLBIN) $(DESTDIR)$(bindir)/$(LIBPRE)octinterp.$(SHLBIN); \
 	  fi; \
 	fi
 .PHONY: install-lib
@@ -445,12 +445,12 @@
 
 uninstall:
 	rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
-	rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT)
-	rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLLIB)
-	rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLLIB_VER)
+	rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT)
+	rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB)
+	rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB_VER)
 	if test x$(SHLBIN) != x ; then \
-	  rm -f $(DESTDIR)$(bindir)/liboctinterp.$(SHLBIN); \
-	  rm -f $(DESTDIR)$(bindir)/liboctinterp.$(SHLBIN_VER); \
+	  rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octinterp.$(SHLBIN); \
+	  rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octinterp.$(SHLBIN_VER); \
 	fi
 	for f in $(INCLUDES_FOR_INSTALL) defaults.h oct-conf.h; do \
 	  rm -f $(DESTDIR)$(octincludedir)/octave/$$f; \
@@ -464,8 +464,8 @@
 	etags $(SOURCES) $(DLD_SRC)
 
 clean:
-	rm -f liboctinterp.$(LIBEXT)
-	rm -f liboctinterp.$(SHLEXT_VER) liboctinterp.$(SHLEXT)
+	rm -f $(LIBPRE)octinterp.$(LIBEXT)
+	rm -f $(LIBPRE)octinterp.$(SHLEXT_VER) $(LIBPRE)octinterp.$(SHLEXT)
 	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