Mercurial > hg > octave-nkf

diff src/Makefile.in @ 6051:583c98eeeae2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-10-13 18:11:26 by jwe]
author jwe
date Fri, 13 Oct 2006 18:11:27 +0000
parents 199f15a8d1fc
children 40ab35ab651c
line wrap: on
line diff
--- 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