66 lines
2.5 KiB
Text
66 lines
2.5 KiB
Text
$NetBSD: patch-ag,v 1.10 2004/09/23 13:03:41 adam Exp $
|
|
|
|
--- src/Makefile.in.orig 2004-09-02 03:48:47.000000000 +0000
|
|
+++ src/Makefile.in
|
|
@@ -32,10 +32,10 @@ CXXFLAGS_NO_PT_FLAGS = $(filter-out $(PT
|
|
ifeq ($(ENABLE_DYNAMIC_LINKING), true)
|
|
ifdef CXXPICFLAG
|
|
%.oct : pic/%.o octave$(EXEEXT)
|
|
- $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS)
|
|
+ ${LIBTOOL} --mode=link $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS)
|
|
else
|
|
%.oct : %.o octave$(EXEEXT)
|
|
- $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS)
|
|
+ ${LIBTOOL} --mode=link $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS)
|
|
endif
|
|
endif
|
|
|
|
@@ -267,8 +267,9 @@ libraries: $(LIBRARIES)
|
|
|
|
liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
|
|
rm -f $@
|
|
- $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^
|
|
- $(RANLIB) $@
|
|
+ ${LIBTOOL} --mode=link ${CC} -o liboctinterp.$(LIBEXT) \
|
|
+ $(OBJECTS:.o=.lo) $(XERBLA:.o=.lo) -rpath ${PREFIX}/lib \
|
|
+ -version-info ${version:2.1.%=2:%}
|
|
|
|
liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT)
|
|
rm -f $@
|
|
@@ -276,7 +277,7 @@ liboctinterp.$(SHLEXT_VER): liboctinterp
|
|
|
|
liboctinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
|
|
rm -f $@
|
|
- $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
|
|
+ ${LIBTOOL} --mode=link $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
|
|
|
|
stamp-oct-links: $(OCT_FILES)
|
|
if [ -n "$(OCT_FILES)" ]; then \
|
|
@@ -288,6 +289,7 @@ stamp-prereq: defaults.h oct-conf.h oct-
|
|
touch stamp-prereq
|
|
|
|
octave$(EXEEXT): stamp-prereq $(LIBRARIES) main.o $(DLD_STATIC_OBJ)
|
|
+ ${LIBTOOL} --mode=link \
|
|
$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
|
|
$(ALL_LDFLAGS) -o $@ \
|
|
main.o $(DLD_STATIC_OBJ) \
|
|
@@ -368,6 +370,7 @@ install-strip:
|
|
install-bin:
|
|
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
|
|
rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
|
|
+ ${LIBTOOL} --mode=install \
|
|
$(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
|
|
$(LN_S) octave-$(version)$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT)
|
|
.PHONY: install-bin
|
|
@@ -387,9 +390,8 @@ 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); \
|
|
+ ${LIBTOOL} --mode=install $(INSTALL_DATA) liboctinterp.$(LIBEXT) \
|
|
+ ${PREFIX}/lib; \
|
|
fi
|
|
if $(SHARED_LIBS); then \
|
|
rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLEXT_VER); \
|