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
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
Description: Add required libraries
Add common libraries required now that ld is
"improved" and no longer finds symbols in
shared libs linked to shared libs.
Author: Steve M. Robbins <smr@debian.org>
--- inventor-2.1.5-10.orig/make/ivcommondefs
+++ inventor-2.1.5-10/make/ivcommondefs
@@ -92,6 +92,7 @@
LDDSOOPTS += -L$(X11LIBDIR)
LDOPTS += -L$(X11LIBDIR)
+LLDLIBSCOMMON = -lXm -lXt -lGLw -lGL -lX11
endif
--- inventor-2.1.5-10.orig/apps/nodes/Decal/GNUmakefile
+++ inventor-2.1.5-10/apps/nodes/Decal/GNUmakefile
@@ -5,7 +5,7 @@ DSO = Decal.so
CXXFILES = Decal.c++
-LLDLIBS = -lInventor -lInventorXt
+LLDLIBS = -lGL -lInventor -lInventorXt -lc
all install: all_ivbin
--- inventor-2.1.5-10.orig/lib/GNUmakefile
+++ inventor-2.1.5-10/lib/GNUmakefile
@@ -1,8 +1,7 @@
LLDLIBS = \
-ljpeg -limage $(FLLIB) \
- -lX11 -lm \
- -lGLU -lGL
+ -lGLU -lGL -lX11 -ldl -lm
OBJECTS = \
./database/src/sb/projectors/SbProjectors.o \
--- inventor-2.1.5-10.orig/apps/samples/widgets/GNUmakefile.componentTest
+++ inventor-2.1.5-10/apps/samples/widgets/GNUmakefile.componentTest
@@ -5,7 +5,7 @@
CXXFILES = componentTest.c++
-LLDLIBS = libInventorWidget.a -lInventor -lInventorXt -lGLw
+LLDLIBS = libInventorWidget.a -lInventor -lInventorXt $(LLDLIBSCOMMON)
all install: all_ivbin
--- inventor-2.1.5-10.orig/apps/tools/ivview/GNUmakefile
+++ inventor-2.1.5-10/apps/tools/ivview/GNUmakefile
@@ -7,7 +7,7 @@
LLDOPTS += -L../../samples/widgets
-LLDLIBS = -lInventorWidget -lInventorXt -lInventor
+LLDLIBS = -lInventorWidget -lInventorXt -lInventor $(LLDLIBSCOMMON)
all: all_ivbin
--- inventor-2.1.5-10.orig/apps/demos/SceneViewer/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/SceneViewer/GNUmakefile
@@ -8,7 +8,7 @@
LLDOPTS += -L../../samples/widgets
-LLDLIBS = -lInventorWidget -lInventor -lInventorXt
+LLDLIBS = -lInventorWidget -lInventor -lInventorXt $(LLDLIBSCOMMON)
all: all_ivbin
--- inventor-2.1.5-10.orig/apps/demos/drop/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/drop/GNUmakefile
@@ -8,7 +8,7 @@
TsBlock.c++ TsPiece.c++ TsPieces.c++ TsField.c++ \
TsTrickle.c++ TsEvents.c++ TsRemoval.c++ TsViewer.c++ drop.c++
-LLDLIBS = -lInventor -lInventorXt
+LLDLIBS = -lInventor -lInventorXt $(LLDLIBSCOMMON)
all: all_ivbin
--- inventor-2.1.5-10.orig/apps/demos/gview/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/gview/GNUmakefile
@@ -8,7 +8,7 @@
gview.c++ DisplayGraph.c++ Error.c++ FieldEditor.c++ \
GraphIcon.c++ GraphViewer.c++ NodeCreator.c++
-LLDLIBS = -lInventor -lInventorXt
+LLDLIBS = -lInventor -lInventorXt $(LLDLIBSCOMMON)
all: all_ivbin
--- inventor-2.1.5-10.orig/apps/demos/maze/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/maze/GNUmakefile
@@ -8,7 +8,7 @@
CXXFILES = maze.c++
-LLDLIBS = -lInventor -lInventorXt
+LLDLIBS = -lInventor -lInventorXt $(LLDLIBSCOMMON)
all: all_ivbin
--- inventor-2.1.5-10.orig/apps/demos/noodle/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/noodle/GNUmakefile
@@ -16,7 +16,7 @@
../../nodes/GeneralizedCylinder/NurbMaker.o \
../../nodes/GeneralizedCylinder/Triangulator.o \
../../nodes/GeneralizedCylinder/GeneralizedCylinder.o \
- -lInventor -lInventorXt
+ -lInventor -lInventorXt $(LLDLIBSCOMMON)
all: all_ivbin
--- inventor-2.1.5-10.orig/apps/demos/qmorf/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/qmorf/GNUmakefile
@@ -6,7 +6,7 @@
CXXFILES = QuadThing.c++ Background.c++ FlashBackground.c++
-LLDLIBS = -lInventor -lInventorXt
+LLDLIBS = -lInventor -lInventorXt $(LLDLIBSCOMMON)
all: all_ivbin
--- inventor-2.1.5-10.orig/apps/demos/revo/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/revo/GNUmakefile
@@ -10,7 +10,7 @@
LLDOPTS += -L../../samples/common
-LLDLIBS = -lcommon -lInventor -lInventorXt
+LLDLIBS = -lcommon -lInventor -lInventorXt $(LLDLIBSCOMMON)
all: all_ivbin
--- inventor-2.1.5-10.orig/apps/demos/textomatic/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/textomatic/GNUmakefile
@@ -8,7 +8,7 @@
LLDOPTS += -L../../samples/common
-LLDLIBS = -lcommon -lInventor -lInventorXt
+LLDLIBS = -lcommon -lInventor -lInventorXt $(LLDLIBSCOMMON)
all: all_ivbin
|
