diff --git a/AUTHORS b/AUTHORS
index c462fa4d1..82d2cf445 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,7 +12,7 @@ Robert Osfield <robertosfield@yahoo.co.uk>
         - visual studio workspace files/unix makefiles.
         - project adim & lead.
 
-Don Burns <don@keyholecorp.com>
+Don Burns <don@openscenegraph.org>
         - osg (particularily OpenGL)
         - first version of sgv.
         - fly database & osgtgz plugins.
diff --git a/Make/instrules b/Make/instrules
index dfc8945a4..d8580aa68 100644
--- a/Make/instrules
+++ b/Make/instrules
@@ -1,205 +1,126 @@
+install  : instbin instdev
+
+instbin :
+	@$(MAKE) INSTSRC=$(TOPDIR)/bin INSTDEST=$(INST_DEMOS) \
+		INSTALL?="$(INSTBIN)" __install
+	@$(MAKE) INSTSRC=$(TOPDIR)/lib INSTDEST=$(INST_LIBS) \
+		INSTALL?="$(INSTBIN)" __install
+	@$(MAKE) INSTSRC=$(TOPDIR)/lib/osgPlugins INSTDEST=$(INST_PLUGINS)\
+		INSTALL?="$(INSTBIN)" __install
 
 
-__install : $(TARGET) $(LIB)
-	@ [ -n "$(OSGHOME)" ] || echo Please define OSGHOME
-	@ [ -n "$(OSGHOME)" ] && echo > /dev/null;
-	@ [ `whoami` = "root" ] || echo YOU MUST BE ROOT to do this.
-	@ echo "`whoami`" | grep -q root 
-	@ for dir in $(TARGET_DIRS);\
+instdev :
+	@for d in `ls -1  $(TOPDIR)/include/ | grep -v CVS`; \
+	do\
+	  if [ -d $(TOPDIR)/include/$$d ]; \
+	  then \
+	    $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d\
+		   INSTALL?="$(INSTDEV)" __install;\
+	  fi\
+	done
+	@for d in `ls -1  $(TOPDIR)/src/Demos | grep -v CVS`; \
+	do\
+	  if [ -d $(TOPDIR)/src/Demos/$$d ]; \
+	  then \
+	    $(MAKE) INSTSRC=$(TOPDIR)/src/Demos/$$d INSTDEST=$(INST_DEMO_SRC)/$$d\
+		   INSTALL?="$(INSTDEV)" __install;\
+	  fi\
+	done
+
+instlinks : instlinksbin instlinksdev
+
+instlinksbin :
+	$(MAKE) INSTALL="$(INSTLINKBIN)" instbin
+
+instlinksdev :
+	$(MAKE) INSTALL="$(INSTLINKDEV)" instdev
+
+instclean : instcleanbin instcleandev
+
+instcleanbin :
+	@$(MAKE) INSTSRC=$(TOPDIR)/bin INSTDEST=$(INST_DEMOS) \
+		INSTALL?="$(INSTBIN)" __instclean
+	@$(MAKE) INSTSRC=$(TOPDIR)/lib INSTDEST=$(INST_LIBS) \
+		INSTALL?="$(INSTBIN)" __instclean
+	@$(MAKE) INSTSRC=$(TOPDIR)/lib/osgPlugins INSTDEST=$(INST_PLUGINS)\
+		INSTALL?="$(INSTBIN)" __instclean
+
+instcleandev :
+	@for d in `ls -1  $(TOPDIR)/include/ | grep -v CVS`; \
+	do\
+	  if [ -d $(TOPDIR)/include/$$d ]; \
+	  then \
+	    $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d\
+		   INSTALL?="$(INSTDEV)" __instclean;\
+	  fi\
+	done
+	@for d in `ls -1  $(TOPDIR)/src/Demos | grep -v CVS`; \
+	do\
+	  if [ -d $(TOPDIR)/src/Demos/$$d ]; \
+	  then \
+	    $(MAKE) INSTSRC=$(TOPDIR)/src/Demos/$$d INSTDEST=$(INST_DEMO_SRC)/$$d\
+		   INSTALL?="$(INSTDEV)" __instclean;\
+	  fi\
+	done
+
+
+__install :
+	@[ -n "$(INSTSRC)" ] || echo "Internal error (INSTSRC definition)"
+	@[ -n "$(INSTSRC)" ] && echo > /dev/null
+	@[ -n "$(INSTDEST)" ] || echo "Internal error (INSTDEST definition)"
+	@[ -n "$(INSTDEST)" ] && echo > /dev/null
+	@[ -d $(INSTDEST) ] || mkdir -p $(INSTDEST)
+	@echo INSTSRC is $(INSTSRC)
+	@cd $(INSTSRC);\
+	THISDIR=`pwd`;\
+	if [ -n "`ls -1 | grep -v CVS`" ]; then\
+	  for f in `ls -1 | grep -v CVS`; \
 	  do\
-	      [ -d $$dir ] || (echo Creating directory $$dir ... ;  mkdir -m 755 $$dir)\
-	  done
-	@ if [ -n "$(TARGET_LIB_FILES)" ] ;\
-	  then\
-	      for f in $(TARGET_LIB_FILES);\
-	      do\
-	          (echo copying $(OSGHOME)/lib/$$f to  $(TARGET_LIB)/$$f; \
-	          cp -f $(OSGHOME)/lib/$$f $(TARGET_LIB)/$$f;)\
-	      done\
-	  else\
-	      echo No libraries installed...;\
-	  fi
-	@ if [ -n "$(TARGET_BIN_FILES)" ] ;\
-	  then\
-	      for f in $(TARGET_BIN_FILES);\
-	      do\
-	          (echo copying $(OSGHOME)/bin/$$f to  $(TARGET_BIN)/$$f; \
-	          cp -f $(OSGHOME)/bin/$$f $(TARGET_BIN)/$$f) ;\
-	      done \
-	  else\
-	      echo No executable binaries installed...;\
-	  fi
-	@ if [ -n "$(TARGET_INCLUDE_FILES)" ] ;\
-	  then\
-	      for f in $(TARGET_INCLUDE_FILES);\
-	      do\
-	          if [ "`dirname $(TARGET_INCLUDE)/$$f`" != "$(TARGET_INCLUDE)" ];\
-		  then\
-	              (echo copying $(OSGHOME)/include/$$f to  $(TARGET_INCLUDE)/$$f; \
-	              cp -f $(OSGHOME)/include/$$f $(TARGET_INCLUDE)/$$f;) \
-		   else\
-		          echo %%%%%%%%%  PLEASE DO NOT PUT INCLUDE FILES DIRECTLY INTO $(TARGET_INCLUDE);\
-			  echo Did not copy $(OSGHOME)/include/$$f to $(TARGET_INCLUDE)/$$f;\
-		   fi\
-	      done\
-	  else\
-		echo No header files installed ...;\
+	    if [ -f $$f ] ; \
+	    then \
+	        echo $(INSTALL) $$THISDIR/$$f $(INSTDEST);\
+	        $(INSTALL) $$THISDIR/$$f $(INSTDEST);\
+	    fi\
+	  done\
 	fi
-	@ if [ -n "$(TARGET_LOADER_FILES)" ] ;\
-	  then\
-	      for f in $(TARGET_LOADER_FILES);\
-	      do\
-	          if [ "`dirname $(TARGET_LIB)/$$f`" != "$(TARGET_LIB)" ];\
-		  then\
-	              (echo copying $(OSGHOME)/lib/$$f to  $(TARGET_LIB)/$$f; \
-	              cp -f $(OSGHOME)/lib/$$f $(TARGET_LIB)/$$f;) \
-		   else\
-		          echo %%%%%%%%%  PLEASE DO NOT PUT LOADER FILES DIRECTLY INTO $(TARGET_LIB);\
-			  echo Did not copy $(OSGHOME)/include/$$f to $(TARGET_INCLUDE)/$$f;\
-		   fi\
-	      done\
-	  else\
-		echo No loaders installed ...;\
-	fi
-# deprecate OSGDATA
-#	@if [ -n "$(TARGET_DATA_FILES)" ] ;\
-#	  then\
-#	      if [ -n "$(OSGDATA)" ] ;\
-#	      then\
-#	          for f in $(TARGET_DATA_FILES);\
-#	          do\
-#	              (echo copying $(OSGDATA)/$$f to  $(TARGET_DATA)/$$f; \
-#	              cp -f $(OSGDATA)/$$f $(TARGET_DATA)/$$f; )\
-#	          done\
-#	      else\
-#		  echo;\
-#	          echo "-------------- > Please define OSGDATA";\
-#		  echo; \
-#		  [ -n "$(OSGDATA)" ] && echo > /dev/null;\
-#	      fi\
-#	  fi
-
-
-__instlinks : $(TARGET) $(LIB) 
-	@ [ -n "$(OSGHOME)" ] || echo Please define OSGHOME
-	@ [ -n "$(OSGHOME)" ] && echo > /dev/null;
-	@ [ `whoami` = "root" ] || echo YOU MUST BE ROOT to do this.
-	@ echo "`whoami`" | grep -q root 
-	@ for dir in $(TARGET_DIRS);\
-	  do\
-	      [ -d $$dir ] || (echo Creating directory $$dir ... ;  mkdir -m 755 $$dir)\
-	  done
-	@ if [ -n "$(TARGET_LIB_FILES)" ] ;\
-	  then\
-	      for f in $(TARGET_LIB_FILES);\
-	      do\
-	          (echo Linking $(OSGHOME)/lib/$$f to  $(TARGET_LIB)/$$f; \
-	          ln -sf $(OSGHOME)/lib/$$f $(TARGET_LIB)/$$f;)\
-	      done\
-	  else\
-	      echo No libraries linked...;\
-	  fi
-	@ if [ -n "$(TARGET_BIN_FILES)" ] ;\
-	  then\
-	      for f in $(TARGET_BIN_FILES);\
-	      do\
-	          (echo Linking $(OSGHOME)/bin/$$f to  $(TARGET_BIN)/$$f; \
-	          ln -sf $(OSGHOME)/bin/$$f $(TARGET_BIN)/$$f) ;\
-	      done \
-	  else\
-	      echo No executable binaries linked...;\
-	  fi
-	@ if [ -n "$(TARGET_INCLUDE_FILES)" ] ;\
-	  then\
-	      for f in $(TARGET_INCLUDE_FILES);\
-	      do\
-	          if [ "`dirname $(TARGET_INCLUDE)/$$f`" != "$(TARGET_INCLUDE)" ];\
-		  then\
-	              (echo Linking $(OSGHOME)/include/$$f to  $(TARGET_INCLUDE)/$$f; \
-	              ln -sf $(OSGHOME)/include/$$f $(TARGET_INCLUDE)/$$f;) \
-		   else\
-		          echo %%%%%%%%%  PLEASE DO NOT PUT INCLUDE FILES DIRECTLY INTO /usr/include;\
-			  echo Did not copy $(OSGHOME)/include/$$f to $(TARGET_INCLUDE)/$$f;\
-		   fi\
-	      done\
-	  else\
-		echo No header files linked ...;\
-	fi
-	@ if [ -n "$(TARGET_LOADER_FILES)" ] ;\
-	  then\
-	      for f in $(TARGET_LOADER_FILES);\
-	      do\
-	          if [ "`dirname $(TARGET_LIB)/$$f`" != "$(TARGET_LIB)" ];\
-		  then\
-	              (echo Linking $(OSGHOME)/lib/$$f to  $(TARGET_LIB)/$$f; \
-	              ln -sf $(OSGHOME)/lib/$$f $(TARGET_LIB)/$$f;) \
-		   else\
-		          echo %%%%%%%%%  PLEASE DO NOT PUT LOADER FILES DIRECTLY INTO $(TARGET_LIB);\
-			  echo Did not copy $(OSGHOME)/include/$$f to $(TARGET_INCLUDE)/$$f;\
-		   fi\
-	      done\
-	  else\
-		echo No loaders installed ...;\
-	fi
-	@if [ -n "$(TARGET_DATA_FILES)" ] ;\
-	  then\
-	      if [ -n "$(OSGDATA)" ] ;\
-	      then\
-	          for f in $(TARGET_DATA_FILES);\
-	          do\
-	              (echo Linking $(OSGDATA)/$$f to  $(TARGET_DATA)/$$f; \
-	              ln -sf $(OSGDATA)/$$f $(TARGET_DATA)/$$f; )\
-	          done\
-	      else\
-		  echo ;\
-	          echo "-------------- > Please define OSGDATA ";\
-		  echo ;\
-		  [ -n "$(OSGDATA)" ] && echo > /dev/null;\
-	      fi\
-	  fi
 
 
 __instclean :
-	@ [ `whoami` = "root" ] || echo YOU MUST BE ROOT to do this.
-	@ echo "`whoami`" | grep -q root 
-	@ for dir in $(TARGET_DIRS);\
-	  do\
-	      [ -d $$dir ] && echo Removing $$dir; \
-	      [ -d $$dir ] && rm -rf $$dir || echo > /dev/null; \
-	  done
-	@ if [ -n "$(TARGET_LIB_FILES)" ] ;\
+	@[ -n "$(INSTSRC)" ] || echo "Internal error (INSTSRC definition)"
+	@[ -n "$(INSTSRC)" ] && echo > /dev/null
+	@[ -n "$(INSTDEST)" ] || echo "Internal error (INSTDEST definition)"
+	@[ -n "$(INSTDEST)" ] && echo > /dev/null
+	@if [ -d $(INSTDEST) ] ; \
+	then\
+	  cd $(INSTSRC);\
+	  if [ -n "`ls -1 | grep -v CVS`" ]; then\
+	    for f in `ls -1 | grep -v CVS`; \
+	    do\
+	      if [ -f $$f ] ; \
+	      then \
+	          echo "rm -f $(INSTDEST)/$$f";\
+	          rm -f $(INSTDEST)/$$f;\
+	      fi\
+	    done\
+	  fi;\
+	  empty=`ls $(INSTDEST)`;\
+	  if [ -z "$$empty" ];\
 	  then\
-	      for f in $(TARGET_LIB_FILES);\
-	      do\
-	      	  ([ -L $(TARGET_LIB)/$$f ] || [ -e $(TARGET_LIB)/$$f ]) &&  \
-		  (echo removing $(TARGET_LIB)/$$f; \
-	          rm -f $(TARGET_LIB)/$$f;) || echo >/dev/null;\
-	      done\
-	  fi
-	@ if [ -n "$(TARGET_BIN_FILES)" ] ;\
-	  then\
-	      for f in $(TARGET_BIN_FILES);\
-	      do\
-	      	  ([ -L $(TARGET_BIN)/$$f ] || [ -e $(TARGET_BIN)/$$f ]) &&  \
-	          (echo removing $(TARGET_BIN)/$$f; \
-	          rm -f $(TARGET_BIN)/$$f;) || echo > /dev/null;\
-	      done\
-	  fi
-	@ if [ -n "$(TARGET_INCLUDE_FILES)" ] ;\
-	  then\
-	      for f in $(TARGET_INCLUDE_FILES);\
-	      do\
-	      	  ([ -L $(TARGET_BIN)/$$f ] || [ -e $(TARGET_BIN)/$$f ]) &&  \
-	          (echo removing $(TARGET_INCLUDE)/$$f; \
-	          rm -f $(TARGET_INCLUDE)/$$f;) || echo > /dev/null;\
-	      done\
-	  fi
-	@ if [ -n "$(TARGET_DATA_FILES)" ] ;\
-	  then\
-	      for f in $(TARGET_DATA_FILES);\
-	      do\
-	      	  ([ -L $(TARGET_DATA)/$$f ] || [ -e $(TARGET_DATA)/$$f ]) &&  \
-	          (echo removing $(TARGET_DATA)/$$f; \
-	      	  rm -f $(TARGET_DATA)/$$f;) || echo > /dev/null;\
-	      done\
-	  fi
+	    repeat=1;\
+	    while [ $$repeat = 1 ] ; \
+	    do \
+	      printf "$(INSTDEST) is empty.  Remove? (y/n) [y]: ";\
+	      read resp;\
+  	      case $$resp in  \
+	        ""|Yes|YES|yes|Y|y) rm -rf $(INSTDEST); repeat=0;; \
+	        n|N|no|NO)                              repeat=0;; \
+                *)                                      repeat=1;; \
+	      esac\
+            done\
+	  fi\
+	fi
+
+
+
+
+
diff --git a/Make/instrules.new b/Make/instrules.new
deleted file mode 100644
index d8580aa68..000000000
--- a/Make/instrules.new
+++ /dev/null
@@ -1,126 +0,0 @@
-install  : instbin instdev
-
-instbin :
-	@$(MAKE) INSTSRC=$(TOPDIR)/bin INSTDEST=$(INST_DEMOS) \
-		INSTALL?="$(INSTBIN)" __install
-	@$(MAKE) INSTSRC=$(TOPDIR)/lib INSTDEST=$(INST_LIBS) \
-		INSTALL?="$(INSTBIN)" __install
-	@$(MAKE) INSTSRC=$(TOPDIR)/lib/osgPlugins INSTDEST=$(INST_PLUGINS)\
-		INSTALL?="$(INSTBIN)" __install
-
-
-instdev :
-	@for d in `ls -1  $(TOPDIR)/include/ | grep -v CVS`; \
-	do\
-	  if [ -d $(TOPDIR)/include/$$d ]; \
-	  then \
-	    $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d\
-		   INSTALL?="$(INSTDEV)" __install;\
-	  fi\
-	done
-	@for d in `ls -1  $(TOPDIR)/src/Demos | grep -v CVS`; \
-	do\
-	  if [ -d $(TOPDIR)/src/Demos/$$d ]; \
-	  then \
-	    $(MAKE) INSTSRC=$(TOPDIR)/src/Demos/$$d INSTDEST=$(INST_DEMO_SRC)/$$d\
-		   INSTALL?="$(INSTDEV)" __install;\
-	  fi\
-	done
-
-instlinks : instlinksbin instlinksdev
-
-instlinksbin :
-	$(MAKE) INSTALL="$(INSTLINKBIN)" instbin
-
-instlinksdev :
-	$(MAKE) INSTALL="$(INSTLINKDEV)" instdev
-
-instclean : instcleanbin instcleandev
-
-instcleanbin :
-	@$(MAKE) INSTSRC=$(TOPDIR)/bin INSTDEST=$(INST_DEMOS) \
-		INSTALL?="$(INSTBIN)" __instclean
-	@$(MAKE) INSTSRC=$(TOPDIR)/lib INSTDEST=$(INST_LIBS) \
-		INSTALL?="$(INSTBIN)" __instclean
-	@$(MAKE) INSTSRC=$(TOPDIR)/lib/osgPlugins INSTDEST=$(INST_PLUGINS)\
-		INSTALL?="$(INSTBIN)" __instclean
-
-instcleandev :
-	@for d in `ls -1  $(TOPDIR)/include/ | grep -v CVS`; \
-	do\
-	  if [ -d $(TOPDIR)/include/$$d ]; \
-	  then \
-	    $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d\
-		   INSTALL?="$(INSTDEV)" __instclean;\
-	  fi\
-	done
-	@for d in `ls -1  $(TOPDIR)/src/Demos | grep -v CVS`; \
-	do\
-	  if [ -d $(TOPDIR)/src/Demos/$$d ]; \
-	  then \
-	    $(MAKE) INSTSRC=$(TOPDIR)/src/Demos/$$d INSTDEST=$(INST_DEMO_SRC)/$$d\
-		   INSTALL?="$(INSTDEV)" __instclean;\
-	  fi\
-	done
-
-
-__install :
-	@[ -n "$(INSTSRC)" ] || echo "Internal error (INSTSRC definition)"
-	@[ -n "$(INSTSRC)" ] && echo > /dev/null
-	@[ -n "$(INSTDEST)" ] || echo "Internal error (INSTDEST definition)"
-	@[ -n "$(INSTDEST)" ] && echo > /dev/null
-	@[ -d $(INSTDEST) ] || mkdir -p $(INSTDEST)
-	@echo INSTSRC is $(INSTSRC)
-	@cd $(INSTSRC);\
-	THISDIR=`pwd`;\
-	if [ -n "`ls -1 | grep -v CVS`" ]; then\
-	  for f in `ls -1 | grep -v CVS`; \
-	  do\
-	    if [ -f $$f ] ; \
-	    then \
-	        echo $(INSTALL) $$THISDIR/$$f $(INSTDEST);\
-	        $(INSTALL) $$THISDIR/$$f $(INSTDEST);\
-	    fi\
-	  done\
-	fi
-
-
-__instclean :
-	@[ -n "$(INSTSRC)" ] || echo "Internal error (INSTSRC definition)"
-	@[ -n "$(INSTSRC)" ] && echo > /dev/null
-	@[ -n "$(INSTDEST)" ] || echo "Internal error (INSTDEST definition)"
-	@[ -n "$(INSTDEST)" ] && echo > /dev/null
-	@if [ -d $(INSTDEST) ] ; \
-	then\
-	  cd $(INSTSRC);\
-	  if [ -n "`ls -1 | grep -v CVS`" ]; then\
-	    for f in `ls -1 | grep -v CVS`; \
-	    do\
-	      if [ -f $$f ] ; \
-	      then \
-	          echo "rm -f $(INSTDEST)/$$f";\
-	          rm -f $(INSTDEST)/$$f;\
-	      fi\
-	    done\
-	  fi;\
-	  empty=`ls $(INSTDEST)`;\
-	  if [ -z "$$empty" ];\
-	  then\
-	    repeat=1;\
-	    while [ $$repeat = 1 ] ; \
-	    do \
-	      printf "$(INSTDEST) is empty.  Remove? (y/n) [y]: ";\
-	      read resp;\
-  	      case $$resp in  \
-	        ""|Yes|YES|yes|Y|y) rm -rf $(INSTDEST); repeat=0;; \
-	        n|N|no|NO)                              repeat=0;; \
-                *)                                      repeat=1;; \
-	      esac\
-            done\
-	  fi\
-	fi
-
-
-
-
-
diff --git a/Make/makedefs.cyg b/Make/makedefs.cyg
deleted file mode 100755
index 6c23ef801..000000000
--- a/Make/makedefs.cyg
+++ /dev/null
@@ -1,95 +0,0 @@
-MAKEDIR    = $(OSGHOME)/Make
-INSTRULES  = $(MAKEDIR)/instrules
-MAKEDEPEND = Makedepend
-
-OBJS = $(C++FILES:.cpp=.o)  $(CFILES:.c=.o) $(YACCFILES:.y=.o) $(LEXFILES:.l=.o)
-
-DEPFILES = $(OBJS:.o=.d)
-
-C++       = c++
-YFLAGS    = -d
-
-#LCINCS   += -I/usr/X11R6/include
-#LC++INCS += ${LCINCS}
-
-CFLAGS    = -O2 -DWIN32 -W -Wall $(LCINCS)
-#CFLAGS   = -g -DWIN32 -W -Wall $(LCINCS)
-
-# need thunking when using wxWindows 
-# CFLAGS += -fvtable-thunks
-
-C++FLAGS  = ${CFLAGS}
-CPPFLAGS  = ${CFLAGS}
-
-SO_EXT = dll
-DL_EXT = dll
-
-LDFLAGS = -O2 -W -Wall
-#LDFLAGS = -g -W -Wall
-
-# need thunking when using wxWindows 
-# LDFLAGS += -fvtable-thunks
-
-LINKERARGS =
-
-DYNAMICLIBRARYLIB =
-
-PFLOADERPATH = /usr/lib/libpfdb
-
-GLUTLIB = -lglut32
-GL_LIBS = -lglu32 -lopengl32
-X_LIBS  = -lgdi32 -luser32
-OSGDB_LIBS = -losgdb_3ds -losgdb_bmp -losgdb_dw -losgdb_flt -losgdb_jpg -losgdb_lwo -losgdb_obj -losgdb_osg -losgdb_osgtgz -losgdb_pic -losgdb_png -losgdb_rgb -losgdb_tga -losgdb_tgz -losgdb_tiff -losgdb_zip
-
-#
-# TARGET_DIRS are directories that would not exist on the system except
-# for the presence of OpenSceneGraph.  'make instclean' removes these
-# directories
-#
-TARGET_DIRS    = \
-		/usr/include/osg \
-		/usr/include/osgDB \
-		/usr/include/osgGLUT \
-		/usr/include/osgUtil \
-		/usr/include/osgText \
-		/usr/share/OpenSceneGraph\
-		/usr/share/OpenSceneGraph/data\
-		/usr/share/OpenSceneGraph/data/Images\
-		/usr/share/OpenSceneGraph/data/Test\
-		/usr/lib/osgPlugins\
-
-
-TARGET_BIN     = /usr/bin
-TARGET_LIB     = /usr/lib
-TARGET_INCLUDE = /usr/include
-TARGET_DATA    = /usr/share/OpenSceneGraph/data
-
-#
-# This definitions are necessary for IRIX. The following statement
-# does not work for smake using a sh:
-#
-#    for variable in $(LIST); do ...; done
-#
-# .. if $(LIST) is a NULL variable.  So we have to define 0 length
-# strings and check for them inside the for loop
-#
-
-TARGET_LIB_FILES = ""
-TARGET_BIN_FILES = ""
-TARGET_INCLUDE_FILES = ""
-TARGET_DATA_FILES = ""
-TARGET_LOADER_FILES = ""
-
-WXDIR = /src/wxMSW
-
-WX_CFLAGS = -DWXUSINGDLL -D_X86_=1 -DWIN32 -D_WIN32 -DWINVER=0x0400 -D__WIN95__ -D__GNUWIN32__ -D__WIN32__ -I$(WXDIR)/include -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff -I$(WXDIR)/include/wx/msw/gnuwin32 -DSTRICT -D__WXMSW__ -D__WINDOWS__ -D__WXDEBUG__ -Wall -mwin32 -fno-pcc-struct-return -O2 -fno-exceptions -DWIN32_LEAN_AND_MEAN
-# -fno-rtti
-
-WX_CPPFLAGS = -DWXUSINGDLL -D_X86_=1 -DWIN32 -D_WIN32 -DWINVER=0x0400 -D__WIN95__ -D__GNUWIN32__ -D__WIN32__ -I$(WXDIR)/include -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff -I$(WXDIR)/include/wx/msw/gnuwin32 -DSTRICT -D__WXMSW__ -D__WINDOWS__ -D__WXDEBUG__ -Wall -mwin32 -fno-pcc-struct-return -O2 -fno-exceptions -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1
-# -fno-rtti
-
-WX_LDFLAGS = -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib
-
-WX_LD_LIBS = 
-
-WX_LIBS =  $(WXDIR)/lib/libwx23_1.a -lpng -ljpeg -ltiff -lz -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 -lodbc32 -lwsock32 -lopengl32 -lglu32 -lole32 -loleaut32 -luuid
diff --git a/Make/makedefs.freebsd b/Make/makedefs.freebsd
deleted file mode 100644
index 70bbdbf91..000000000
--- a/Make/makedefs.freebsd
+++ /dev/null
@@ -1,68 +0,0 @@
-MAKEDIR    = $(OSGHOME)/Make
-INSTRULES  = $(MAKEDIR)/instrules
-MAKEDEPEND = Makedepend
-OBJS = $(C++FILES:.cpp=.o) $(CFILES:.c=.o) $(YACCFILES:.y=.o) $(LEXFILES:.l=.o)
-
-DEPFILES = $(OBJS:.o=.d)
-
-
-C++ = g++
-YFLAGS = -d
-LCINCS += -I/usr/local/include -I/usr/X11R6/include
-LC++INCS += ${LCINCS}
-CFLAGS   = -O2 -W -Wall $(LCINCS)
-#CFLAGS   = -O2 -DOSG_USE_MEMORY_MANAGER -W -Wall $(LCINCS)
-C++FLAGS = ${CFLAGS}
-CPPFLAGS = ${CFLAGS}
-
-SO_EXT = so
-DL_EXT = so
-
-FREEBSD_LOCALLIBS = -L/usr/local/lib -rpath /usr/local/lib
-
-LDFLAGS = -O2 -W -Wall -pthread -L/usr/local/lib -L/usr/X11R6/lib
-
-DYNAMICLIBRARYLIB = 
-PFLIBS = 
-GLUTLIB = -lglut
-GL_LIBS = -lGLU -lGL -lm
-X_LIBS  = -lXmu  -lX11 -lXi
-
-#
-# TARGET_DIRS are directories that would not exist on the system except
-# for the presence of OpenSceneGraph.  'make instclean' removes these
-# directories
-#
-TARGET_DIRS    = \
-		/usr/include/osg \
-		/usr/include/osgDB \
-		/usr/include/osgGLUT \
-		/usr/include/osgUtil \
-		/usr/include/osgText \
-		/usr/share/OpenSceneGraph\
-		/usr/share/OpenSceneGraph/data\
-		/usr/share/OpenSceneGraph/data/Images\
-		/usr/share/OpenSceneGraph/data/Test\
-		/usr/lib/osgPlugins\
-
-
-TARGET_BIN     = /usr/bin
-TARGET_LIB     = /usr/lib
-TARGET_INCLUDE = /usr/include
-TARGET_DATA    = /usr/share/OpenSceneGraph/data
-
-#
-# This definitions are necessary for IRIX. The following statement
-# does not work for smake using a sh:
-#
-#    for variable in $(LIST); do ...; done
-#
-# .. if $(LIST) is a NULL variable.  So we have to define 0 length
-# strings and check for them inside the for loop
-#
-
-TARGET_LIB_FILES = ""
-TARGET_BIN_FILES = ""
-TARGET_INCLUDE_FILES = ""
-TARGET_DATA_FILES = ""
-TARGET_LOADER_FILES = ""
diff --git a/Make/makedefs.irix.std b/Make/makedefs.irix.std
deleted file mode 100644
index c35bcc929..000000000
--- a/Make/makedefs.irix.std
+++ /dev/null
@@ -1,70 +0,0 @@
-MAKEDIR    = $(OSGHOME)/Make
-INSTRULES  = $(MAKEDIR)/instrules
-MAKEDEPEND = Makedepend
-OBJS       = $(C++FILES:.cpp=.o) $(CFILES:.c=.o) $(YACCFILES:.y=.o) $(LEXFILES:.l=.o)
-
-DEPFILES = $(OBJS:.o=.d)
-
-
-C++ = CC
-YFLAGS   = -d
-CFLAGS   = -O2 -n32 -LANG:std -OPT:Olimit=0 -DEBUG:woff=1682 -DEBUG:woff=3303
-#CFLAGS   = -g -DOSG_USE_MEMORY_MANAGER -n32 -LANG:std -OPT:Olimit=0 -DEBUG:woff=1682 -DEBUG:woff=3303
-C++FLAGS = ${CFLAGS}
-CPPFLAGS = ${CFLAGS}
-
-SO_EXT = so
-DL_EXT = so
-
-LDFLAGS = -O2 -n32 -LANG:std -OPT:Olimit=0
-
-.SUFFIXES: .cpp .o
-.cpp.o:
-	$(C++) $(C++FLAGS) -c $<
-
-LINKERARGS = 
-DYNAMICLIBRARYLIB = 
-PFLOADERPATH = /usr/lib32/libpfdb
-GLUTLIB = -lglut
-GL_LIBS = -lGLU -lGL -lm
-X_LIBS  = -lXmu  -lX11 -lXi
-
-#
-# TARGET_DIRS are directories that would not exist on the system except
-# for the presence of OpenSceneGraph.  'make instclean' removes these
-# directories
-#
-TARGET_DIRS    = \
-		/usr/include/osg \
-		/usr/include/osgDB \
-		/usr/include/osgGLUT \
-		/usr/include/osgUtil \
-		/usr/include/osgText \
-		/usr/share/OpenSceneGraph\
-		/usr/share/OpenSceneGraph/data\
-		/usr/share/OpenSceneGraph/data/Images\
-		/usr/share/OpenSceneGraph/data/Test\
-		/usr/lib32/osgPlugins\
-
-
-TARGET_BIN     = /usr/bin
-TARGET_LIB     = /usr/lib32
-TARGET_INCLUDE = /usr/include
-TARGET_DATA    = /usr/share/OpenSceneGraph/data
-TARGET_LOADER_LIB = /usr/lib/osgPlugins
-
-#
-# This definitions are necessary for IRIX. The following statement
-# does not work for smake using a sh:
-#
-#    for variable in $(LIST); do ...; done
-#
-# .. if $(LIST) is a NULL variable.  So we have to define 0 length
-# strings and check for them inside the for loop
-#
-
-TARGET_LIB_FILES = ""
-TARGET_BIN_FILES = ""
-TARGET_INCLUDE_FILES = ""
-TARGET_DATA_FILES = ""
-TARGET_LOADER_FILES = ""
diff --git a/Make/makedefs.irix.std.64 b/Make/makedefs.irix.std.64
deleted file mode 100644
index a15d24101..000000000
--- a/Make/makedefs.irix.std.64
+++ /dev/null
@@ -1,71 +0,0 @@
-MAKEDIR    = $(OSGHOME)/Make
-INSTRULES  = $(MAKEDIR)/instrules
-MAKEDEPEND = Makedepend
-OBJS       = $(C++FILES:.cpp=.o) $(CFILES:.c=.o) $(YACCFILES:.y=.o) $(LEXFILES:.l=.o)
-
-DEPFILES = $(OBJS:.o=.d)
-
-
-C++ = CC
-YFLAGS   = -d
-CFLAGS   = -O2 -64 -LANG:std -OPT:Olimit=0 -DEBUG:woff=1682 -DEBUG:woff=3303
-#CFLAGS   = -g -DOSG_USE_MEMORY_MANAGER -64 -LANG:std -OPT:Olimit=0 -DEBUG:woff=1682 -DEBUG:woff=3303
-C++FLAGS = ${CFLAGS}
-CPPFLAGS = ${CFLAGS}
-
-SO_EXT = so
-DL_EXT = so
-
-LDFLAGS = -O2 -64 -LANG:std -OPT:Olimit=0
-#LDFLAGS = -g -64 -LANG:std -OPT:Olimit=0
-
-.SUFFIXES: .cpp .o
-.cpp.o:
-	$(C++) $(C++FLAGS) -c $<
-
-LINKERARGS = 
-DYNAMICLIBRARYLIB = 
-PFLOADERPATH = /usr/lib32/libpfdb
-GLUTLIB = -lglut
-GL_LIBS = -lGLU -lGL -lm
-X_LIBS  = -lXmu  -lX11 -lXi
-
-#
-# TARGET_DIRS are directories that would not exist on the system except
-# for the presence of OpenSceneGraph.  'make instclean' removes these
-# directories
-#
-TARGET_DIRS    = \
-		/usr/include/osg \
-		/usr/include/osgDB \
-		/usr/include/osgGLUT \
-		/usr/include/osgUtil \
-		/usr/include/osgText \
-		/usr/share/OpenSceneGraph\
-		/usr/share/OpenSceneGraph/data\
-		/usr/share/OpenSceneGraph/data/Images\
-		/usr/share/OpenSceneGraph/data/Test\
-		/usr/lib32/osgPlugins\
-
-
-TARGET_BIN     = /usr/bin
-TARGET_LIB     = /usr/lib64
-TARGET_INCLUDE = /usr/include
-TARGET_DATA    = /usr/share/OpenSceneGraph/data
-TARGET_LOADER_LIB = /usr/lib/osgPlugins
-
-#
-# This definitions are necessary for IRIX. The following statement
-# does not work for smake using a sh:
-#
-#    for variable in $(LIST); do ...; done
-#
-# .. if $(LIST) is a NULL variable.  So we have to define 0 length
-# strings and check for them inside the for loop
-#
-
-TARGET_LIB_FILES = ""
-TARGET_BIN_FILES = ""
-TARGET_INCLUDE_FILES = ""
-TARGET_DATA_FILES = ""
-TARGET_LOADER_FILES = ""
diff --git a/Make/makedefs.linux b/Make/makedefs.linux
deleted file mode 100644
index 16e28e1d9..000000000
--- a/Make/makedefs.linux
+++ /dev/null
@@ -1,69 +0,0 @@
-MAKEDIR    = $(OSGHOME)/Make
-INSTRULES  = $(MAKEDIR)/instrules
-MAKEDEPEND = Makedepend
-OBJS = $(C++FILES:.cpp=.o)  $(CFILES:.c=.o) $(YACCFILES:.y=.o) $(LEXFILES:.l=.o)
-
-DEPFILES = $(OBJS:.o=.d)
-
-
-C++       = g++
-YFLAGS    = -d
-LCINCS   += -I/usr/X11R6/include
-LC++INCS += ${LCINCS}
-CFLAGS    = -O2 -W -Wall $(LCINCS)
-#CFLAGS   = -g -DOSG_USE_MEMORY_MANAGER -W -Wall $(LCINCS)
-C++FLAGS  = ${CFLAGS}
-CPPFLAGS  = ${CFLAGS}
-
-SO_EXT = so
-DL_EXT = so
-
-LDFLAGS = -O2 -W -Wall -L/usr/X11R6/lib
-#LDFLAGS = -g -W -Wall -L/usr/X11R6/lib
-
-LINKERARGS =  -Xlinker
-DYNAMICLIBRARYLIB = -ldl
-PFLOADERPATH = /usr/lib/libpfdb
-
-GLUTLIB = -lglut
-GL_LIBS = -lGLU -lGL -lm
-X_LIBS  = -lXmu  -lX11 -lXi
-
-#
-# TARGET_DIRS are directories that would not exist on the system except
-# for the presence of OpenSceneGraph.  'make instclean' removes these
-# directories
-#
-TARGET_DIRS    = \
-		/usr/include/osg \
-		/usr/include/osgDB \
-		/usr/include/osgGLUT \
-		/usr/include/osgUtil \
-		/usr/include/osgText \
-		/usr/share/OpenSceneGraph\
-		/usr/share/OpenSceneGraph/data\
-		/usr/share/OpenSceneGraph/data/Images\
-		/usr/share/OpenSceneGraph/data/Test\
-		/usr/lib/osgPlugins\
-
-
-TARGET_BIN     = /usr/bin
-TARGET_LIB     = /usr/lib
-TARGET_INCLUDE = /usr/include
-TARGET_DATA    = /usr/share/OpenSceneGraph/data
-
-#
-# This definitions are necessary for IRIX. The following statement
-# does not work for smake using a sh:
-#
-#    for variable in $(LIST); do ...; done
-#
-# .. if $(LIST) is a NULL variable.  So we have to define 0 length
-# strings and check for them inside the for loop
-#
-
-TARGET_LIB_FILES = ""
-TARGET_BIN_FILES = ""
-TARGET_INCLUDE_FILES = ""
-TARGET_DATA_FILES = ""
-TARGET_LOADER_FILES = ""
diff --git a/Make/makedefs.macosx b/Make/makedefs.macosx
deleted file mode 100644
index 3a31fdd9e..000000000
--- a/Make/makedefs.macosx
+++ /dev/null
@@ -1,63 +0,0 @@
-MAKEDIR    = $(OSGHOME)/Make
-INSTRULES  = $(MAKEDIR)/instrules
-MAKEDEPEND = Makedepend
-OBJS = $(C++FILES:.cpp=.o) $(CFILES:.c=.o) $(YACCFILES:.y=.o) $(LEXFILES:.l=.o)
-
-DEPFILES = $(OBJS:.o=.d)
-
-C++ = cc 
-YFLAGS = -d
-LCINCS += -I/usr/local/include -I/sw/include
-LC++INCS += ${LCINCS}
-CFLAGS   = -O2 -W -Wall $(LCINCS) -D__DARWIN_OSX__
-#CFLAGS   = -g -DOSG_USE_MEMORY_MANAGER -W -Wall $(LCINCS) -D__DARWIN_OSX__
-C++FLAGS = ${CFLAGS}
-CPPFLAGS = ${CFLAGS}
-# this distinction is necessary for Darwin / OS X as shared libs and loadable (dylib) modules
-# are not the same thing
-SO_EXT = dylib
-DL_EXT = so
-
-FRAMEWORKS =  -L/sw/lib -framework GLUT -framework Carbon -framework OpenGL
-LDFLAGS =-all_load  -L/usr/local/lib -L/usr/lib  
-
-DYNAMICLIBRARYLIB = 
-PFLIBS = 
-
-#
-# TARGET_DIRS are directories that would not exist on the system except
-# for the presence of OpenSceneGraph.  'make instclean' removes these
-# directories
-#
-TARGET_DIRS    = \
-		/usr/include/osg \
-		/usr/include/osgDB \
-		/usr/include/osgGLUT \
-		/usr/include/osgUtil \
-		/usr/include/osgText \
-		/usr/share/OpenSceneGraph\
-		/usr/share/OpenSceneGraph/data\
-		/usr/share/OpenSceneGraph/data/Images\
-		/usr/share/OpenSceneGraph/data/Test\
-		/usr/lib/osgPlugins\
-
-TARGET_BIN     = /usr/bin
-TARGET_LIB     = /usr/lib
-TARGET_INCLUDE = /usr/include
-TARGET_DATA    = /usr/share/OpenSceneGraph/data
-
-#
-# This definitions are necessary for IRIX. The following statement
-# does not work for smake using a sh:
-#
-#    for variable in $(LIST); do ...; done
-#
-# .. if $(LIST) is a NULL variable.  So we have to define 0 length
-# strings and check for them inside the for loop
-#
-
-TARGET_LIB_FILES = ""
-TARGET_BIN_FILES = ""
-TARGET_INCLUDE_FILES = ""
-TARGET_DATA_FILES = ""
-TARGET_LOADER_FILES = ""
diff --git a/Make/makedefs.mingw b/Make/makedefs.mingw
deleted file mode 100644
index 7593898d2..000000000
--- a/Make/makedefs.mingw
+++ /dev/null
@@ -1,98 +0,0 @@
-MAKEDIR    = $(OSGHOME)/Make
-INSTRULES  = $(MAKEDIR)/instrules
-MAKEDEPEND = Makedepend
-
-MINGW_HOME = d:/usr/mingw
-
-OBJS = $(C++FILES:.cpp=.o)  $(CFILES:.c=.o) $(YACCFILES:.y=.o) $(LEXFILES:.l=.o)
-
-DEPFILES = $(OBJS:.o=.d)
-
-C++       = c++
-
-# need thunking when using wxWindows 
-# C++ += -fvtable-thunks
-
-YFLAGS    = -d
-
-#LCINCS   += -I/usr/X11R6/include
-#LC++INCS += ${LCINCS}
-
-OPT_FLAGS = -O
-DBG_FLAGS = -g
-WARN_FLAGS = -Wall -W
-
-LDFLAGS = $(OPT_FLAGS) $(DBG_FLAGS) $(WARN_FLAGS)
-
-CFLAGS    = -DWIN32 $(LDFLAGS) $(LCINCS)
-
-C++FLAGS  = ${CFLAGS}
-CPPFLAGS  = ${CFLAGS}
-
-SO_EXT = dll
-DL_EXT = dll
-
-LINKERARGS =
-
-DYNAMICLIBRARYLIB =
-
-PFLOADERPATH = /usr/lib/libpfdb
-
-GLUTLIB = -lglut32
-GL_LIBS = -lglu32 -lopengl32
-X_LIBS  = -lgdi32 -luser32
-OSGDB_LIBS = -losgdb_3ds -losgdb_bmp -losgdb_dw -losgdb_flt -losgdb_jpg -losgdb_lwo -losgdb_obj -losgdb_osg -losgdb_osgtgz -losgdb_pic -losgdb_png -losgdb_rgb -losgdb_tga -losgdb_tgz -losgdb_tiff -losgdb_zip
-
-#
-# TARGET_DIRS are directories that would not exist on the system except
-# for the presence of OpenSceneGraph.  'make instclean' removes these
-# directories
-#
-TARGET_DIRS    = \
-		$(MINGW_HOME)/include/osg \
-		$(MINGW_HOME)/include/osgDB \
-		$(MINGW_HOME)/include/osgGLUT \
-		$(MINGW_HOME)/include/osgUtil \
-		$(MINGW_HOME)/include/osgText \
-		$(MINGW_HOME)/share/OpenSceneGraph\
-		$(MINGW_HOME)/share/OpenSceneGraph/data\
-		$(MINGW_HOME)/share/OpenSceneGraph/data/Images\
-		$(MINGW_HOME)/share/OpenSceneGraph/data/Test\
-		$(MINGW_HOME)/lib/osgPlugins\
-
-
-TARGET_BIN     = $(MINGW_HOME)/bin
-TARGET_LIB     = $(MINGW_HOME)/lib
-TARGET_INCLUDE = $(MINGW_HOME)/include
-TARGET_DATA    = $(MINGW_HOME)/share/OpenSceneGraph/data
-
-#
-# This definitions are necessary for IRIX. The following statement
-# does not work for smake using a sh:
-#
-#    for variable in $(LIST); do ...; done
-#
-# .. if $(LIST) is a NULL variable.  So we have to define 0 length
-# strings and check for them inside the for loop
-#
-
-TARGET_LIB_FILES = ""
-TARGET_BIN_FILES = ""
-TARGET_INCLUDE_FILES = ""
-TARGET_DATA_FILES = ""
-TARGET_LOADER_FILES = ""
-
-# set to your wxWindows TOP directory
-WXDIR = d:/src/wxMSW
-
-WX_CFLAGS = -DWXUSINGDLL -D_X86_=1 -DWIN32 -D_WIN32 -DWINVER=0x0400 -D__WIN95__ -D__GNUWIN32__ -D__WIN32__ -I$(WXDIR)/include -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff -I$(WXDIR)/include/wx/msw/gnuwin32 -DSTRICT -D__WXMSW__ -D__WINDOWS__ -D__WXDEBUG__ -Wall -mwin32 -fno-pcc-struct-return -O2 -fno-exceptions -DWIN32_LEAN_AND_MEAN
-# -fno-rtti
-
-WX_CPPFLAGS = -DWXUSINGDLL -D_X86_=1 -DWIN32 -D_WIN32 -DWINVER=0x0400 -D__WIN95__ -D__GNUWIN32__ -D__WIN32__ -I$(WXDIR)/include -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff -I$(WXDIR)/include/wx/msw/gnuwin32 -DSTRICT -D__WXMSW__ -D__WINDOWS__ -D__WXDEBUG__ -Wall -mwin32 -fno-pcc-struct-return -O2 -fno-exceptions -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1
-# -fno-rtti
-
-WX_LDFLAGS = -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib
-
-WX_LD_LIBS = 
-
-WX_LIBS =  $(WXDIR)/lib/libwx23_1.a -lpng -ljpeg -ltiff -lz -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 -lodbc32 -lwsock32 -lopengl32 -lglu32 -lole32 -loleaut32 -luuid
diff --git a/Make/makedefs.new b/Make/makedefs.new
deleted file mode 100644
index ef33dd2e5..000000000
--- a/Make/makedefs.new
+++ /dev/null
@@ -1,237 +0,0 @@
-SHELL = /bin/sh
-OS := $(shell uname)
-
-# TOPDIR needs to be redefined for every Makefile
-TOPDIR     ?= ../
-THISDIR    = .
-MAKEDEPEND = ignore
-
-INC        = -I$(TOPDIR)/include
-DEF        = 
-
-CXXFLAGS   = $(ARCHARGS) $(DOF) $(DEF) $(INC)
-LDFLAGS    = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib 
-OBJS       = $(C++FILES:.cpp=.o) \
-	     $(CXXFILES:.cpp=.o) \
-	     $(CFILES:.c=.o) \
-
-DOF        = $(OPTF)
-DEBUGDIR   = $(OS)$(ARCH).Debug
-OPTDIR     = $(OS)$(ARCH).Opt
-BININST    = bin
-LIBINST    = lib
-PLUGININST = lib/osgPlugins
-
-INST_DEMOS    = /usr/share/OpenSceneGraph/bin
-INST_LIBS     = /usr/lib$(ARCH)
-INST_PLUGINS  = /usr/lib$(ARCH)/osgPlugins
-INST_INCLUDE  = /usr/include
-INST_DEMO_SRC = /usr/share/OpenSceneGraph/src/demos
-INST_DATA     = /usr/share/OpenSceneGraph/data
-
-LINK          = ln -sf
-INSTBIN       = install -m 755
-INSTDEV       = install -m 644
-INSTLINKBIN   = $(LINK)
-INSTLINKDEV   = $(LINK)
-
-
-ALL_TARGETS = \
-	  opt\
-	  debug\
-	  clean\
-	  cleandbg\
-	  cleanopt\
-	  clobber\
-	  beautify\
-	  docs\
-	  depend\
-
-#### SUN OS Specific definitions
-ifeq ($(OS),SunOS)
-
-  C++               = CC
-  DEPARG            = -xM1
-  INC               += 
-  DEF               += -features=extensions 
-  OPTF              = -xO2
-  DBGF              = -g
-  SHARED            = -G
-ifeq ($(ARCH),64)
-    ARCHARGS          = -xarch=v9
-else
-    ARCHARGS          = 
-endif
-  LINKARGS          =  
-  DYNAMICLIBRARYLIB = -ldl
-  OSG_LIBS          = -losgGLUT -losgDB -losgUtil -losg 
-  FREETYPE_LIB      = -lfreetype
-  GLUT_LIB          = -lglut
-  GL_LIBS           = -lGLU -lGL 
-  X_LIBS            = -lXext -lXmu -lXi -lX11 
-  SOCKET_LIBS       = -lsocket -lnsl
-  OTHER_LIBS        = -lCstd
-  SO_EXT            = so
-  PLUGIN_EXT        = so
-  TIFF_LIB	    = -ltiff
-
-INSTBIN       = cp
-INSTDEV       = cp
-
-endif
-
-#### IRIX Specific definitions
-ifeq ($(OS),IRIX)
-
-  C++               = CC
-  DEPFLAGS          = -M
-  INC               += 
-  DEF               += -LANG:std -OPT:Olimit=0 \
-	 	       -DEBUG:wof=1682 -DEBUG:woff=3303\
-		       -MDupdate $(MAKEDEPEND)
-  OPTF              = -O2 
-  DBGF              = -g
-  SHARED            = -shared
-  ARCH              = 32
-ifeq ($(ARCH),64)
-    ARCHARGS          = -64
-else
-    ARCHARGS          = -n32
-endif
-  LINKARGS          = -LANG:std -OPT:Olimit=0
-  DYNAMICLIBRARYLIB = -ldl
-  OSG_LIBS          = -losgGLUT -losgDB -losgUtil -losg 
-  FREETYPE_LIB      = -lfreetype
-  GLUT_LIB          = -lglut
-  GL_LIBS           = -lGLU -lGL 
-  X_LIBS            = -lXext -lXi -lXmu -lX11
-  SOCKET_LIBS       = 
-  OTHER_LIBS        = -lm
-  SO_EXT            = so
-  PLUGIN_EXT        = so
-
-#  INSTLINKBIN       = install -t -m 755
-#  INSTLINKDEV       = install -t -m 644
-
-endif
-
-#### Linux specific definitions
-ifeq ($(OS),Linux)
-  C++               = g++
-  DEPARG            = -MM
-  INC               += 
-  DEF               += -W -Wall
-  OPTF              = -O2 
-  DBGF              = -g
-  SHARED            = -shared
-  ARCHARGS          = 
-  LINKARGS          = -L/usr/X11R6/lib
-  DYNAMICLIBRARYLIB = -ldl
-  OSG_LIBS          = -losgGLUT -losgDB -losgUtil -losg 
-  FREETYPE_LIB      = -lfreetype
-  GLUT_LIB          = -lglut
-  GL_LIBS           = -lGLU -lGL 
-  X_LIBS            = -lXmu -lX11
-  SOCKET_LIBS       = 
-  OTHER_LIBS        = 
-  SO_EXT            = so
-  PLUGIN_EXT        = so
-endif
-
-#### FreeBSD specific definitions
-ifeq ($(OS),FreeBSD)
-  C++               = g++
-  DEPARG            = -MM
-  INC               +=  -I/usr/local/include -I/usr/X11R6/include
-  DEF               += -W -Wall
-  OPTF              = -O2 
-  DBGF              = -g
-  SHARED            = -shared
-  ARCHARGS          = 
-  LINKARGS          = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib
-  DYNAMICLIBRARYLIB = 
-  OSG_LIBS          = -losgGLUT -losgDB -losgUtil -losg 
-  FREETYPE_LIB      = -lfreetype
-  GLUT_LIB          = -lglut
-  GL_LIBS           = -lGLU -lGL 
-  X_LIBS            = -lXmu -lX11
-  SOCKET_LIBS       = 
-  OTHER_LIBS        = 
-  SO_EXT            = so
-  PLUGIN_EXT        = so
-endif
-
-#### Mac OSX specific definitions
-ifeq ($(OS),Darwin)
-  C++               = cc
-  INC               +=  -I/usr/include -I/sw/include
-  DEF               += -Wall -D__DARWIN_OSX__
-  OPTF              = -O2
-  DBGF              = -g
-  DEPARG            = -M $(DEF)
-  SHARED            = -shared
-  ARCHARGS          = 
-  LINKARGS          = -L/usr/lib -L/sw/lib 
-  DYNAMICLIBRARYLIB = 
-  OSG_LIBS          = -losgGLUT -losgDB -losgUtil -losg 
-  FREETYPE_LIB      = -lfreetype
-  GLUT_LIB          = -framework GLUT
-  CARBON_LIB        = -framework Carbon
-  GL_LIBS           = -framework OpenGL $(CARBON_LIB)
-  X_LIBS            = 
-  SOCKET_LIBS       = 
-  OTHER_LIBS        = -lm -ldl -lstdc++ -lobjc
-  SO_EXT            = dylib
-  PLUGIN_EXT        = so
-  QUICKTIME_LIB	    = -framework QuickTime
-  TIFF_LIB	    = -ltiff
-
-endif
-
-#### Cygwin/Mingw specific definitions
-ifeq ($(OS),CYGWIN_NT-5.0)
-  C++               = c++
-  DEPARG            = -M
-  INC               += 
-  DEF               += -DWIN32 -W -Wall
-  OPTF              = -O2 
-  DBGF              = -g
-  SHARED            = -shared\
-		      -Wl,--export-all-symbols  \
-		      -Wl,--output-def,lib$$TARGET_BASENAME.def \
-		      -Wl,--out-implib,$(TOPDIR)/lib/lib$$TARGET_BASENAME.a \
-
-  ARCHARGS          = 
-  LINKARGS          = -W -Wall
-  DYNAMICLIBRARYLIB =
-
-  OSG_LIBS          = -losgGLUT -losgDB -losgUtil -losg 
-  GL_LIBS           = -lglu32 -lopengl32
-  GLUT_LIB          = -lglut32 $(GL_LIBS)
-  X_LIBS            = -lgdi32 -luser32
-  OSGDB_LIBS        = -losgdb_3ds \
-  		      -losgdb_bmp \
-		      -losgdb_dw \
-		      -losgdb_flt \
-		      -losgdb_jpg \
-		      -losgdb_lwo \
-		      -losgdb_obj \
-		      -losgdb_osg \
-		      -losgdb_osgtgz \
-		      -losgdb_pic \
-		      -losgdb_png \
-		      -losgdb_rgb \
-		      -losgdb_tga \
-		      -losgdb_tgz \
-		      -losgdb_tiff \
-		      -losgdb_zip
-  SOCKET_LIBS       = 
-  OTHER_LIBS        = $(GL_LIBS)
-  SO_EXT            = dll
-  PLUGIN_EXT        = dll
-  LINK              = cp -f
-endif
-
-
-VPATH=..
-
diff --git a/Make/makerules.cyg b/Make/makerules.cyg
deleted file mode 100755
index e63f3712d..000000000
--- a/Make/makerules.cyg
+++ /dev/null
@@ -1,72 +0,0 @@
-
-all : $(MAKEDEPEND) $(TARGET) $(LOADABLE) $(LIB) 
-
-$(TARGET) : $(OBJS) 
-	$(C++) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
-
-$(LOADABLE) : $(OBJS)
-	$(C++) $(LDFLAGS) -shared \
-	-Wl,--export-all-symbols  \
-	-Wl,--output-def,lib$(TARGET_BASENAME).def \
-	-Wl,--out-implib,$(OSGHOME)/lib/lib$(TARGET_BASENAME).a \
-	-o $@  $(OBJS) $(LIBS)
-
-$(LIB) : $(OBJS)
-	$(C++) $(LDFLAGS) -shared \
-	-Wl,--export-all-symbols  \
-	-Wl,--output-def,lib$(TARGET_BASENAME).def \
-	-Wl,--out-implib,$(OSGHOME)/lib/lib$(TARGET_BASENAME).a \
-	-o $@ $(OBJS) $(LIBS)
-
-clean :
-	rm -f $(OBJS) core $(TARGET) $(MAKEDEPEND)
-	touch $(MAKEDEPEND)
-
-clobber : clean
-	rm -f $(TARGET) a.out $(LIB) 
-
-to_unix : 
-	for f in *.cpp ; do to_unix $$f $$f; done
-	for f in *.h ; do to_unix $$f $$f; done
-
-beautify : 
-	for f in *.cpp ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done
-	for f in *.h ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done
-
-
-# force it
-depend : 
-	$(C++) $(C++FLAGS) -M $(C++FILES) $(CFILES) > $(MAKEDEPEND)
-
-$(MAKEDEPEND) : $(C++FILES) $(CFILES) 
-	$(C++) $(C++FLAGS) -M $(C++FILES) $(CFILES) > $(MAKEDEPEND)
-
-%.o : %.cpp
-	$(C++) $(C++FLAGS) -c $*.cpp -o $*.o
-
-%.o : %.c
-	$(CC) $(C++FLAGS) -c $*.c -o $*.o
-
-docs:
-	[ "$(TARGET_BASENAME)" != "" ] && \
-	mkdir -p ../../doc/doc++/$(TARGET_BASENAME) && \
-	doc++ -d ../../doc/doc++/$(TARGET_BASENAME) -H -A ../../include/$(TARGET_BASENAME)/* && \
-	echo $(TARGET_BASENAME) HTML documentation created in ../../doc/doc++/$(TARGET_BASENAME)
-
-install : home
-	@ make __install
-
-instlinks : home
-	@ make __instlinks
-
-instclean : home
-	@ make __instclean
-
-
-home :
-	@ [ -n "$(OSGHOME)" ] || (echo ; echo "-------------> Please define OSGHOME"; echo)
-	@ [ -n "$(OSGHOME)" ] && echo > /dev/null;
-
-sinclude $(INSTRULES)
-
-include $(MAKEDEPEND)
diff --git a/Make/makerules.freebsd b/Make/makerules.freebsd
deleted file mode 100644
index b4101812d..000000000
--- a/Make/makerules.freebsd
+++ /dev/null
@@ -1,59 +0,0 @@
-
-all : $(MAKEDEPEND) $(TARGET) $(LOADABLE) $(LIB) 
-
-$(TARGET) : $(OBJS) 
-	$(C++) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
-
-$(LOADABLE) : $(OBJS)
-	$(C++) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
-
-$(LIB) : $(OBJS)
-	$(C++) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
-
-clean :
-	rm -f $(OBJS) core $(TARGET) $(MAKEDEPEND)
-	touch $(MAKEDEPEND)
-
-clobber : clean
-	rm -f $(TARGET) a.out $(LIB) 
-
-to_unix : 
-	for f in *.cpp ; do to_unix $$f $$f; done
-	for f in *.h ; do to_unix $$f $$f; done
-
-# force it
-depend : 
-	$(C++) $(C++FLAGS) -M $(C++FILES) $(CFILES) > $(MAKEDEPEND)
-
-$(MAKEDEPEND) : $(C++FILES) $(CFILES) 
-	$(C++) $(C++FLAGS) -M $(C++FILES) $(CFILES) > $(MAKEDEPEND)
-
-%.o : %.cpp
-	$(C++) $(C++FLAGS) -c $*.cpp -o $*.o
-
-%.o : %.c
-	$(C++) $(C++FLAGS) -c $*.c -o $*.o
-
-docs:
-	[ "$(TARGET_BASENAME)" != "" ] && \
-	mkdir -p ../../doc/doc++/$(TARGET_BASENAME) && \
-	doc++ -d ../../doc/doc++/$(TARGET_BASENAME) -H -A ../../include/$(TARGET_BASENAME)/* && \
-	echo $(TARGET_BASENAME) HTML documentation created in ../../doc/doc++/$(TARGET_BASENAME)
-
-install : home
-	@ $(MAKE) __install
-
-instlinks : home
-	@ $(MAKE) __instlinks
-
-instclean : home
-	@ $(MAKE) __instclean
-
-
-home :
-	@ [ -n "$(OSGHOME)" ] || (echo ; echo "-------------> Please define OSGHOME"; echo)
-	@ [ -n "$(OSGHOME)" ] && echo > /dev/null;
-
-sinclude $(INSTRULES)
-
-include $(MAKEDEPEND)
diff --git a/Make/makerules.irix b/Make/makerules.irix
deleted file mode 100644
index 2ff6af728..000000000
--- a/Make/makerules.irix
+++ /dev/null
@@ -1,65 +0,0 @@
-
-all : $(TARGET) $(LOADABLE) $(LIB) 
-
-$(TARGET) : $(OBJS) 
-	$(C++) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
-
-$(LOADABLE) : $(OBJS)
-	$(C++) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
-
-$(LIB) : $(OBJS)
-	$(C++) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
-
-clean : 
-	rm -rf $(OBJS) core so_locations ii_files $(TARGET) $(MAKEDEPEND)
-	touch $(MAKEDEPEND)
-
-
-clobber : clean
-	rm -f $(TARGET) a.out $(LIB) 
-
-to_unix : 
-	for f in *.cpp ; do to_unix $$f $$f; done
-	for f in *.h ; do to_unix $$f $$f; done
-
-beautify : 
-	for f in *.cpp ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done
-#	for f in *.h ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done
-
-
-# force it
-depend : 
-	$(C++) $(C++FLAGS) -M $(C++FILES) $(CFILES) > $(MAKEDEPEND)
-
-$(MAKEDEPEND) : $(C++FILES) $(CFILES) 
-	$(C++) $(C++FLAGS) -M $(C++FILES) $(CFILES) > $(MAKEDEPEND)
-
-%.o : %.cpp
-	$(C++) $(C++FLAGS) -c $*.cpp -o $*.o
-
-docs:
-	[ "$(TARGET_BASENAME)" != "" ] && \
-	mkdir -p ../../doc/doc++/$(TARGET_BASENAME) && \
-	doc++ -d ../../doc/doc++/$(TARGET_BASENAME) -H -A ../../include/$(TARGET_BASENAME)/* && \
-	echo $(TARGET_BASENAME) HTML documentation created in ../../doc/doc++/$(TARGET_BASENAME)
-
-install : home
-	@ make __install
-
-instlinks : home
-	@ make __instlinks
-
-instclean : home
-	@ make __instclean
-
-
-home :
-	@ [ -n "$(OSGHOME)" ] || (echo ; echo "-------------> Please define OSGHOME"; echo)
-	@ [ -n "$(OSGHOME)" ] 
-
-
-
-
-sinclude $(INSTRULES)
-
-sinclude $(MAKEDEPEND)
diff --git a/Make/makerules.linux b/Make/makerules.linux
deleted file mode 100644
index fc6dfb98f..000000000
--- a/Make/makerules.linux
+++ /dev/null
@@ -1,64 +0,0 @@
-
-all : $(MAKEDEPEND) $(TARGET) $(LOADABLE) $(LIB) 
-
-$(TARGET) : $(OBJS) 
-	$(C++) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
-
-$(LIB) : $(OBJS)
-	$(C++) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
-
-$(LOADABLE) : $(OBJS)
-	$(C++) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
-
-clean :
-	rm -f $(OBJS) core $(TARGET) $(MAKEDEPEND)
-	touch $(MAKEDEPEND)
-
-clobber : clean
-	rm -f $(TARGET) a.out $(LIB) 
-
-to_unix : 
-	for f in *.cpp ; do to_unix $$f $$f; done
-	for f in *.h ; do to_unix $$f $$f; done
-
-beautify : 
-	for f in *.cpp ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done
-	for f in *.h ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done
-
-
-# force it
-depend : 
-	$(C++) $(C++FLAGS) -M $(C++FILES) $(CFILES) > $(MAKEDEPEND)
-
-$(MAKEDEPEND) : $(C++FILES) $(CFILES) 
-	$(C++) $(C++FLAGS) -M $(C++FILES) $(CFILES) > $(MAKEDEPEND)
-
-%.o : %.cpp
-	$(C++) $(C++FLAGS) -c $*.cpp -o $*.o
-
-%.o : %.c
-	$(CC) $(C++FLAGS) -c $*.c -o $*.o
-
-docs:
-	[ "$(TARGET_BASENAME)" != "" ] && \
-	mkdir -p ../../doc/doc++/$(TARGET_BASENAME) && \
-	doc++ -d ../../doc/doc++/$(TARGET_BASENAME) -H -A ../../include/$(TARGET_BASENAME)/* && \
-	echo $(TARGET_BASENAME) HTML documentation created in ../../doc/doc++/$(TARGET_BASENAME)
-
-install : home
-	@ make __install
-
-instlinks : home
-	@ make __instlinks
-
-instclean : home
-	@ make __instclean
-
-
-home :
-	@ [ -n "$(OSGHOME)" ] || (echo ; echo "-------------> Please define OSGHOME"; echo)
-	@ [ -n "$(OSGHOME)" ] && echo > /dev/null;
-
-sinclude $(INSTRULES)
-
-include $(MAKEDEPEND)
diff --git a/Make/makerules.macosx b/Make/makerules.macosx
deleted file mode 100644
index e2ece450b..000000000
--- a/Make/makerules.macosx
+++ /dev/null
@@ -1,59 +0,0 @@
-
-all : $(MAKEDEPEND) $(TARGET) $(LOADABLE) $(LIB)
-
-$(TARGET) : $(OBJS)
-	$(CC) $(LDFLAGS) $(OBJS) $(FRAMEWORKS) $(MACOSXLIBS) -o $@
-
-$(LIB) : $(OBJS)
-	$(CC) -dynamiclib -o $@ $(OBJS) $(MACOSXLIBS) $(FRAMEWORKS)
-	
-$(LOADABLE) : $(OBJS)
-	$(CC) -bundle -o $@ $(OBJS) $(MACOSXLIBS) $(FRAMEWORKS)
-
-clean :
-	rm -f $(OBJS) core $(TARGET) $(MAKEDEPEND)
-	touch $(MAKEDEPEND)
-
-clobber : clean
-	rm -f $(TARGET) a.out $(LIB) 
-
-to_unix : 
-	for f in *.cpp ; do to_unix $$f $$f; done
-	for f in *.h ; do to_unix $$f $$f; done
-
-# force it
-depend : 
-	$(C++) $(C++FLAGS) -M $(C++FILES) $(CFILES) > $(MAKEDEPEND)
-
-$(MAKEDEPEND) : $(C++FILES) $(CFILES) 
-	$(C++) $(C++FLAGS) -M $(C++FILES) $(CFILES) > $(MAKEDEPEND)
-
-%.o : %.cpp
-	$(C++) $(C++FLAGS) -c $*.cpp -o $*.o
-
-%.o : %.c
-	$(C++) $(C++FLAGS) -c $*.c -o $*.o
-
-docs:
-	[ "$(TARGET_BASENAME)" != "" ] && \
-	mkdir -p ../../doc/doc++/$(TARGET_BASENAME) && \
-	doc++ -d ../../doc/doc++/$(TARGET_BASENAME) -H -A ../../include/$(TARGET_BASENAME)/* && \
-	echo $(TARGET_BASENAME) HTML documentation created in ../../doc/doc++/$(TARGET_BASENAME)
-
-install : home
-	@ $(MAKE) __install
-
-instlinks : home
-	@ $(MAKE) __instlinks
-
-instclean : home
-	@ $(MAKE) __instclean
-
-
-home :
-	@ [ -n "$(OSGHOME)" ] || (echo ; echo "-------------> Please define OSGHOME"; echo)
-	@ [ -n "$(OSGHOME)" ] && echo > /dev/null;
-
-sinclude $(INSTRULES)
-
-include $(MAKEDEPEND)
diff --git a/Make/makerules.mingw b/Make/makerules.mingw
deleted file mode 100644
index e63f3712d..000000000
--- a/Make/makerules.mingw
+++ /dev/null
@@ -1,72 +0,0 @@
-
-all : $(MAKEDEPEND) $(TARGET) $(LOADABLE) $(LIB) 
-
-$(TARGET) : $(OBJS) 
-	$(C++) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
-
-$(LOADABLE) : $(OBJS)
-	$(C++) $(LDFLAGS) -shared \
-	-Wl,--export-all-symbols  \
-	-Wl,--output-def,lib$(TARGET_BASENAME).def \
-	-Wl,--out-implib,$(OSGHOME)/lib/lib$(TARGET_BASENAME).a \
-	-o $@  $(OBJS) $(LIBS)
-
-$(LIB) : $(OBJS)
-	$(C++) $(LDFLAGS) -shared \
-	-Wl,--export-all-symbols  \
-	-Wl,--output-def,lib$(TARGET_BASENAME).def \
-	-Wl,--out-implib,$(OSGHOME)/lib/lib$(TARGET_BASENAME).a \
-	-o $@ $(OBJS) $(LIBS)
-
-clean :
-	rm -f $(OBJS) core $(TARGET) $(MAKEDEPEND)
-	touch $(MAKEDEPEND)
-
-clobber : clean
-	rm -f $(TARGET) a.out $(LIB) 
-
-to_unix : 
-	for f in *.cpp ; do to_unix $$f $$f; done
-	for f in *.h ; do to_unix $$f $$f; done
-
-beautify : 
-	for f in *.cpp ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done
-	for f in *.h ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done
-
-
-# force it
-depend : 
-	$(C++) $(C++FLAGS) -M $(C++FILES) $(CFILES) > $(MAKEDEPEND)
-
-$(MAKEDEPEND) : $(C++FILES) $(CFILES) 
-	$(C++) $(C++FLAGS) -M $(C++FILES) $(CFILES) > $(MAKEDEPEND)
-
-%.o : %.cpp
-	$(C++) $(C++FLAGS) -c $*.cpp -o $*.o
-
-%.o : %.c
-	$(CC) $(C++FLAGS) -c $*.c -o $*.o
-
-docs:
-	[ "$(TARGET_BASENAME)" != "" ] && \
-	mkdir -p ../../doc/doc++/$(TARGET_BASENAME) && \
-	doc++ -d ../../doc/doc++/$(TARGET_BASENAME) -H -A ../../include/$(TARGET_BASENAME)/* && \
-	echo $(TARGET_BASENAME) HTML documentation created in ../../doc/doc++/$(TARGET_BASENAME)
-
-install : home
-	@ make __install
-
-instlinks : home
-	@ make __instlinks
-
-instclean : home
-	@ make __instclean
-
-
-home :
-	@ [ -n "$(OSGHOME)" ] || (echo ; echo "-------------> Please define OSGHOME"; echo)
-	@ [ -n "$(OSGHOME)" ] && echo > /dev/null;
-
-sinclude $(INSTRULES)
-
-include $(MAKEDEPEND)
diff --git a/Make/makerules.new b/Make/makerules.new
deleted file mode 100644
index b6d7bc63e..000000000
--- a/Make/makerules.new
+++ /dev/null
@@ -1,223 +0,0 @@
-
-default : opt 
-
-opt   : $(EXEC:=.opt)\
-	$(LIB:=.opt)\
-	$(PLUGIN:=.opt)\
-
-debug : $(EXEC:=.dbg)\
-	$(LIB:=.dbg)\
-	$(PLUGIN:=.dbg)\
-
-cleanlite : cleanliteopt cleanlitedbg
-
-cleanliteopt : 
-	@[ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f $(EXEC) $(LIB) $(PLUGIN)
-
-cleanlitedbg : 
-	@[ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f $(EXEC) $(LIB) $(PLUGIN)
-
-clean : cleanopt cleandbg
-
-cleanopt : 
-	@[ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f $(OBJS) $(MAKEDEPEND)
-
-cleandbg : 
-	@[ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f $(OBJS) $(MAKEDEPEND)
-
-clobberopt : 
-	rm -rf $(OPTDIR)
-
-clobberdbg : 
-	rm -rf $(DEBUGDIR)
-
-clobber : clobberdbg clobberopt
-
-
-beautify : 
-	for f in *.cpp ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done
-	for f in *.h ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done
-
-docs:
-	[ "$(TARGET_BASENAME)" != "" ] && \
-	mkdir -p $(TOPDIR)/doc/doc++/$(TARGET_BASENAME) && \
-	doc++ -d $(TOPDIR)/doc/doc++/$(TARGET_BASENAME) -H -A \
-	    $(TOPDIR)/include/$(TARGET_BASENAME)/* && \
-	echo "$(TARGET_BASENAME) HTML documentation created in "\
-	     "$(TOPDIR)/doc/doc++/$(TARGET_BASENAME)"
-
-$(EXEC) : $(OBJS) 
-	$(C++) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
-
-
-## Mac OSX makes the distinction between -dynamiclib and -bundle
-## causing us to have to make a special case here, rather than 
-## just redefining the SHARED argument.
-
-ifeq ($(OS),Darwin)
-
-$(LIB) : $(OBJS)
-	$(C++) $(LDFLAGS) -dynamiclib $(OBJS) $(LIBS) -o $@
-
-$(PLUGIN) : $(OBJS)
-	$(C++) $(LDFLAGS) -bundle $(OBJS) $(LIBS) -o $@
-else
-
-$(LIB) $(PLUGIN) : $(OBJS)
-	TARGET_BASENAME=`echo $@ | sed 's/.$(PLUGIN_EXT)//' | sed 's/lib//'`;\
-	$(C++) $(LDFLAGS) $(SHARED) $(OBJS) $(LIBS) -o $@
-
-endif
-
-$(EXEC:=.dbg) :
-	@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
-	@cd $(DEBUGDIR); \
-	  $(MAKE) -f ../Makefile DOF=$(DBGF)  TOPDIR=../${TOPDIR} \
-	    THISDIR=../$(THISDIR)\
-	                MAKEDEPEND=Makedepend $(EXEC)
-	@$(MAKE) LNSRC=$(DEBUGDIR)/$(EXEC) LNDEST=$(BININST)/$(EXEC) __link
-
-$(LIB:=.dbg) :
-	@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
-	@cd $(DEBUGDIR); \
-	  $(MAKE) -f ../Makefile DOF=$(DBGF)  TOPDIR=../${TOPDIR} \
-	   THISDIR=../$(THISDIR)\
-	               MAKEDEPEND=Makedepend $(LIB)
-	@$(MAKE) LNSRC=$(DEBUGDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link
-
-$(PLUGIN:=.dbg) : 
-	@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
-	@cd $(DEBUGDIR); \
-	  $(MAKE) -f ../Makefile DOF=$(DBGF)  TOPDIR=../${TOPDIR} \
-	  THISDIR=../$(THISDIR)\
-	  		MAKEDEPEND=Makedepend $(PLUGIN)
-	@$(MAKE) LNSRC=$(DEBUGDIR)/$(PLUGIN) LNDEST=$(PLUGININST)/$(PLUGIN) __link
-
-$(EXEC:=.opt) : 
-	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
-	@cd $(OPTDIR); \
-	  $(MAKE) -f ../Makefile DOF=$(OPTF)  TOPDIR=../${TOPDIR} \
-	  THISDIR=../$(THISDIR)\
-	                MAKEDEPEND=Makedepend $(EXEC)
-	@$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(EXEC) __link
-
-
-$(LIB:=.opt) : 
-	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
-	@cd $(OPTDIR); \
-	  $(MAKE) -f ../Makefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
-	    THISDIR=../$(THISDIR)\
-	               MAKEDEPEND=Makedepend $(LIB)
-	@$(MAKE) LNSRC=$(OPTDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link
-
-$(PLUGIN:=.opt) : 
-	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
-	@cd $(OPTDIR); \
-	  $(MAKE) -f ../Makefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
-	    THISDIR=../$(THISDIR)\
-	               MAKEDEPEND=Makedepend $(PLUGIN)
-	@$(MAKE) LNSRC=$(OPTDIR)/$(PLUGIN) LNDEST=$(PLUGININST)/$(PLUGIN) __link
-
-
-
-Makedepend : $(CXXFILES) $(CFILES) 
-ifeq ($(OS),IRIX)   
-	touch $@
-else
-	$(C++) $(INC) $(DEPARG) $? > $(MAKEDEPEND)
-endif
-
-
-
-
-.SUFFIXES: .cpp .o
-.cpp.o:
-	$(C++) $(CXXFLAGS) -c $<
-
-## This is an attempt at updating Makedepend file for each source
-## file compiled rather than all files each time a source file changes
-## Doesn't work too well, but leave the code here for later evaulation
-ifeq (0,1)
-ifneq ($(OS),IRIX)   
-	$(C++) $(INC) $(DEPFLAGS) $< > .temp.dep
-	if [ -f $(MAKEDEPEND) ] ; \
-	then \
-	  grep -v $< $(MAKEDEPEND) > .temp.dep1;\
-	else \
-	    touch .temp.dep1; \
-	fi
-	cat .temp.dep1 .temp.dep > $(MAKEDEPEND)
-	rm -f .temp.dep1 .temp.dep
-endif
-endif
-
-
-depend : $(MAKEDEPEND)
-
-
-###############################################################################
-#
-#  Ok.. If  you are looking hard at the following lines of gnarled code, you 
-#  deserve an explanation.  This target makes a link from the installed 
-#  directories (Assumed to be rooted at $(TOPDIR), usually $(TOPDIR)/bin or 
-#  $(TOPDIR)/lib) to a just-built target. Both LNSRC (Link source) and LNDEST 
-#  (Link destination) must be defined before calling 'make __link'.  
-#  
-#  The first four lines check to see that both LNSRC and LNDEST have been 
-#  defined.
-#  
-#  The (very long) following 'if' statement reads in pseudo-code like this:
-#  
-#     if the current link is not pointing to the intended destination
-#      then
-#          announce (echo) intentions to reset link
-#          compute the link path by the following steps
-#  	    a) define SRCDIR as the current absolute directory 
-#  	       appended by the directory of the intended source of the link
-#  	    b) define DESTDIR as the absolute path of $(TOPDIR) appended by
-#  	       the directory of the intended destination of the link
-#  	    c) define a temproary variable T to be the absolute path of
-#  	       the destination directory less the prefix of the absolute
-#  	       path of $(TOPDIR)
-#  	         e.g.   /root/work/thisdir/bin/ - /root/work/thisdir/ = bin/
-#           d) Run a loop, truncating the path represented by T until 
-#              'dirname' returns '.'.  On each iteration increment PFX 
-#              (Prefix) by '../'  This will define the prefix for the path 
-#              of the link.  
-#  	         e.g. If DESTDIR is lib/osgPlugins, PFX is ../../
-#  	    e) Define the link as a concatenation of PFX and the absolute 
-#              path of the source directory less the absolute path of 
-#              $(TOPDIR)
-#  
-#          Change directories in to the link destination directory 
-#  	   run the link command
-#
-###############################################################################
-
-__link : 
-	@[ -n "$(LNSRC)" ] || echo "Internal error (LNSRC definition)"
-	@[ -n "$(LNSRC)" ] && echo > /dev/null
-	@[ -n "$(LNDEST)" ] || echo "Internal error (LNDEST definition)"
-	@[ -n "$(LNDEST)" ] && echo > /dev/null
-	@if diff -s $(TOPDIR)/$(LNDEST) $(LNSRC) >/dev/null 2>&1;\
-	  then\
-	    echo "  =====> $(LNSRC) and $(TOPDIR)/$(LNDEST) are in sync";\
-	  else\
-	    echo "  =====> resetting $(TOPDIR)/$(LNDEST) to point to $(LNSRC)";\
-	    SRCDIR=`pwd`/`dirname $(LNSRC)`;\
-	    cd $(TOPDIR);\
-	    ROOTDIR=`pwd`;\
-	    DESTDIR=`dirname $$ROOTDIR/$(LNDEST)`;\
-	    T=`echo $$DESTDIR $$ROOTDIR | \
-	    	awk '{print substr($$1,length($$2)+2,512)}'`;\
-	    while [ "$$T" != "." ]; do T=`dirname $$T`;PFX=../"$$PFX";done;\
-	    LINK="$$PFX"`echo $$SRCDIR $$ROOTDIR  | awk \
-	      '{ print substr($$1,length($$2)+2,512) }'`/`basename $(LNDEST)`;\
-	    cd `dirname $(LNDEST)`;\
-	    rm -f `basename $(LNDEST)`;\
-	    $(LINK) $$LINK `basename $(LNDEST)`;\
-	 fi
-		
-
-sinclude $(MAKEDEPEND)
-
diff --git a/Makefile b/Makefile
index 80ece9215..d09514b45 100644
--- a/Makefile
+++ b/Makefile
@@ -1,175 +1,7 @@
-#!gmake
-SHELL=/bin/sh
-MAKE_PREP = Make/makedefs Make/makerules
+TOPDIR = .
+include $(TOPDIR)/Make/makedefs
 
 DIRS = src
 
-VERSION = osg-0.8.44
-
-export OSGHOME = $(shell pwd)
-
-all : $(MAKE_PREP)
-	for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done
-
-docs :
-	cd src; $(MAKE) docs;
-
-
-Make/makedefs :
-	@ cd Make;\
-	 case `uname` in\
-	 IRIX|IRIX64) \
-	    ln -sf makedefs.irix.std makedefs ;;\
-	 Linux) \
-	    ln -sf makedefs.linux makedefs;;\
-	 CYGWIN*) \
-	    ln -sf makedefs.cyg makedefs;;\
-	 esac
-
-Make/makerules :
-	@ cd Make;\
-	 case `uname` in\
-	 IRIX|IRIX64) \
-	    ln -sf makerules.irix makerules  ;; \
-	 Linux) \
-	    ln -sf makerules.linux makerules ;;\
-	 CYGWIN*) \
-	    ln -sf makerules.cyg makerules ;;\
-	 esac
-
-linux:
-	cd Make;\
-	ln -sf makedefs.linux makedefs;\
-	ln -sf makerules.linux makerules
-	$(MAKE)
-
-cygwin:
-	cd Make;\
-	ln -sf makedefs.cyg makedefs;\
-	ln -sf makerules.cyg makerules
-	$(MAKE)
-
-mingw:
-	cd Make;\
-	ln -sf makedefs.mingw makedefs;\
-	ln -sf makerules.mingw makerules
-	$(MAKE)
-
-freebsd:
-	cd Make;\
-	ln -sf makedefs.freebsd makedefs;\
-	ln -sf makerules.freebsd makerules
-	$(MAKE)
-
-
-irix:
-	cd Make;\
-	ln -sf makedefs.irix.std makedefs ;\
-	ln -sf makerules.irix makerules 
-	$(MAKE)
-
-irix64:
-	cd Make;\
-	ln -sf makedefs.irix.std.64 makedefs ;\
-	ln -sf makerules.irix makerules 
-	$(MAKE)
-
-macosx:
-	cd Make;\
-	ln -sf makedefs.macosx makedefs;\
-	ln -sf makerules.macosx makerules
-	$(MAKE)
-
-
-help :
-	@echo Usage : 
-	@echo \	$(MAKE) 
-	@echo \	$(MAKE) linux
-	@echo \	$(MAKE) cygwin
-	@echo \	$(MAKE) mingw
-	@echo \	$(MAKE) freebsd
-	@echo \	$(MAKE) macosx
-	@echo \	$(MAKE) irix
-	@echo \	$(MAKE) irix64
-	@echo  
-	@echo \	$(MAKE) depend
-	@echo \	$(MAKE) clean
-	@echo \	$(MAKE) clobber
-	@echo  
-	@echo \	$(MAKE) doc
-	@echo \	$(MAKE) release
-	@echo \	$(MAKE) dev
-	@echo  
-	@echo \	$(MAKE) install
-	@echo \	$(MAKE) instlinks
-	@echo \	$(MAKE) instclean
-	@echo  
-
-
-clean : $(MAKE_PREP)
-	for f in $(DIRS) ; do cd $$f; $(MAKE) clean; cd ..;  done
-	rm -f `find lib -type f | grep -v .README`
-	rm -f `ls bin/* | grep -v CVS`
-
-clobber : $(MAKE_PREP) clean
-	for f in $(DIRS) ; do cd $$f; $(MAKE) clobber; cd ..;  done
-	rm -f $(MAKE_PREP)
-
-depend : $(MAKE_PREP)
-	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
-	cd include/osg; for f in * ; do to_unix $$f $$f; done
-	cd include/osgUtil; for f in * ; do to_unix $$f $$f; done
-	cd include/osgGLUT; for f in * ; do to_unix $$f $$f; done
-
-beautify : 
-	for f in $(DIRS) ; do cd $$f; $(MAKE) beautify; cd ..;  done
-#	cd include/osg; for f in * ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done
-#	cd include/osgUtil; for f in * ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done
-#	cd include/osgGLUT; for f in * ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done
-
-release: $(MAKE_PREP)
-	$(MAKE) docs;
-	$(MAKE) clobber;
-	(cd ..; tar cvf - $(VERSION) | gzip > $(VERSION).tar.gz)
-
-dev: $(MAKE_PREP)
-	$(MAKE) docs;
-	$(MAKE) clobber;
-	(cd ..; tar cvf - $(VERSION) | gzip > osg-`date "+%Y%m%d"`.tar.gz)
-
-install instlinks instclean :
-	for f in $(DIRS)  ; do cd $$f; $(MAKE) $@; cd ..;  done
-
-instcheck :
-	diff -q include/osg/       /usr/include/osg/
-	diff -q include/osgUtil/   /usr/include/osgUtil/
-	diff -q include/osgDB/     /usr/include/osgDB/
-	diff -q include/osgText/     /usr/include/osgText/
-	diff -q include/osgGLUT/   /usr/include/osgGLUT/
-	diff -q lib/libosg.$(SO_EXT)      /usr/lib/libosg.$(SO_EXT)
-	diff -q lib/libosgUtil.$(SO_EXT)  /usr/lib/libosgUtil.$(SO_EXT)
-	diff -q lib/libosgDB.$(SO_EXT)    /usr/lib/libosgDB.$(SO_EXT)
-	diff -q lib/libosgGLUT.$(SO_EXT)  /usr/lib/libosgGLUT.$(SO_EXT)
-	diff -q lib/libosgText.$(SO_EXT)  /usr/lib/libosgText.$(SO_EXT)
-	diff -q lib/osgPlugins/    /usr/lib/osgPlugins/
-
-stats :
-	@echo stats : 
-	cat include/osg/* src/osg/*.cpp | wc -l
-	cat include/osgUtil/* src/osgUtil/*.cpp | wc -l
-	cat include/osgDB/* src/osgDB/*.cpp | wc -l
-	cat include/osgGLUT/* src/osgGLUT/*.cpp | wc -l
-	cat include/osgText/* src/osgText/*.cpp | wc -l
-	cat include/*/* src/*/*.cpp | wc -l
-	cat src/Demos/*/*.cpp | wc -l
-	cat src/osgPlugins/*/*.cpp src/osgPlugins/*/*.h | wc -l
-	cat include/*/* src/*/*.cpp src/Demos/*/*.cpp src/osgPlugins/*/*.cpp src/osgPlugins/*/*.h | wc -l
-
-
-test :
-	@echo running tests:
-	for f in $(DIRS) ; do cd $$f; $(MAKE) test; cd ..;  done
+include $(TOPDIR)/Make/makedirrules
+include $(TOPDIR)/Make/instrules
diff --git a/dist/Irix/Makefile b/dist/Irix/Makefile
index 201c0d515..139597f9c 100644
--- a/dist/Irix/Makefile
+++ b/dist/Irix/Makefile
@@ -1,16 +1,2 @@
-SHELL = /bin/sh
 
 
-all : irixdist tardist
-
-
-irixdist :
-	cd ${OSGHOME}; [ -d irixdist ] || mkdir irixdist
-	cd ${OSGHOME}; \
-	/usr/sbin/gendist -sbase ${OSGHOME} -idb dist/Irix/osg.idb -spec dist/Irix/osg.spec -dist irixdist -all
-
-
-tardist : irixdist
-	cd ${OSGHOME}/irixdist;\
-	tar cvf osg.tardist osg  osg.idb  osg.sw
-
diff --git a/dist/RedHatRPM/Makefile b/dist/RedHatRPM/Makefile
index 1ae396b69..e69de29bb 100644
--- a/dist/RedHatRPM/Makefile
+++ b/dist/RedHatRPM/Makefile
@@ -1,29 +0,0 @@
-SHELL = /bin/sh
-
-BINDIRS = \
-	osg-${OSGVERSION}/bin/\
-	osg-${OSGVERSION}/include/\
-	osg-${OSGVERSION}/lib/\
-
-all :: rpm
-
-
-rpm : osg.spec tardist 
-	rpm -bb --clean osg.spec
-
-
-osg.spec : makespec
-	./makespec 
-
-tardist : 
-	@[ -n "${OSGHOME}" ] || (echo Please define OSGHOME; exit 3)
-	@[ -n "${OSGVERSION}" ] || (echo Please define OSGVERSION; exit 4)
-	@[ -n "${OSGRELEASE}" ] || (echo Please define OSGRELEASE; exit 5)
-	@[ "`whoami`" = "root" ] || (echo Must be ROOT; exit 6)
-	(cd ${OSGHOME}/..; \
-		tar cf -  ${BINDIRS} | gzip > \
-		/usr/src/redhat/SOURCES/osg-${OSGVERSION}.tar.gz)
-
-
-clean : 
-	rm -f osg.spec
diff --git a/src/Demos/Makefile b/src/Demos/Makefile
index 9d8606ed6..08f504de8 100644
--- 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
diff --git a/src/Demos/hangglide/Makefile b/src/Demos/hangglide/Makefile
index 3ae42d09c..f7cccc633 100644
--- 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 
diff --git a/src/Demos/osgbillboard/Makefile b/src/Demos/osgbillboard/Makefile
index cad710312..deef71581 100644
--- 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 
diff --git a/src/Demos/osgcluster/Makefile b/src/Demos/osgcluster/Makefile
index 4e2d57a80..3a6e5c0f1 100644
--- 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 
diff --git a/src/Demos/osgconv/Makefile b/src/Demos/osgconv/Makefile
index c41e40090..86cc6b036 100644
--- 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 
diff --git a/src/Demos/osgcopy/Makefile b/src/Demos/osgcopy/Makefile
index f0189e70d..1a999d037 100644
--- 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 
diff --git a/src/Demos/osgcube/Makefile b/src/Demos/osgcube/Makefile
index 061aa8c05..99a8b2fc7 100644
--- 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 
diff --git a/src/Demos/osgimpostor/Makefile b/src/Demos/osgimpostor/Makefile
index 6ae671ac0..7a9da796e 100644
--- 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 
diff --git a/src/Demos/osgreflect/Makefile b/src/Demos/osgreflect/Makefile
index d2cd19717..b3658c70a 100644
--- 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 
diff --git a/src/Demos/osgscribe/Makefile b/src/Demos/osgscribe/Makefile
index b3ddf85f0..7cb679a8b 100644
--- 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 
diff --git a/src/Demos/osgstereoimage/Makefile b/src/Demos/osgstereoimage/Makefile
index 4ebcb2761..895ad7598 100644
--- 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 
diff --git a/src/Demos/osgtext/Makefile b/src/Demos/osgtext/Makefile
index 9943bfcae..9dc025158 100644
--- 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 
diff --git a/src/Demos/osgtexture/Makefile b/src/Demos/osgtexture/Makefile
index e9436054c..e0e5193eb 100644
--- 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 
diff --git a/src/Demos/osgviews/Makefile b/src/Demos/osgviews/Makefile
index c0ce13271..cc8d068b9 100644
--- 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 
diff --git a/src/Demos/sgv/Makefile b/src/Demos/sgv/Makefile
index f1fc7263e..77ed4dd7c 100644
--- 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 
 
diff --git a/src/Makefile b/src/Makefile
index c2828c3e2..eb609e9be 100644
--- 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
diff --git a/src/osg/Makefile b/src/osg/Makefile
index cd5ed563d..7968a9d43 100644
--- 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 
diff --git a/src/osgDB/Makefile b/src/osgDB/Makefile
index a705de3cb..91a6807a7 100644
--- 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 
diff --git a/src/osgGLUT/Makefile b/src/osgGLUT/Makefile
index b8f6b7684..35915185c 100644
--- 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 
diff --git a/src/osgPlugins/Makefile b/src/osgPlugins/Makefile
index 4286e12fe..cd73ba406 100644
--- 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
diff --git a/src/osgPlugins/bmp/Makefile b/src/osgPlugins/bmp/Makefile
index d4bc90815..44f7fda13 100644
--- 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 
diff --git a/src/osgPlugins/dw/Makefile b/src/osgPlugins/dw/Makefile
index df3591b54..cae692f52 100644
--- 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 
diff --git a/src/osgPlugins/dx/Makefile b/src/osgPlugins/dx/Makefile
index b0c0dee99..3daf4066a 100644
--- 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 
diff --git a/src/osgPlugins/flt/Makefile b/src/osgPlugins/flt/Makefile
index 0da6f4397..81a42ff51 100644
--- 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 
diff --git a/src/osgPlugins/gif/Makefile b/src/osgPlugins/gif/Makefile
index 82b96d489..3c9303a9a 100644
--- 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 
diff --git a/src/osgPlugins/jpeg/Makefile b/src/osgPlugins/jpeg/Makefile
index eb2f62b02..c282cdc94 100644
--- 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 
diff --git a/src/osgPlugins/lib3ds/Makefile b/src/osgPlugins/lib3ds/Makefile
index 4e1a85b5d..fec596cbb 100644
--- 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 
diff --git a/src/osgPlugins/lwo/Makefile b/src/osgPlugins/lwo/Makefile
index dc7b56637..528b1a0c2 100644
--- 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 
diff --git a/src/osgPlugins/obj/Makefile b/src/osgPlugins/obj/Makefile
index c69516cfb..65840c5ff 100644
--- 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 
diff --git a/src/osgPlugins/osg/Makefile b/src/osgPlugins/osg/Makefile
index 854527159..21ac57452 100644
--- 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 
diff --git a/src/osgPlugins/osgtgz/Makefile b/src/osgPlugins/osgtgz/Makefile
index f21b427cb..c0f3b6beb 100644
--- 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 
diff --git a/src/osgPlugins/pfb/Makefile b/src/osgPlugins/pfb/Makefile
index d8acecd34..b17b17db5 100644
--- 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 
diff --git a/src/osgPlugins/pic/Makefile b/src/osgPlugins/pic/Makefile
index 301fd91ce..886b82f1f 100644
--- 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 
diff --git a/src/osgPlugins/png/Makefile b/src/osgPlugins/png/Makefile
index 5ed4cabbe..64ab81ca7 100644
--- 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 
diff --git a/src/osgPlugins/quicktime/Makefile b/src/osgPlugins/quicktime/Makefile
index 22c28cd9f..5ffdbd3b3 100644
--- 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 
 
diff --git a/src/osgPlugins/rgb/Makefile b/src/osgPlugins/rgb/Makefile
index 5fd539d23..db1aa6661 100644
--- 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 
diff --git a/src/osgPlugins/tga/Makefile b/src/osgPlugins/tga/Makefile
index 39fd6a4a1..a62500830 100644
--- 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 
diff --git a/src/osgPlugins/tgz/Makefile b/src/osgPlugins/tgz/Makefile
index bb3e91968..57b03ff53 100644
--- 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 
diff --git a/src/osgPlugins/tiff/Makefile b/src/osgPlugins/tiff/Makefile
index 6205023d0..5e1d9081d 100644
--- 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 
diff --git a/src/osgPlugins/txp/Makefile b/src/osgPlugins/txp/Makefile
index 9b55991e7..844996a7d 100644
--- 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 
diff --git a/src/osgPlugins/zip/Makefile b/src/osgPlugins/zip/Makefile
index f65bbd1b8..4b05101ea 100644
--- 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 
diff --git a/src/osgText/Makefile b/src/osgText/Makefile
index 67363d223..bfe110d57 100644
--- 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 
diff --git a/src/osgUtil/Makefile b/src/osgUtil/Makefile
index cb857441f..b689cfbea 100644
--- 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