Folded in Bob Kuehne's changes for Mac OSX to makedefs and makerules

Make/makedefs.new

@@ -162,33 +162,28 @@ ifeq ($(OS),FreeBSD)
 endif
 
 #### Mac OSX specific definitions
-ifeq ($(OS),MacOSX)
-  C++               = g++
-  DEPARG            = ??
-  INC               +=  -I/usr/local/include -I/sw/include
-  DEF               += -D__DARWIN_OSX__
-  OPTF              = -O2 
+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          = -all_load  -L/usr/local/lib -L/usr/lib  
+  LINKARGS          = -L/usr/lib -L/sw/lib 
   DYNAMICLIBRARYLIB = 
   OSG_LIBS          = -losgGLUT -losgDB -losgUtil -losg 
   FREETYPE_LIB      = -lfreetype
-  GLUT_LIB          = 
-  GL_LIBS           = 
+  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
-  FRAMEWORKS        =  -L/sw/lib \
-  		 	-framework GLUT \
-			-framework Carbon \
-			-framework OpenGL
-
-  LIBS              += $(FRAMEWORKS)
-  QUICKTIME	    = -framework QuickTime
+  QUICKTIME_LIB	    = -framework QuickTime
   TIFF_LIB	    = -ltiff
 
 endif

Make/makerules.new

@@ -18,7 +18,6 @@ cleanlitedbg :
 	@[ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f $(EXEC) $(LIB) $(PLUGIN)
 
 clean : cleanopt cleandbg
-	@[ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f $(OBJS) $(MAKEDEPEND)
 
 cleanopt : 
 	@[ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f $(OBJS) $(MAKEDEPEND)
@@ -55,7 +54,7 @@ $(EXEC) : $(OBJS)
 ## causing us to have to make a special case here, rather than 
 ## just redefining the SHARED argument.
 
-ifeq ($(OS),MacOSX)
+ifeq ($(OS),Darwin)
 
 $(LIB) : $(OBJS)
 	$(C++) $(LDFLAGS) -dynamiclib $(OBJS) $(LIBS) -o $@