The new order for building OSG. All Makefiles are replaced and

the Make directory is left with four files only : makedefs makerules makedirrules instrules These work for all platforms supported so far, which include : Linux Irix Solaris MacOSX Cygwin FreeBSD
2002-04-02 06:44:57 +00:00
parent 9f4f491851
commit 3e6638320a
64 changed files with 465 additions and 2984 deletions
--- a/src/Demos/Makefile
+++ b/src/Demos/Makefile
@@ -1,41 +1,22 @@
-#!gmake
-SHELL=/bin/sh
+TOPDIR = ../..
+include $(TOPDIR)/Make/makedefs

-DIRS = sgv osgconv osgcube osgscribe osgreflect osgtexture osgimpostor osgviews osgcopy osgbillboard osgstereoimage hangglide 
+DIRS = \
+	hangglide\
+	osgbillboard\
+	osgcluster\
+	osgconv\
+	osgcopy\
+	osgcube\
+	osgimpostor\
+	osgreflect\
+	osgscribe\
+	osgstereoimage\
+	osgtexture\
+	osgviews\
+	sgv

-# comment out if you don't have the freetype and GLU1.3 library installed.
-DIRS += osgtext 
+LEFT_TO_DO =\
+	osgtext\

-# comment out if you don't have support for networking.
-DIRS += osgcluster
-
-all :
-	for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done
-
-clean :
-	for f in $(DIRS) ; do cd $$f; $(MAKE) clean; cd ..;  done
-
-clobber : 
-	for f in $(DIRS) ; do cd $$f; $(MAKE) clobber; cd ..;  done
-
-depend : 
-	for f in $(DIRS) ; do cd $$f; $(MAKE) depend; cd ..;  done
-
-to_unix : 
-	for f in $(DIRS) ; do cd $$f; to_unix Makefile Makefile; cd ..;  done
-	for f in $(DIRS) ; do cd $$f; $(MAKE)to_unix; cd ..;  done
-
-beautify : 
-	for f in $(DIRS) ; do cd $$f; $(MAKE)beautify; cd ..;  done
-
-install :
-	for f in $(DIRS)  ; do cd $$f; $(MAKE) install; cd ..;  done
-
-instlinks :
-	for f in $(DIRS)  ; do cd $$f; $(MAKE) instlinks; cd ..;  done
-
-instclean :
-	for f in $(DIRS)  ; do cd $$f; $(MAKE) instclean; cd ..;  done
-
-test :
-	for f in $(DIRS)  ; do cd $$f; $(MAKE) test; cd ..;  done
+include $(TOPDIR)/Make/makedirrules
--- a/src/Demos/hangglide/Makefile
+++ b/src/Demos/hangglide/Makefile
@@ -1,36 +1,19 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-	hangglide.cpp\
-	ReaderWriterFLY.cpp\
-	GliderManipulator.cpp\
-	hat.cpp\
-	terrain.cpp\
-	tank.cpp\
-	sky.cpp\
+CXXFILES =\
 	base.cpp\
+	GliderManipulator.cpp\
+	hangglide.cpp\
+	hat.cpp\
+	ReaderWriterFLY.cpp\
+	sky.cpp\
+	tank.cpp\
+	terrain.cpp\
 	trees.cpp\

-TARGET = $(OSGHOME)/bin/hangglide
+LIBS     += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 

-TARGET_BIN_FILES = hangglide
+EXEC = osghangglide

-#note, use this library list when using the Performer osgPlugin.
-#LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL  -lm -lXmu  -lX11 -lXi
-
-#note, standard library list. 
-LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-
-#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
-MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
-
-
-# $(OSGDB_LIBS)
-C++FLAGS += -I. -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
-
-test :
-	hangglide
+include $(TOPDIR)/Make/makerules 
--- a/src/Demos/osgbillboard/Makefile
+++ b/src/Demos/osgbillboard/Makefile
@@ -1,27 +1,12 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
 	osgbillboard.cpp

-TARGET = $(OSGHOME)/bin/osgbillboard
-
-TARGET_BIN_FILES = osgbillboard
-
-#note, use this library list when using the Performer osgPlugin.
-#LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL  -lm -lXmu  -lX11 -lXi
-
-#note, standard library list. 
-LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-
-#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
-MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
+LIBS     += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 


-C++FLAGS += -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
+EXEC = osgbillboard

-include $(OSGHOME)/Make/makerules
-
-test :
-	osgbillboard Images/tree0.rgba Images/reflect.rgb
+include $(TOPDIR)/Make/makerules 
--- a/src/Demos/osgcluster/Makefile
+++ b/src/Demos/osgcluster/Makefile
@@ -1,27 +1,13 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-        broadcaster.cpp\
+CXXFILES =\
+	broadcaster.cpp\
+	osgcluster.cpp\
 	receiver.cpp\
-	osgcluster.cpp

-C++FLAGS += -g 
+LIBS     += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(SOCKET_LIBS) $(OTHER_LIBS) 

-TARGET = $(OSGHOME)/bin/osgcluster
+EXEC = osgcluster

-TARGET_BIN_FILES = osgcluster
-
-#note, use this library list when using the Performer osgPlugin.
-#LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL  -lm -lXmu  -lX11 -lXi
-
-#note, standard library list. 
-LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-
-C++FLAGS += -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
-
-test :
-	@echo no current test for osgconv:
+include $(TOPDIR)/Make/makerules 
--- a/src/Demos/osgconv/Makefile
+++ b/src/Demos/osgconv/Makefile
@@ -1,28 +1,12 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
+	OrientationConverter.cpp\
 	osgconv.cpp\
-	OrientationConverter.cpp

+LIBS     += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 

-TARGET = $(OSGHOME)/bin/osgconv
+EXEC = osgconv

-TARGET_BIN_FILES = osgconv
-
-#note, use this library list when using the Performer osgPlugin.
-#LIBS = ${PFLIBS} -losgDB -losg -lGLU -lGL  -lm -lXmu  -lX11 -lXi
-
-#note, standard library list. 
-LIBS = -losgUtil -losgDB -losg $(GL_LIBS) $(X_LIBS)
-
-#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
-MACOSXLIBS = -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
-
-C++FLAGS += -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
-
-test :
-	@echo no current test for osgconv:
+include $(TOPDIR)/Make/makerules 
--- a/src/Demos/osgcopy/Makefile
+++ b/src/Demos/osgcopy/Makefile
@@ -1,24 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-	osgcopy.cpp
+CXXFILES =\
+	osgcopy.cpp\

-TARGET = $(OSGHOME)/bin/osgcopy
+LIBS     += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 

-TARGET_BIN_FILES = osgcopy
+EXEC = osgcopy

-#note, standard library list. 
-LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-
-#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
-MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
-
-
-C++FLAGS += -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
-
-test :
-	@echo no current test for osgconv:
+include $(TOPDIR)/Make/makerules 
--- a/src/Demos/osgcube/Makefile
+++ b/src/Demos/osgcube/Makefile
@@ -1,22 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-	osgcube.cpp
+CXXFILES =\
+	osgcube.cpp\

-TARGET = $(OSGHOME)/bin/osgcube
+LIBS     += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 

-TARGET_BIN_FILES = osgcube
+EXEC = osgcube

-LIBS = -losgGLUT -losgDB -losgUtil -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-
-#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
-MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
-
-C++FLAGS += -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
-
-test :
-	osgcube
+include $(TOPDIR)/Make/makerules 
--- a/src/Demos/osgimpostor/Makefile
+++ b/src/Demos/osgimpostor/Makefile
@@ -1,26 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-	osgimpostor.cpp
+CXXFILES =\
+	osgimpostor.cpp\

-TARGET = $(OSGHOME)/bin/osgimpostor
+LIBS     += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 

-TARGET_BIN_FILES = osgimpostor
+EXEC = osgimpostor

-#note, use this library list when using the Performer osgPlugin.
-#LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL  -lm -lXmu  -lX11 -lXi
-
-#note, standard library list. 
-LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-
-#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
-MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
-
-C++FLAGS += -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
-
-test :
-	osgimpostor Town.osg
+include $(TOPDIR)/Make/makerules 
--- a/src/Demos/osgreflect/Makefile
+++ b/src/Demos/osgreflect/Makefile
@@ -1,27 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-	osgreflect.cpp \
+CXXFILES =\
+	osgreflect.cpp\

-TARGET = $(OSGHOME)/bin/osgreflect
+LIBS     += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 

-TARGET_BIN_FILES = osgreflect
+EXEC = osgreflect

-#note, use this library list when using the Performer osgPlugin.
-#LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL  -lm -lXmu  -lX11 -lXi
-
-#note, standard library list. 
-LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-
-#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
-MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
-
-
-C++FLAGS += -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
-
-test :
-	osgreflect cow.osg
+include $(TOPDIR)/Make/makerules 
--- a/src/Demos/osgscribe/Makefile
+++ b/src/Demos/osgscribe/Makefile
@@ -1,24 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-	osgscribe.cpp
+CXXFILES =\
+	osgscribe.cpp\

-TARGET = $(OSGHOME)/bin/osgscribe
+LIBS     += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 

-TARGET_BIN_FILES = osgscribe
+EXEC = osgscribe

-#note, standard library list. 
-LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-
-#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
-MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
-
-
-C++FLAGS += -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
-
-test :
-	osgscribe cow.osg
+include $(TOPDIR)/Make/makerules 
--- a/src/Demos/osgstereoimage/Makefile
+++ b/src/Demos/osgstereoimage/Makefile
@@ -1,27 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-	osgstereoimage.cpp
+CXXFILES =\
+	osgstereoimage.cpp\

-TARGET = $(OSGHOME)/bin/osgstereoimage
+LIBS     += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 

-TARGET_BIN_FILES = osgstereoimage
+EXEC = osgstereoimage

-#note, use this library list when using the Performer osgPlugin.
-#LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL  -lm -lXmu  -lX11 -lXi
-
-#note, standard library list. 
-LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-
-#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
-MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
-
-
-C++FLAGS += -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
-
-test :
-	osgstereoimage Images/dog_left_eye.jpg Images/dog_right_eye.jpg
+include $(TOPDIR)/Make/makerules 
--- a/src/Demos/osgtext/Makefile
+++ b/src/Demos/osgtext/Makefile
@@ -1,25 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-	main.cpp
+CXXFILES =\
+	main.cpp\

-TARGET = $(OSGHOME)/bin/osgtext
+LIBS     += $(OSG_LIBS) $(FREETYPE_LIB) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)  

-TARGET_BIN_FILES = osgtext
+EXEC = osgtext

-#note, use this library list when using the Performer osgPlugin.
-#LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL  -lm -lXmu  -lX11 -lXi
-
-#note, standard library list. 
-LIBS = -losgGLUT -losgText -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-MACOSXLIBS = -losgGLUT -losgText -losgUtil -losgDB -losg -lfreetype -ldl -lobjc -lstdc++
-
-C++FLAGS += -I$(OSGHOME)/include -I. 
-LDFLAGS += -L$(OSGHOME)/lib -L/usr/freeware/lib32
-
-
-include $(OSGHOME)/Make/makerules
-
-test :
-	osgtext 
+include $(TOPDIR)/Make/makerules 
--- a/src/Demos/osgtexture/Makefile
+++ b/src/Demos/osgtexture/Makefile
@@ -1,27 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-	osgtexture.cpp
+CXXFILES =\
+	osgtexture.cpp\

-TARGET = $(OSGHOME)/bin/osgtexture
+LIBS     += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 

-TARGET_BIN_FILES = osgtexture
+EXEC = osgtexture

-#note, use this library list when using the Performer osgPlugin.
-#LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL  -lm -lXmu  -lX11 -lXi
-
-#note, standard library list. 
-LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-
-#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
-MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
-
-
-C++FLAGS += -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
-
-test :
-	osgtexture Images/lz.rgb Images/reflect.rgb
+include $(TOPDIR)/Make/makerules 
--- a/src/Demos/osgviews/Makefile
+++ b/src/Demos/osgviews/Makefile
@@ -1,27 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-	osgviews.cpp
+CXXFILES =\
+	osgviews.cpp\

-TARGET = $(OSGHOME)/bin/osgviews
+LIBS     += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 

-TARGET_BIN_FILES = osgviews
-
-#note, use this library list when using the Performer osgPlugin.
-#LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL  -lm -lXmu  -lX11 -lXi
-
-#note, standard library list. 
-LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-
-#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
-MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
-
-C++FLAGS += -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
-
-test :
-	osgviews glider.osg
+EXEC = osgviews

+include $(TOPDIR)/Make/makerules 
--- a/src/Demos/sgv/Makefile
+++ b/src/Demos/sgv/Makefile
@@ -1,28 +1,12 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-	sgv.cpp
+CXXFILES =\
+	sgv.cpp\

-TARGET = $(OSGHOME)/bin/sgv
+LIBS     += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 

-TARGET_BIN_FILES = sgv
+EXEC = sgv

-#note, standard library list. 
-LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-
-#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
-MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
-
-
-C++FLAGS += -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-
-include $(OSGHOME)/Make/makerules
-
-test :
-	sgv cow.osg
-	sgv -stereo cessna.osg
-	sgv Town.osg
+include $(TOPDIR)/Make/makerules 

--- a/src/Makefile
+++ b/src/Makefile
@@ -1,48 +1,13 @@
-#!gmake
-SHELL=/bin/sh
+TOPDIR = ..
+include $(TOPDIR)/Make/makedefs

-DIRS = osg osgDB osgUtil osgGLUT
+DIRS = \
+	osg\
+	osgUtil\
+	osgDB\
+	osgGLUT\
+	osgPlugins\
+	osgText\
+	Demos

-# comment out if you don't have the freetype and GLU1.3 library installed.
-DIRS += osgText
-
-DIRS += Demos
-DIRS += osgPlugins
-
-all :
-	for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done
-
-clean :
-	for f in $(DIRS) ; do cd $$f; $(MAKE) clean; cd ..;  done
-
-clobber : 
-	for f in $(DIRS) ; do cd $$f; $(MAKE) clobber; cd ..;  done
-
-depend : 
-	for f in $(DIRS) ; do cd $$f; $(MAKE) depend; cd ..;  done
-
-docs : 
-	(cd osg; $(MAKE) docs;) 
-	(cd osgUtil; $(MAKE) docs; )
-	(cd osgDB; $(MAKE) docs; )
-	(cd osgGLUT; $(MAKE) docs; )
-	(cd osgText; $(MAKE) docs; )
-
-to_unix : 
-	for f in $(DIRS) ; do cd $$f; to_unix Makefile Makefile; cd ..;  done
-	for f in $(DIRS) ; do cd $$f; $(MAKE) to_unix; cd ..;  done
-
-beautify : 
-	for f in $(DIRS) ; do cd $$f; $(MAKE) beautify; cd ..;  done
-
-install :
-	for f in $(DIRS)  ; do cd $$f; $(MAKE) install; cd ..;  done
-
-instlinks :
-	for f in $(DIRS)  ; do cd $$f; $(MAKE) instlinks; cd ..;  done
-
-instclean :
-	for f in $(DIRS)  ; do cd $$f; $(MAKE) instclean; cd ..;  done
-
-test :
-	(cd Demos; make test; )
+include $(TOPDIR)/Make/makedirrules
--- a/src/osg/Makefile
+++ b/src/osg/Makefile
@@ -1,7 +1,7 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
 	AlphaFunc.cpp\
 	AnimationPath.cpp\
 	Billboard.cpp\
@@ -36,7 +36,6 @@ C++FILES = \
 	LineWidth.cpp\
 	LOD.cpp\
 	Material.cpp\
-	MemoryManager.cpp\
 	Matrix.cpp\
 	Node.cpp\
 	NodeCallback.cpp\
@@ -47,7 +46,6 @@ C++FILES = \
 	PolygonMode.cpp\
 	PolygonOffset.cpp\
 	PositionAttitudeTransform.cpp\
-	Projection.cpp\
 	Quat.cpp\
 	ShadeModel.cpp\
 	State.cpp\
@@ -58,106 +56,17 @@ C++FILES = \
 	TexGen.cpp\
 	TexMat.cpp\
 	Texture.cpp\
-	TextureCubeMap.cpp\
 	Timer.cpp\
 	Transform.cpp\
 	Transparency.cpp\
 	Version.cpp\
 	Viewport.cpp\
-        
-
-TARGET_BASENAME = osg
-
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
-
-TARGET_INCLUDE_FILES = \
-	osg/Notify\
-	osg/AlphaFunc\
-	osg/AnimationPath\
-	osg/Billboard\
-	osg/BoundingBox\
-	osg/BoundingSphere\
-	osg/BoundsChecking\
-	osg/Camera\
-	osg/ClipPlane\
-	osg/ClippingVolume\
-	osg/ColorMask\
-	osg/ColorMatrix\
-	osg/CopyOp\
-	osg/CullFace\
-	osg/Depth\
-	osg/DisplaySettings\
-	osg/Drawable\
-	osg/EarthSky\
-	osg/Export\
-	osg/Fog\
-	osg/FrameStamp\
-	osg/FrontFace\
-	osg/GL\
-	osg/GLExtensions\
-	osg/GLU\
-	osg/GeoSet\
-	osg/Geode\
-	osg/Group\
-	osg/Image\
-	osg/Impostor\
-	osg/ImpostorSprite\
-	osg/LOD\
-	osg/Light\
-	osg/LightModel\
-	osg/LightSource\
-	osg/LineSegment\
-	osg/LineStipple\
-	osg/LineWidth\
-	osg/Material\
-	osg/Math\
-	osg/Matrix\
-	osg/MemoryManager\
-	osg/Node\
-	osg/NodeCallback\
-	osg/NodeVisitor\
-	osg/Object\
-	osg/Point\
-	osg/PolygonMode\
-	osg/PolygonOffset\
-	osg/PositionAttitudeTransform\
-	osg/Plane\
-	osg/Projection\
-	osg/Quat\
-	osg/Referenced\
-	osg/ShadeModel\
-	osg/State\
-	osg/StateAttribute\
-	osg/StateSet\
-	osg/Statistics\
-	osg/Stencil\
-	osg/Switch\
-	osg/TexEnv\
-	osg/TexGen\
-	osg/TexMat\
-	osg/Texture\
-	osg/TextureCubeMap\
-	osg/Timer\
-	osg/Transform\
-	osg/Transparency\
-	osg/Types\
-	osg/Vec2\
-	osg/Vec3\
-	osg/Vec4\
-	osg/Version\
-	osg/Viewport\
-	osg/ref_ptr\


-LIBS    =  $(GL_LIBS)
-MACOSXLIBS =  -lm -ldl -lstdc++
+DEF     += -DSG_LIBRARY

-LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
-#LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).a
+LIBS    += $(GL_LIBS) $(OTHER_LIBS)

-C++FLAGS += -I $(OSGHOME)/include -DSG_LIBRARY
-
-#LDFLAGS += -Wl,--out-implib,./../lib/lib$(TARGET_BASENAME).a
-
-include $(OSGHOME)/Make/makerules
+LIB     = libosg.$(SO_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgDB/Makefile
+++ b/src/osgDB/Makefile
@@ -1,7 +1,7 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
 	DynamicLibrary.cpp\
 	FileNameUtils.cpp\
 	FileUtils.cpp\
@@ -15,40 +15,11 @@ C++FILES = \
 	FieldReader.cpp\
 	FieldReaderIterator.cpp\
 	DotOsgWrapper.cpp\
-        
-
-TARGET_BASENAME = osgDB
-
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
-
-TARGET_INCLUDE_FILES = \
-	osgDB/Registry\
-	osgDB/DynamicLibrary\
-	osgDB/Export\
-	osgDB/FileNameUtils\
-	osgDB/FileUtils\
-	osgDB/ReaderWriter\
-	osgDB/ReadFile\
-	osgDB/Version\
-	osgDB/WriteFile\
-	osgDB/Input\
-	osgDB/Output\
-	osgDB/Field\
-	osgDB/FieldReader\
-	osgDB/FieldReaderIterator\
-	osgDB/DotOsgWrapper\


-#LIBS    = -L$(OSGHOME)/lib -losg -lGLU -lGL -lm -ldl
-LIBS    = -L$(OSGHOME)/lib -losg $(GL_LIBS) $(DYNAMICLIBRARYLIB)
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -ldl -lm -lstdc++ $(DYNAMICLIBRARYLIB)
+LIBS += -losg $(OTHER_LIBS) $(DYNAMICLIBRARYLIB) 
+DEF  += -DOSGDB_LIBRARY

-LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
-#LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).a
-
-C++FLAGS += -I $(OSGHOME)/include -DOSGDB_LIBRARY
-
-#LDFLAGS += -Wl,--out-implib,./../lib/lib$(TARGET_BASENAME).a
-
-include $(OSGHOME)/Make/makerules
+LIB = libosgDB.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgGLUT/Makefile
+++ b/src/osgGLUT/Makefile
@@ -1,33 +1,14 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
 	GLUTEventAdapter.cpp\
        Version.cpp\
        Window.cpp\
        Viewer.cpp\

-TARGET_BASENAME = osgGLUT
-
-
-LIBS    = -L$(OSGHOME)/lib -losgDB -losgUtil -losg $(GLUTLIB) $(GL_LIBS)
-MACOSXLIBS = -L../../lib -losgDB -losgUtil -losg -ldl -lm -lstdc++
-
-
-LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
-#LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).a
-
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
-TARGET_INCLUDE_FILES = \
-	osgGLUT/Export\
-	osgGLUT/GLUTEventAdapter\
-	osgGLUT/Version\
-	osgGLUT/Window\
-	osgGLUT/Viewer\
-	osgGLUT/glut\
-	
-
-C++FLAGS += -I $(OSGHOME)/include -DOSGGLUT_LIBRARY
-
-include $(OSGHOME)/Make/makerules
+LIBS += $(GLUT_LIB) -losgUtil -losgDB -losg $(OTHER_LIBS)
+DEF  += -DOSGGLUT_LIBRARY
+LIB = libosgGLUT.$(SO_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/Makefile
+++ b/src/osgPlugins/Makefile
@@ -1,7 +1,10 @@
-#!gmake
-SHELL=/bin/sh
+TOPDIR = ../..
+include $(TOPDIR)/Make/makedefs

-DIRS = osg rgb lib3ds flt obj lwo txp dw bmp pic tga osgtgz tgz zip  
+DIRS = osg rgb lib3ds flt obj lwo dw bmp pic tga osgtgz tgz zip  
+
+# The following are giving me problems on SUN
+#DIRS += txp

 # comment in if you have Performer installed.
 # DIRS += pfb
@@ -27,30 +30,6 @@ DIRS += gif
 # comment in if you have libtiff installed.
 DIRS += tiff

-all :
-	for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done

-clean :
-	for f in $(DIRS) ; do cd $$f; $(MAKE) clean; cd ..;  done

-clobber : 
-	for f in $(DIRS) ; do cd $$f; $(MAKE) clobber; cd ..;  done
-
-depend : 
-	for f in $(DIRS) ; do cd $$f; $(MAKE) depend; cd ..;  done
-
-to_unix : 
-	for f in $(DIRS) ; do cd $$f; to_unix Makefile Makefile; cd ..;  done
-	for f in $(DIRS) ; do cd $$f; $(MAKE) to_unix; cd ..;  done
-
-beautify : 
-	for f in $(DIRS) ; do cd $$f; $(MAKE) beautify; cd ..;  done
-
-install :
-	for f in $(DIRS)  ; do cd $$f; $(MAKE) install; cd ..;  done
-
-instlinks :
-	for f in $(DIRS)  ; do cd $$f; $(MAKE) instlinks; cd ..;  done
-
-instclean :
-	for f in $(DIRS)  ; do cd $$f; $(MAKE) instclean; cd ..;  done
+include $(TOPDIR)/Make/makedirrules
--- a/src/osgPlugins/bmp/Makefile
+++ b/src/osgPlugins/bmp/Makefile
@@ -1,23 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
        ReaderWriterBMP.cpp\

-TARGET_BASENAME = osgdb_bmp
-
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-LIB=
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgUtil -losgDB -ldl -lstdc++
-
-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
-
+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

+PLUGIN = osgdb_bmp.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/dw/Makefile
+++ b/src/osgPlugins/dw/Makefile
@@ -1,20 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = ReaderWriterDW.cpp
+CXXFILES =\
+        ReaderWriterDW.cpp\

-TARGET_BASENAME = osgdb_dw
+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-LIB=
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++
-
-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+PLUGIN = osgdb_dw.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/dx/Makefile
+++ b/src/osgPlugins/dx/Makefile
@@ -1,23 +1,14 @@
-#!smake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = ReaderWriterDX.cpp \
-           DXWriter.cpp \
-           AreaGeoSetTriangulator.cpp \
-           StateSetStr.cpp
+CXXFILES =\
+	ReaderWriterDX.cpp \
+        DXWriter.cpp \
+        AreaGeoSetTriangulator.cpp \
+        StateSetStr.cpp

-TARGET_BASENAME = osgdb_dx
+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-LIB=
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++
-
-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+PLUGIN = osgdb_dx.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/flt/Makefile
+++ b/src/osgPlugins/flt/Makefile
@@ -1,7 +1,7 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
 	BoundingVolumeRecords.cpp\
 	LongIDRecord.cpp\
 	ColorPaletteRecord.cpp\
@@ -40,21 +40,13 @@ C++FILES = \
 	ReaderWriterFLT.cpp\
 	ReaderWriterATTR.cpp\
 #	PointLight.cpp\
-	


-TARGET_BASENAME = osgdb_flt

-LIB = 
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
+INC += -I$(THISDIR)

-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++
-
-C++FLAGS += -I. -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+PLUGIN = osgdb_flt.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/gif/Makefile
+++ b/src/osgPlugins/gif/Makefile
@@ -1,23 +1,17 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-        ReaderWriterGIF.cpp\
-
-TARGET_BASENAME = osgdb_gif
-
-LIB=
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-LIBS = $(GL_LIBS) -losg -losgDB -lungif 
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lungif -lstdc++
-
-C++FLAGS += -I. -I$(OSGHOME)/include  -I/usr/freeware/include
-LDFLAGS += -L$(OSGHOME)/lib $(FREEBSD_LOCALLIBS) -L/usr/freeware/lib32
-
-include $(OSGHOME)/Make/makerules
+CXXFILES =\
+	ReaderWriterGIF.cpp\


+INC   += -I/usr/local/include\
+	 -I/usr/freeware/include\

+LINKARGS += -L/usr/freeware/lib$(ARCH)
+
+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)
+
+PLUGIN = osgdb_gif.$(PLUGIN_EXT)
+
+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/jpeg/Makefile
+++ b/src/osgPlugins/jpeg/Makefile
@@ -1,19 +1,13 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
        ReaderWriterJPEG.cpp\

+INC += -I/usr/local/include/

-TARGET_BASENAME = osgdb_jpeg
+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+PLUGIN = osgdb_jpeg.$(PLUGIN_EXT)

-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
-
-LIBS    =  $(GL_LIBS) -losg -losgDB -ljpeg
-
-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/lib3ds/Makefile
+++ b/src/osgPlugins/lib3ds/Makefile
@@ -1,7 +1,7 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
        atmosphere.cpp \
        chunk.cpp \
        lib3ds_float.cpp \
@@ -23,20 +23,11 @@ C++FILES = \
        vector.cpp \
        ReaderWriter3DS.cpp\

-TARGET_BASENAME = osgdb_3ds

-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-LIB=
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgUtil -losgDB -ldl -lm -lstdc++
-
-C++FLAGS += -I. -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+INC += -I$(THISDIR)

+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

+PLUGIN = osgdb_3ds.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/lwo/Makefile
+++ b/src/osgPlugins/lwo/Makefile
@@ -1,19 +1,15 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = ReaderWriterLWO.cpp lw.cpp
+CXXFILES =\
+	lw.cpp\
+	ReaderWriterLWO.cpp\

-TARGET_BASENAME = osgdb_lwo

-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-LIB=
+INC += -I$(THISDIR)

-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-LIBS    =  $(GL_LIBS) -losg -losgDB -losgUtil
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -losgUtil -lstdc++
+PLUGIN = osgdb_lwo.$(PLUGIN_EXT)

-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/obj/Makefile
+++ b/src/osgPlugins/obj/Makefile
@@ -1,19 +1,15 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = ReaderWriterOBJ.cpp glm.cpp
+CXXFILES =\
+	glm.cpp\
+	ReaderWriterOBJ.cpp\

-TARGET_BASENAME = osgdb_obj

-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-LIB=
+INC += -I$(THISDIR)

-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++
+PLUGIN = osgdb_obj.$(PLUGIN_EXT)

-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/osg/Makefile
+++ b/src/osgPlugins/osg/Makefile
@@ -1,7 +1,7 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
        AlphaFunc.cpp\
        Billboard.cpp\
        ClipPlane.cpp\
@@ -40,25 +40,11 @@ C++FILES = \
        TexGen.cpp\
        TexMat.cpp\
        Texture.cpp\
-        TextureCubeMap.cpp\
        Transform.cpp\
        Transparency.cpp\

-TARGET_BASENAME = osgdb_osg
-
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-LIB=
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -L../../../lib -losg -losgUtil -losgDB -ldl -lm -lstdc++
-
-
-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
-
+LIBS   += $(OSG_LIBS) $(OTHER_LIBS)

+PLUGIN = osgdb_osg.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/osgtgz/Makefile
+++ b/src/osgPlugins/osgtgz/Makefile
@@ -1,22 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
 	ReaderWriterOSGTGZ.cpp\

+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-TARGET_BASENAME = osgdb_osgtgz
-
-LIB=
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++
-
-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+PLUGIN = osgdb_osgtgz.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/pfb/Makefile
+++ b/src/osgPlugins/pfb/Makefile
@@ -1,60 +1,13 @@
-#!gmake
-include ../../../Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-CFILES = \
-	stat.c\
-
-C++FILES = \
+CXXFILES =\
        ConvertFromPerformer.cpp\
        ConvertToPerformer.cpp\
        ReaderWriterPFB.cpp\

+LIBS   += $(OSG_LIBS) $(OTHER_LIBS)

-LIBS = -losg -losgDB \
-	-lpf3ds\
-	-lpfdem\
-	-lpfdted\
-	-lpfdwb\
-	-lpfdxf\
-	-lpfevt\
-	-lpfflt\
-	-lpfgds\
-	-lpfgfo\
-	-lpfim\
-	-lpflsa\
-	-lpflsb\
-	-lpfnff\
-	-lpfobj\
-	-lpfpegg\
-	-lpfpfb\
-	-lpfphd\
-	-lpfpts\
-	-lpfrot\
-	-lpfscale\
-	-lpfsgf\
-	-lpfsgo\
-	-lpfsphere\
-	-lpfsv\
-	-lpftri\
-	-lpfunc\
-	-lpfvct\
-	-lpfdu -lpfutil -lpf
-
-# comment in for PFB loader texture support on IRIX
-#   (note: you may need to build libimage.so from libimage.a)
-# LIBS += -limage
-
-TARGET_BASENAME = osgdb_pfb
-
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-LIB=
-
-TARGET_LOADER_FILES = osgPlugins/osgdb_pfb.$(SO_EXT)
-
-C++FLAGS += -g -I../../../include 
-
-LDFLAGS += -g -L../../../lib  -L$(PFLOADERPATH)  $(LINKERARGS) -rpath $(PFLOADERPATH)
-
-include ../../../Make/makerules
-
+PLUGIN = osgdb_pfb.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/pic/Makefile
+++ b/src/osgPlugins/pic/Makefile
@@ -1,22 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
        ReaderWriterPIC.cpp\

+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-TARGET_BASENAME = osgdb_pic
-
-LIB=
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
-
-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++
-
-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+PLUGIN = osgdb_pic.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/png/Makefile
+++ b/src/osgPlugins/png/Makefile
@@ -1,23 +1,15 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
        ReaderWriterPNG.cpp\

+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)
+INC  += -I/usr/local/include\
+	-I/usr/freeware/include\

+LINKARGS += -L/usr/freeware/lib$(ARCH)

-TARGET_BASENAME = osgdb_png
+PLUGIN = osgdb_png.$(PLUGIN_EXT)

-LIB=
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-LIBS = $(GL_LIBS) -losg -losgDB -lpng 
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lpng -lstdc++
-
-
-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/quicktime/Makefile
+++ b/src/osgPlugins/quicktime/Makefile
@@ -1,25 +1,13 @@
-#!gmake
-include ../../../Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-        ReaderWriterQT.cpp\
+CXXFILES =\
+	ReaderWriterQT.cpp\
+	QTtexture.cpp\

-CFILES = \
-	QTtexture.c\
+LIBS  += $(QUICKTIME) $(OSG_LIBS) $(OTHER_LIBS)

-TARGET_BASENAME = osgdb_qt
+PLUGIN = osgdb_qt.$(PLUGIN_EXT)

-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-LIB=
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -framework QuickTime -L../../../lib -losg -losgUtil -losgDB -ldl -lm -lstdc++
-
-
-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+include $(TOPDIR)/Make/makerules 

--- a/src/osgPlugins/rgb/Makefile
+++ b/src/osgPlugins/rgb/Makefile
@@ -1,23 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-        ReaderWriterRGB.cpp\
-
-TARGET_BASENAME = osgdb_rgb
-
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-LIB=
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -L../../../lib -losg -losgUtil -losgDB -ldl -lstdc++
-
-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+CXXFILES =\
+	ReaderWriterRGB.cpp\

+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

+PLUGIN = osgdb_rgb.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/tga/Makefile
+++ b/src/osgPlugins/tga/Makefile
@@ -1,22 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
        ReaderWriterTGA.cpp\

+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-TARGET_BASENAME = osgdb_tga
-
-LIB=
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++
-
-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+PLUGIN = osgdb_tga.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/tgz/Makefile
+++ b/src/osgPlugins/tgz/Makefile
@@ -1,21 +1,11 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
 	ReaderWriterTGZ.cpp\

-TARGET_BASENAME = osgdb_tgz
+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-LIB =
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++
-
-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+PLUGIN = osgdb_tgz.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/tiff/Makefile
+++ b/src/osgPlugins/tiff/Makefile
@@ -1,22 +1,14 @@
-#!gmake
-include ../../../Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
-        ReaderWriterTIFF.cpp\
+CXXFILES =\
+	ReaderWriterTIFF.cpp\

+LIBS  += $(TIFF_LIB) $(OSG_LIBS) $(OTHER_LIBS)

-TARGET_BASENAME = osgdb_tiff
+INC     += -I/usr/local/include
+LDFLAGS += -L/usr/local/lib

-LIB=
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-LIBS = $(GL_LIBS) -losg -losgDB -ltiff 
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -ltiff -lstdc++
-
-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+PLUGIN = osgdb_tiff.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/txp/Makefile
+++ b/src/osgPlugins/txp/Makefile
@@ -1,9 +1,7 @@
-#!gmake
-SHELL   = /bin/sh
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-include $(OSGHOME)/Make/makedefs
-
-C++FILES = \
+CXXFILES =\
    ReaderWriterTXP.cpp\
    TrPageArchive.cpp\
    TrPageParser.cpp\
@@ -27,26 +25,11 @@ C++FILES = \
    trpage_pparse.cpp\
    trpage_print.cpp

-TARGET_BASENAME = osgdb_txp

-LIB = 
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
+INC += -I$(THISDIR)

-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++
-
-# override the compiler optimization, since GNU C++ 2.96 has problems with
-# areas of the TXP loader code when compiling at -O2 optimization level.
-# -O works fine?! Guess this is a tempory bug, or may be something more
-# subtle in the TXP code itself, but my investigations havn't revealled
-# anything to fix, right now it looks like just a compiler bug.
-# Robert Osfield, Feb 2002.
-CFLAGS    += -O
-
-C++FLAGS += -I. -I$(OSGHOME)/include
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+PLUGIN = osgdb_txp.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/zip/Makefile
+++ b/src/osgPlugins/zip/Makefile
@@ -1,21 +1,11 @@
-#!gmake
-include ../../../Make/makedefs
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
 	ReaderWriterZIP.cpp\

-TARGET_BASENAME = osgdb_zip
+LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-LIB=
-LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
-
-LIBS    =  $(GL_LIBS) -losg -losgDB
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++
-
-C++FLAGS += -I. -I$(OSGHOME)/include 
-LDFLAGS += -L$(OSGHOME)/lib
-
-include $(OSGHOME)/Make/makerules
+PLUGIN = osgdb_zip.$(PLUGIN_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgText/Makefile
+++ b/src/osgText/Makefile
@@ -1,7 +1,7 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+CXXFILES =\
 	FTBitmapGlyph.cpp \
 	FTCharmap.cpp \
 	FTFace.cpp \
@@ -25,33 +25,19 @@ C++FILES = \
 	Text.cpp \
 	Version.cpp

+LIBS  += $(OSG_LIBS) $(FREETYPE_LIB) $(OTHER_LIBS)

-TARGET_BASENAME = osgText
+INC += -I$(OSGHOME)/include \
+	-I/usr/include/freetype2 \
+	-I/usr/local/include \
+	-I/usr/local/include/freetype2  \
+	-I/usr/freeware/include \
+	-I/usr/freeware/include/freetype2 \

+DEF += -DOSGTEXT_LIBRARY
+LINKARGS += -L/usr/local/lib\
+	    -L/usr/freeware/lib$(ARCH)

-LIBS    = -L$(OSGHOME)/lib -lfreetype -losgDB -losg $(GL_LIBS)
-MACOSXLIBS    = -L$(OSGHOME)/lib -lfreetype -losgDB -losg -lstdc++
-
-LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
-#LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).a
-
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
-TARGET_INCLUDE_FILES = \
-	osgText/Export\
-	osgText/Font\
-	osgText/Paragraph\
-	osgText/Text\
-	osgText/Version
-
-C++FLAGS += -I$(OSGHOME)/include \
-		-I/usr/include/freetype2 \
-		-I/usr/local/include \
-		-I/usr/local/include/freetype2  \
-		-I/usr/freeware/include \
-		-I/usr/freeware/include/freetype2 \
-		-DOSGTEXT_LIBRARY
-
-LDFLAGS += -L/usr/local/lib -L/usr/freeware/lib32
-
-include $(OSGHOME)/Make/makerules
+LIB = libosgText.$(SO_EXT)

+include $(TOPDIR)/Make/makerules 
--- a/src/osgUtil/Makefile
+++ b/src/osgUtil/Makefile
@@ -1,7 +1,8 @@
-#!gmake
-include $(OSGHOME)/Make/makedefs
+TOPDIR = ../..
+include $(TOPDIR)/Make/makedefs 

-C++FILES = \
+
+CXXFILES = \
 	AppVisitor.cpp\
 	CameraManipulator.cpp\
 	CullVisitor.cpp\
@@ -32,55 +33,10 @@ C++FILES = \
 	TriStripVisitor.cpp\
 	Version.cpp\

+DEF     += -DOSGUTIL_LIBRARY

-TARGET_BASENAME = osgUtil
+LIBS  += -losg $(GL_LIBS) $(OTHER_LIBS)

+LIB = libosgUtil.$(SO_EXT)

-LIBS    = -L$(OSGHOME)/lib -losg $(GL_LIBS)
-MACOSXLIBS = -L$(OSGHOME)/lib -losg -ldl -lm -lstdc++
-
-LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
-#LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).a
-
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
-TARGET_INCLUDE_FILES = \
-	osgUtil/AppVisitor\
-	osgUtil/CameraManipulator\
-	osgUtil/CullVisitor\
-	osgUtil/NewCullVisitor\
-	osgUtil/CullViewState\
-	osgUtil/DepthSortedBin\
-	osgUtil/DisplayListVisitor\
-	osgUtil/DisplayRequirementsVisitor\
-	osgUtil/DriveManipulator\
-	osgUtil/Export\
-	osgUtil/FlightManipulator\
-	osgUtil/GUIActionAdapter\
-	osgUtil/GUIEventAdapter\
-	osgUtil/GUIEventHandler\
-	osgUtil/IntersectVisitor\
-	osgUtil/InsertImpostorsVisitor\
-	osgUtil/Optimizer\
-	osgUtil/RenderBin\
-	osgUtil/RenderGraph\
-	osgUtil/RenderLeaf\
-	osgUtil/RenderStage\
-	osgUtil/RenderStageLighting\
-	osgUtil/RenderToTextureStage\
-	osgUtil/SceneView\
-	osgUtil/SceneViewManipulator\
-	osgUtil/SmoothingVisitor\
-	osgUtil/StateSetManipulator\
-	osgUtil/Tesselator\
-	osgUtil/TrackballManipulator\
-	osgUtil/TransformCallback\
-	osgUtil/TriStripVisitor\
-	osgUtil/Version\
-
-
-C++FLAGS += -I $(OSGHOME)/include -DOSGUTIL_LIBRARY
-
-#LDFLAGS += --out-implib $(OSGHOME)/lib/lib$(TARGET_BASENAME).a
-
-include $(OSGHOME)/Make/makerules
-
+include $(TOPDIR)/Make/makerules