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
|
$NetBSD: patch-ag,v 1.16 2007/09/19 18:09:17 drochner Exp $
--- src/Makefile.in.orig 2007-09-17 22:47:41.000000000 +0200
+++ src/Makefile.in
@@ -191,7 +191,7 @@ BUILT_EXTRAS := graphics.h mxarray.h
EXTRAS := ov-base-int.cc ov-base-mat.cc ov-base-scalar.cc
-EXTRA_OBJECTS := oct-errno.o octave.o builtins.o ops.o
+EXTRA_OBJECTS := oct-errno.o builtins.o ops.o
INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS) $(BUILT_EXTRAS)
@@ -305,8 +305,9 @@ libraries: $(LIBRARIES)
$(LIBPRE)octinterp.$(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.9.%=2:%}
$(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBPRE)octinterp.$(SHLEXT)
rm -f $@
@@ -314,12 +315,13 @@ $(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBP
$(LIBPRE)octinterp.$(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-prereq: defaults.h graphics.h oct-conf.h oct-gperf.h parse.cc lex.cc __gnuplot_raw__.cc $(OPT_HANDLERS)
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) \
@@ -410,6 +412,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)
cd $(DESTDIR)$(bindir) ; $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT)
.PHONY: install-bin
@@ -420,6 +423,7 @@ install-oct:
if [ -n "$(OCT_FILES)" ]; then \
xfiles="$(OCT_FILES)"; \
for f in $$xfiles; do \
+ ${LIBTOOL} --mode=install \
$(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \
done; \
fi
@@ -429,9 +433,8 @@ install-lib:
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
if $(STATIC_LIBS); then \
rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
- $(INSTALL_DATA) $(LIBPRE)octinterp.$(LIBEXT) \
- $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
- $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctinterp.$(LIBEXT) \
+ ${PREFIX}/lib; \
fi
if $(SHARED_LIBS); then \
rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLEXT_VER); \
|
