Renamed the TOP variable in the Makefiles to OSGHOME.

src/Demos/Makefile

@@ -3,11 +3,11 @@ SHELL=/bin/sh
 
 DIRS = sgv osgconv osgcube osgreflect osgtexture osgimpostor osgviews hangglide 
 
-# comment out if you don't have 
-#DIRS += osgcluster
-
 # comment out if you don't have the freetype and GLU1.3 library installed.
-#DIRS += osgtext 
+DIRS += osgtext 
+
+# comment out if you don't have support for networking.
+#DIRS += osgcluster
 
 # comment out if you don't have the wxWindows installed.
 # DIRS += wxsgv

src/Demos/hangglide/Makefile

@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	hangglide.cpp\
@@ -12,7 +12,7 @@ C++FILES = \
 	base.cpp\
 	trees.cpp\
 
-TARGET = $(TOP)/bin/hangglide
+TARGET = $(OSGHOME)/bin/hangglide
 
 TARGET_BIN_FILES = hangglide
 
@@ -22,7 +22,7 @@ TARGET_BIN_FILES = hangglide
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 # $(OSGDB_LIBS)
-C++FLAGS += -I. -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules

src/Demos/osgcluster/Makefile

@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
         broadcaster.cpp\
@@ -8,7 +8,7 @@ C++FILES = \
 
 C++FLAGS += -g 
 
-TARGET = $(TOP)/bin/osgcluster
+TARGET = $(OSGHOME)/bin/osgcluster
 
 TARGET_BIN_FILES = osgcluster
 
@@ -18,8 +18,8 @@ TARGET_BIN_FILES = osgcluster
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 

src/Demos/osgconv/Makefile

@@ -1,12 +1,12 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	osgconv.cpp\
 	OrientationConverter.cpp
 
 
-TARGET = $(TOP)/bin/osgconv
+TARGET = $(OSGHOME)/bin/osgconv
 
 TARGET_BIN_FILES = osgconv
 
@@ -16,7 +16,7 @@ TARGET_BIN_FILES = osgconv
 #note, standard library list. 
 LIBS = -losgDB -losg $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules

src/Demos/osgcube/Makefile

@@ -1,15 +1,15 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	osgcube.cpp
 
-TARGET = $(TOP)/bin/osgcube
+TARGET = $(OSGHOME)/bin/osgcube
 
 TARGET_BIN_FILES = osgcube
 
 LIBS = -losgGLUT -losgDB -losgUtil -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules

src/Demos/osgimpostor/Makefile

@@ -1,10 +1,10 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	osgimpostor.cpp
 
-TARGET = $(TOP)/bin/osgimpostor
+TARGET = $(OSGHOME)/bin/osgimpostor
 
 TARGET_BIN_FILES = osgimpostor
 
@@ -14,8 +14,8 @@ TARGET_BIN_FILES = osgimpostor
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 

src/Demos/osgreflect/Makefile

@@ -1,10 +1,10 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	osgreflect.cpp \
 
-TARGET = $(TOP)/bin/osgreflect
+TARGET = $(OSGHOME)/bin/osgreflect
 
 TARGET_BIN_FILES = osgreflect
 
@@ -14,7 +14,7 @@ TARGET_BIN_FILES = osgreflect
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules

src/Demos/osgtext/Makefile

@@ -1,10 +1,10 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	main.cpp
 
-TARGET = $(TOP)/bin/osgtext
+TARGET = $(OSGHOME)/bin/osgtext
 
 TARGET_BIN_FILES = osgtext
 
@@ -14,8 +14,8 @@ TARGET_BIN_FILES = osgtext
 #note, standard library list. 
 LIBS = -losgGLUT -losgText -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include -g
-LDFLAGS += -L$(TOP)/lib -L/usr/freeware/lib32
+C++FLAGS += -I$(OSGHOME)/include -g
+LDFLAGS += -L$(OSGHOME)/lib -L/usr/freeware/lib32
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 

src/Demos/osgtexture/Makefile

@@ -1,10 +1,10 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	osgtexture.cpp
 
-TARGET = $(TOP)/bin/osgtexture
+TARGET = $(OSGHOME)/bin/osgtexture
 
 TARGET_BIN_FILES = osgtexture
 
@@ -14,7 +14,7 @@ TARGET_BIN_FILES = osgtexture
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules

src/Demos/osgviews/Makefile

@@ -1,10 +1,10 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	osgviews.cpp
 
-TARGET = $(TOP)/bin/osgviews
+TARGET = $(OSGHOME)/bin/osgviews
 
 TARGET_BIN_FILES = osgviews
 
@@ -14,8 +14,8 @@ TARGET_BIN_FILES = osgviews
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 

src/Demos/sgv/Makefile

@@ -1,18 +1,18 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	sgv.cpp
 
-TARGET = $(TOP)/bin/sgv
+TARGET = $(OSGHOME)/bin/sgv
 
 TARGET_BIN_FILES = sgv
 
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 

src/Demos/wxsgv/Makefile

@@ -1,14 +1,14 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	$(wildcard *.cpp)
 
-TARGET = $(TOP)/bin/wxsgv
+TARGET = $(OSGHOME)/bin/wxsgv
 
 TARGET_BIN_FILES = wxsgv
 
-C++FLAGS += -I$(TOP)/include `wx-config --cflags`
+C++FLAGS += -I$(OSGHOME)/include `wx-config --cflags`
 
 #note, use this library list when using the Performer osgPlugin.
 #LIBS = ${PFLIBS} -losgWX -losgUtil -losgDB -losg \
@@ -20,8 +20,8 @@ LIBS = -losgWX -losgUtil -losgDB -losg \
        `wx-config --libs` -lwx_gtk_gl \
 	   $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include -I./icons
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include -I./icons
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules