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
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
$NetBSD: patch-ag,v 1.4 2002/03/07 06:18:36 jmc Exp $
--- src/Makefile.in.orig Thu Mar 7 00:07:18 2002
+++ src/Makefile.in Thu Mar 7 05:14:39 2002
@@ -143,13 +143,7 @@
OBJECTS_1 := $(patsubst %.c, %.o, $(OBJECTS_2))
OBJECTS := $(patsubst %.cc, %.o, $(OBJECTS_1))
-ifeq ($(SHARED_LIBS), true)
- ifdef CXXPICFLAG
- PICOBJ := $(addprefix pic/, $(OBJECTS))
- else
- PICOBJ := $(OBJECTS)
- endif
-endif
+PICOBJ := $(OBJECTS)
# Ugh.
@@ -184,8 +178,8 @@
DOC_FILES := $(sort $(DEF_FILES) $(patsubst %, %.df, $(VAR_FILES)))
-OCTAVE_LFLAGS = -L$(TOPDIR)/liboctave -L$(TOPDIR)/libcruft \
- -L$(TOPDIR)/src $(RLD_FLAG)
+OCTAVE_LFLAGS = -L$(TOPDIR)/liboctave/.libs -L$(TOPDIR)/libcruft/.libs \
+ -L$(TOPDIR)/src/.libs $(RLD_FLAG)
OCTAVE_LIBS = $(LIBOCTINTERP) $(LIBOCTAVE) $(SPECIAL_MATH_LIB) $(LIBCRUFT) \
$(LIBPLPLOT) $(LIBREADLINE) $(LIBKPATHSEA) $(LIBGLOB) $(LIBDLFCN)
@@ -210,30 +204,13 @@
XERBLA = ../libcruft/blas-xtra/xerbla.o
-ifeq ($(SHARED_LIBS), true)
- ifeq ($(STATIC_LIBS), true)
- LIBRARIES = liboctinterp.$(LIBEXT) liboctinterp.$(SHLEXT)
- else
- LIBRARIES = liboctinterp.$(SHLEXT)
- XERBLA = ../libcruft/blas-xtra/pic/xerbla.o
- endif
-else
- ifeq ($(STATIC_LIBS), true)
- LIBRARIES = liboctinterp.$(LIBEXT)
- else
- ## This is not going to work, but hey, you asked for it...
- LIBRARIES =
- XERBLA =
- endif
-endif
+LIBRARIES = liboctinterp.$(LIBEXT)
libraries: $(LIBRARIES)
.PHONY: libraries
liboctinterp.$(LIBEXT): $(OBJECTS)
- rm -f $@
- $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^
- $(RANLIB) $@
+ ${LIBTOOL} --mode=link cc -o liboctinterp.la ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info ${version:2.1.%=2:%}
liboctinterp.$(SHLEXT): liboctinterp.$(SHLEXT_VER)
rm -f $@
@@ -259,7 +236,7 @@
octave.o builtins.o ops.o $(XERBLA) $(DLD_STATIC_OBJ) \
$(OCTAVE_LFLAGS) \
$(OCTAVE_LIBS) \
- $(LEXLIB) $(TERMLIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS)
+ $(LEXLIB) $(TERMLIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) -lg2c
stmp-pic: pic
@if [ -f stmp-pic ]; then \
@@ -288,6 +265,9 @@
@$(srcdir)/mkbuiltins def-files var-files > $@.t
@$(top_srcdir)/move-if-change $@.t $@
+parse.o: parse.cc
+ ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(filter-out -O -O2,$(ALL_CXXFLAGS)) $< -o $@
+
DOCSTRINGS: gendoc
./gendoc > $@.t
mv $@.t $@
@@ -344,20 +324,7 @@
install-lib:
$(top_srcdir)/mkinstalldirs $(octlibdir)
- if $(STATIC_LIBS); then \
- rm -f $(octlibdir)/liboctinterp.$(LIBEXT); \
- $(INSTALL_DATA) liboctinterp.$(LIBEXT) \
- $(octlibdir)/liboctinterp.$(LIBEXT); \
- $(RANLIB) $(octlibdir)/liboctinterp.$(LIBEXT); \
- fi
- if $(SHARED_LIBS); then \
- rm -f $(octlibdir)/liboctinterp.$(SHLEXT_VER); \
- $(INSTALL_PROGRAM) liboctinterp.$(SHLEXT_VER) \
- $(octlibdir)/liboctinterp.$(SHLEXT_VER); \
- cd $(octlibdir); \
- rm -f liboctinterp.$(SHLEXT); \
- $(LN_S) liboctinterp.$(SHLEXT_VER) liboctinterp.$(SHLEXT); \
- fi
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} liboctinterp.la ${PREFIX}/lib
$(mk-libdir-link)
.PHONY: install-lib
@@ -449,11 +416,6 @@
.PHONY: bin-dist
# Special rules -- these files need special things to be defined.
-
-parse.cc : parse.y
- @echo "expect 11 shift/reduce conflicts"
- $(YACC) $(YFLAGS) $<
- @$(top_srcdir)/move-if-change y.tab.c $(@F)
lex.cc : lex.l
$(LEX) $(LFLAGS) $< > $(@F)
|
