1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
$NetBSD: patch-ag,v 1.12 2005/02/22 14:02:31 adam Exp $
--- src/Makefile.in.orig 2004-11-12 05:34:58.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
@@ -377,6 +380,7 @@ install-oct:
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octfiledir); \
xfiles="$(OCT_FILES)"; \
for f in $$xfiles; do \
+ ${LIBTOOL} --mode=install \
$(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \
done; \
$(srcdir)/mk-oct-links $(DESTDIR)$(octfiledir) $(DLD_DEF_FILES); \
@@ -387,9 +391,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 ${BSD_INSTALL_LIB} liboctinterp.$(LIBEXT) \
+ ${PREFIX}/lib; \
fi
if $(SHARED_LIBS); then \
rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLEXT_VER); \
|
