info-inventor-dev
[Top] [All Lists]

Patches for Makefiles

To: info-inventor-dev@xxxxxxxxxxx
Subject: Patches for Makefiles
From: "Marc Brett" <mbrett@xxxxxxxxxxxxxxxxxxxx>
Date: Mon, 9 Oct 2000 15:09:49 +0100
Sender: owner-info-inventor-dev@xxxxxxxxxxx
There are 2 classes of bugs fixed by these patches:

1) /usr/lib/Inventor[Xt].so needs to be in place successfully to build
   the code, but I haven't built it yet, so...  Catch 22!  Instead, refer
   explicitly to the locally-built stuff when linking code or running ivman.

2) Many of the executables require -lXp in order to link.  I'm not sure
   if this is an OpenMotif thing, but my system sure needs it.  I've set
   up the patches so that if /usr/X11R6/lib/libXp.so exists, then add
   -lXp to the list of required libraries.  My config:

        Redhat 6.2
        OpenMotif 2.1.30-2_ICS
        lesstif 0.89.9-29
        XFree86 3.3.6-20 with XFree86 4.0 installed on top of it
        nVidia 0.9-4 drivers and GeForce card.

Regards,

Marc

-- 
Marc Brett  +44 20 8560 3160            Western Geophysical
Marc.Brett@xxxxxxxxxxx                  455 London Road, Isleworth
FAX: +44 20 8847 5711                   Middlesex TW7 5AA    UK
--- ./apps/converters/ivdowngrade/GNUmakefile.orig      Mon Sep 18 10:40:59 2000
+++ ./apps/converters/ivdowngrade/GNUmakefile   Mon Oct  9 13:36:21 2000
@@ -22,6 +22,8 @@
        SoText2V2.c++ \
        SoText3V2.c++
 
+LLDOPTS += -L../../../lib
+
 LLDLIBS = -lInventor
 
 all: all_ivbin
--- ./apps/demos/SceneViewer/GNUmakefile.orig   Mon Sep 18 10:40:59 2000
+++ ./apps/demos/SceneViewer/GNUmakefile        Mon Oct  9 13:46:03 2000
@@ -6,9 +6,9 @@
 
 CXXFILES = SceneViewer.c++ SoSceneViewer.c++ SvManipList.c++
 
-LLDOPTS += -L../../samples/widgets
+LLDOPTS += -L../../samples/widgets -L../../../lib -L../../../libSoXt
 
-LLDLIBS = -lInventorWidget -lInventor -lInventorXt
+LLDLIBS = -lInventorWidget -lInventor -lInventorXt $(LIBXP)
 
 all: all_ivbin
 
--- ./apps/demos/drop/GNUmakefile.orig  Mon Sep 18 10:40:59 2000
+++ ./apps/demos/drop/GNUmakefile       Mon Oct  9 13:46:40 2000
@@ -8,7 +8,9 @@
        TsBlock.c++ TsPiece.c++ TsPieces.c++ TsField.c++ \
        TsTrickle.c++ TsEvents.c++ TsRemoval.c++ TsViewer.c++ drop.c++
 
-LLDLIBS = -lInventor -lInventorXt
+LLDOPTS += -L../../../lib -L../../../libSoXt
+
+LLDLIBS = -lInventor -lInventorXt $(LIBXP)
 
 all: all_ivbin
 
--- ./apps/demos/gview/GNUmakefile.orig Mon Sep 18 10:40:59 2000
+++ ./apps/demos/gview/GNUmakefile      Mon Oct  9 13:47:29 2000
@@ -8,7 +8,9 @@
        gview.c++ DisplayGraph.c++ Error.c++ FieldEditor.c++ \
        GraphIcon.c++ GraphViewer.c++ NodeCreator.c++
 
-LLDLIBS = -lInventor -lInventorXt
+LLDOPTS += -L../../../lib -L../../../libSoXt
+
+LLDLIBS = -lInventor -lInventorXt $(LIBXP)
 
 all: all_ivbin
 
--- ./apps/demos/maze/GNUmakefile.orig  Mon Sep 18 10:41:00 2000
+++ ./apps/demos/maze/GNUmakefile       Mon Oct  9 13:48:02 2000
@@ -8,7 +8,9 @@
 
 CXXFILES = maze.c++
 
-LLDLIBS = -lInventor -lInventorXt
+LLDOPTS += -L../../../lib -L../../../libSoXt
+
+LLDLIBS = -lInventor -lInventorXt $(LIBXP)
 
 all: all_ivbin
 
--- ./apps/demos/noodle/GNUmakefile.orig        Mon Sep 18 10:41:00 2000
+++ ./apps/demos/noodle/GNUmakefile     Mon Oct  9 13:48:40 2000
@@ -12,11 +12,13 @@
        NoodleTextureGizmo.c++ noodle.c++ LineManipHilight.c++  \
        profile.c++
 
+LLDOPTS += -L../../../lib -L../../../libSoXt
+
 LLDLIBS = \
        ../../nodes/GeneralizedCylinder/NurbMaker.o \
        ../../nodes/GeneralizedCylinder/Triangulator.o \
        ../../nodes/GeneralizedCylinder/GeneralizedCylinder.o \
-       -lInventor -lInventorXt
+       -lInventor -lInventorXt $(LIBXP)
 
 all: all_ivbin
 
--- ./apps/demos/qmorf/GNUmakefile.orig Mon Sep 18 10:41:00 2000
+++ ./apps/demos/qmorf/GNUmakefile      Mon Oct  9 13:49:09 2000
@@ -6,7 +6,9 @@
 
 CXXFILES = QuadThing.c++ Background.c++ FlashBackground.c++
 
-LLDLIBS = -lInventor -lInventorXt
+LLDOPTS += -L../../../lib -L../../../libSoXt
+
+LLDLIBS = -lInventor -lInventorXt $(LIBXP)
 
 all: all_ivbin
 
--- ./apps/demos/revo/GNUmakefile.orig  Mon Sep 18 10:41:00 2000
+++ ./apps/demos/revo/GNUmakefile       Mon Oct  9 13:49:49 2000
@@ -8,9 +8,9 @@
 
 CXXFILES = revo.c++ RevClass.c++ profile.c++
 
-LLDOPTS += -L../../samples/common
+LLDOPTS += -L../../samples/common -L../../../lib -L../../../libSoXt
 
-LLDLIBS = -lcommon -lInventor -lInventorXt
+LLDLIBS = -lcommon -lInventor -lInventorXt $(LIBXP)
 
 all: all_ivbin
 
--- ./apps/demos/textomatic/GNUmakefile.orig    Mon Sep 18 10:41:00 2000
+++ ./apps/demos/textomatic/GNUmakefile Mon Oct  9 13:50:22 2000
@@ -6,9 +6,9 @@
 
 CXXFILES = textomatic.c++ TextGraph.c++ TextWrapper.c++
 
-LLDOPTS += -L../../samples/common
+LLDOPTS += -L../../samples/common -L../../../lib -L../../../libSoXt
 
-LLDLIBS = -lcommon -lInventor -lInventorXt
+LLDLIBS = -lcommon -lInventor -lInventorXt $(LIBXP)
 
 all: all_ivbin
 
--- ./apps/nodes/BarChart/GNUmakefile.orig      Mon Sep 18 10:41:01 2000
+++ ./apps/nodes/BarChart/GNUmakefile   Mon Oct  9 13:44:35 2000
@@ -5,6 +5,8 @@
 
 CXXFILES = BarChart.c++
 
+LLDDSOOPTS += -L../../../lib -L../../../libSoXt
+
 LLDLIBS = -lInventor -lInventorXt
 
 all install: all_ivbin
--- ./apps/nodes/Decal/GNUmakefile.orig Mon Sep 18 10:41:01 2000
+++ ./apps/nodes/Decal/GNUmakefile      Mon Oct  9 13:44:47 2000
@@ -5,6 +5,8 @@
 
 CXXFILES = Decal.c++
 
+LLDDSOOPTS += -L../../../lib -L../../../libSoXt
+
 LLDLIBS = -lInventor -lInventorXt
 
 all install: all_ivbin
--- ./apps/nodes/GeneralizedCylinder/GNUmakefile.orig   Mon Sep 18 10:41:01 2000
+++ ./apps/nodes/GeneralizedCylinder/GNUmakefile        Mon Oct  9 13:42:56 2000
@@ -7,6 +7,8 @@
        GeneralizedCylinder.c++ Triangulator.c++ \
        NurbMaker.c++
 
+LLDDSOOPTS += -L../../../lib -L../../../libSoXt
+
 LLDLIBS = -lInventor -lInventorXt
 
 all install: all_ivbin
--- ./apps/samples/widgets/GNUmakefile.componentTest.orig       Mon Sep 18 
08:51:58 2000
+++ ./apps/samples/widgets/GNUmakefile.componentTest    Mon Oct  9 13:31:35 2000
@@ -5,7 +5,9 @@
 
 CXXFILES = componentTest.c++
 
-LLDLIBS = libInventorWidget.a -lInventor -lInventorXt -lGLw
+LLDOPTS += -L../../../lib  -L../../../libSoXt
+
+LLDLIBS = libInventorWidget.a -lInventor -lInventorXt -lGLw $(LIBXP)
 
 LTARGETS = libInventorWidget.a
 
--- ./apps/tools/ivcat/GNUmakefile.orig Mon Sep 18 10:41:03 2000
+++ ./apps/tools/ivcat/GNUmakefile      Mon Oct  9 13:32:40 2000
@@ -5,6 +5,8 @@
 
 CXXFILES = ivcat.c++
 
+LLDOPTS += -L../../../lib
+
 LLDLIBS = -lInventor
 
 all: all_ivbin
--- ./apps/tools/ivfix/GNUmakefile.orig Mon Sep 18 10:41:03 2000
+++ ./apps/tools/ivfix/GNUmakefile      Mon Oct  9 13:34:05 2000
@@ -22,6 +22,8 @@
        IfTypes.c++     \
        IfWeeder.c++
 
+LLDOPTS += -L../../../lib
+
 LLDLIBS = -lInventor
 
 all: all_ivbin
--- ./apps/tools/ivinfo/GNUmakefile.orig        Mon Sep 18 10:41:03 2000
+++ ./apps/tools/ivinfo/GNUmakefile     Mon Oct  9 13:34:53 2000
@@ -4,7 +4,9 @@
 PROGRAM = ivinfo
 
 CXXFILES = ivinfo.c++
-       
+
+LLDOPTS += -L../../../lib
+
 LLDLIBS = -lInventor
 
 all: all_ivbin
--- ./apps/tools/ivview/GNUmakefile.orig        Mon Sep 18 10:41:03 2000
+++ ./apps/tools/ivview/GNUmakefile     Mon Oct  9 13:35:38 2000
@@ -5,9 +5,9 @@
 
 CXXFILES = ivview.c++
 
-LLDOPTS += -L../../samples/widgets
+LLDOPTS += -L../../samples/widgets -L../../../lib -L../../../libSoXt
 
-LLDLIBS = -lInventorWidget -lInventorXt -lInventor
+LLDLIBS = -lInventorWidget -lInventorXt -lInventor $(LIBXP)
 
 all: all_ivbin
 
--- ./doc/man/ivman/GNUmakefile.orig    Mon Sep 18 10:11:13 2000
+++ ./doc/man/ivman/GNUmakefile Mon Oct  9 13:28:11 2000
@@ -5,7 +5,9 @@
 
 CXXFILES = Main.c++ ClassDef.c++ Man.c++ Reader.c++ Writer.c++ BuildIssues.c++
 
-LLDLIBS = -lInventor -lInventorXt
+LLDOPTS += -L../../../lib  -L../../../libSoXt
+
+LLDLIBS = -lInventor -lInventorXt $(LIBXP)
 
 all install: $(PROGRAM)
 
--- ./libSoXt/GNUmakefile.orig  Mon Sep 18 11:22:53 2000
+++ ./libSoXt/GNUmakefile       Mon Oct  9 13:43:17 2000
@@ -3,6 +3,8 @@
 
 LIBDSO = libInventorXt.so
 
+LLDDSOOPTS += -L../lib
+
 LLDLIBS = \
        -lXm -lXt -lXext -lXi -lX11 -lm \
        -lInventor -lGLU -lGL
--- ./make/commondefs.orig      Mon Sep 18 08:27:37 2000
+++ ./make/commondefs   Wed Oct  4 16:12:51 2000
@@ -348,6 +348,10 @@
 
 GLDLIBS= 
 
+ifeq ($(usingLinux), 1)
+LIBXP = $(shell if test -r $(X11DIR)/lib/libXp.so ; then echo -lXp; else echo 
; fi)
+endif
+
 #
 # LDFLAG layout
 #
--- ./make/ivcommonrules.orig   Mon Sep 18 08:27:37 2000
+++ ./make/ivcommonrules        Mon Oct  9 14:13:01 2000
@@ -53,6 +53,8 @@
 .SUFFIXES: .ivm .3iv
 
 .ivm.3iv:
+       
LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:`pwd`/$(IVDEPTH)/lib:`pwd`/$(IVDEPTH)/libSoXt 
; \
+       export LD_LIBRARY_PATH ; \
        (cd ..; $(IVMAN) `$(MAKEMANDIRS) $(*F)`) > $@
 
 MAN3PAGES = $(IVMFILES:.ivm=.3iv)
<Prev in Thread] Current Thread [Next in Thread>