blob: 3a43a0789d5fcfc5a6edeb18775f3c293df91886 (
plain)
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
|
$NetBSD: patch-ag,v 1.7 2004/03/29 16:20:16 adam Exp $
--- src/Makefile.in.orig 2004-02-20 21:16:54.000000000 +0000
+++ src/Makefile.in
@@ -246,8 +246,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 $@
@@ -267,6 +268,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) \
@@ -347,6 +349,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
@@ -366,9 +369,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); \
|