Changeset 939

Timestamp:

Mar 11, 2008, 2:41:43 PM (17 years ago)

Author:

gah

Message:

Axis.cpp cleanup

Location:

trunk/vizservers/nanovis

Files:

• Axis.cpp (modified) (1 diff)
• Axis.h (modified) (1 diff)
• Makefile.in (modified) (3 diffs)

trunk/vizservers/nanovis/Axis.cpp

@@ -547 +547 @@
     return x;
 }
-
-

trunk/vizservers/nanovis/Axis.h

@@ -150 +150 @@
     }
     void SweepTicks(void) {
-        if (_flags & AUTOSCALE) {
+        if (_autoscale) {
             if (_ticks != NULL) {
                 delete [] _ticks;

trunk/vizservers/nanovis/Makefile.in

@@ -20 +20 @@
 INSTALL_DATA    = ${INSTALL} -m 644
 INSTALL_SCRIPT  = ${INSTALL} -m 644
+RM              = rm -f
 
 AUXSRC          = config.h define.h global.h
@@ -161 +162 @@
 
 $(MAT_LIB):
-        make -C $(MAT_DIR) all
+        $(MAKE) -C $(MAT_DIR) all
 
 $(R2_LIB): 
-        make -C $(R2_DIR)/src all
+        $(MAKE) -C $(R2_DIR)/src all
 
 $(IMG_LIB): 
-        make -C $(IMG_DIR) all
+        $(MAKE) -C $(IMG_DIR) all
 
 $(TF_LIB): 
-        make -C $(TF_DIR) all
+        $(MAKE) -C $(TF_DIR) all
 
 nanovis: $(MAT_LIB) $(R2_LIB) $(IMG_LIB) $(TF_LIB) $(OBJS) 
@@ -219 +220 @@
 
 clean:
-        make -C $(MAT_DIR) clean
-        make -C $(R2_DIR)/src clean
-        make -C $(IMG_DIR) clean
-        make -C $(TF_DIR) clean
-        rm -f nanovis client $(OBJS)
+        $(MAKE) -C $(MAT_DIR) clean
+        $(MAKE) -C $(R2_DIR)/src clean
+        $(MAKE) -C $(IMG_DIR) clean
+        $(MAKE) -C $(TF_DIR) clean
+        $(RM) nanovis client $(OBJS)
 
 distclean: clean
-        rm -f Makefile *~
+        $(RM) Makefile *~
 
 NvStdVertexShader.o: NvStdVertexShader.cpp NvStdVertexShader.h