changeset 753:76dd5561004e

Mods to make irix 5 lint happy.
author neelin <neelin>
date Thu, 09 Feb 1995 14:19:43 +0000
parents 4b28650e0869
children 0295aa7865d9
files conversion/Acr_nema/Makefile conversion/mnitominc/Makefile progs/Get_image_offset/Makefile progs/Proglib/Makefile progs/coordinates/Makefile progs/mincconcat/Makefile progs/minccopy/Makefile progs/mincexample/Makefile progs/mincexpand/Makefile progs/mincextract/Makefile progs/mincinfo/Makefile progs/minclookup/Makefile progs/minctoraw/Makefile progs/mincwindow/Makefile progs/rawtominc/Makefile progs/xfm/Makefile
diffstat 16 files changed, 39 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/conversion/Acr_nema/Makefile
+++ b/conversion/Acr_nema/Makefile
@@ -39,7 +39,7 @@
 $(PROG_OBJ) $(LINT_LIST) $(OBJS) $(LINT_OBJS) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -64,10 +64,10 @@
 
 # How to create lint library
 $(LINT_ACR_LIB) : $(LINT_OBJS)
-	lint -o $(ACR_LIB) -m -x -u $(LINTFLAGS) $(LINT_OBJS)
+	$(LINT) -o $(ACR_LIB) $(LINT_LIBOPTS) $(LINTFLAGS) $(LINT_OBJS)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_ACR_LIB)
-	lint -u -m $(LINTFLAGS) $@ln $(LINT_ACR_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_ACR_LIB)
 
 # how to make man pages
 .man1.1:
--- a/conversion/mnitominc/Makefile
+++ b/conversion/mnitominc/Makefile
@@ -34,7 +34,7 @@
 $(PROG_OBJ) $(LINT_LIST) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -52,7 +52,7 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
 
 # Remove all derived files in this directory
 clean:
--- a/progs/Get_image_offset/Makefile
+++ b/progs/Get_image_offset/Makefile
@@ -45,7 +45,7 @@
 $(PROG_OBJ) $(LINT_LIST) $(EXTRA_OBJS) $(LINT_EXTRA) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -I$(NETCDF_SOURCE_DIR) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -I$(NETCDF_SOURCE_DIR) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -I$(NETCDF_SOURCE_DIR) -c $< -o $@
@@ -63,7 +63,8 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_EXTRA) $(LINT_PROG_LIB) $(LINT_MINC_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_EXTRA) $(LINT_PROG_LIB) $(LINT_MINC_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_EXTRA) \
+	         $(LINT_PROG_LIB) $(LINT_MINC_LIB)
 
 # how to make man pages
 .man1.1:
--- a/progs/Proglib/Makefile
+++ b/progs/Proglib/Makefile
@@ -30,7 +30,7 @@
 $(OBJS) $(LINT_OBJS) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -46,7 +46,7 @@
 
 # How to create lint library
 $(LINT_PROG_LIB) : $(LINT_OBJS)
-	lint -o $(PROG_LIB) -m -x -u $(LINTFLAGS) $(LINT_OBJS)
+	$(LINT) -o $(PROG_LIB) $(LINT_LIBOPTS) $(LINTFLAGS) $(LINT_OBJS)
 
 # Remove all derived files in this directory
 clean:
--- a/progs/coordinates/Makefile
+++ b/progs/coordinates/Makefile
@@ -34,7 +34,7 @@
 $(PROG_OBJ) $(LINT_LIST) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -52,7 +52,7 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_PROG_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_PROG_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_PROG_LIB)
 
 # Remove all derived files in this directory
 clean:
--- a/progs/mincconcat/Makefile
+++ b/progs/mincconcat/Makefile
@@ -9,8 +9,8 @@
 
 # Executable names
 PROGS    = mincconcat
-EXTRA_OBJS = 
-HEADERS  = 
+EXTRA_OBJS = voxel_loop.o
+HEADERS  = voxel_loop.h
 CDEFINES = -DDEBUG# cpp defines
 LDOPT    = $(PROG_LDOPT)
 
@@ -36,7 +36,7 @@
 $(PROG_OBJ) $(LINT_LIST) $(EXTRA_OBJS) $(LINT_EXTRA) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -54,7 +54,8 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $$@ln $(LINT_EXTRA) $(LINT_PROG_LIB) $(LINT_MINC_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_EXTRA) $(LINT_PROG_LIB) $(LINT_MINC_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_EXTRA) \
+	      $(LINT_PROG_LIB) $(LINT_MINC_LIB)
 
 # Remove all derived files in this directory
 clean:
--- a/progs/minccopy/Makefile
+++ b/progs/minccopy/Makefile
@@ -34,7 +34,7 @@
 $(PROG_OBJ) $(LINT_LIST) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -52,7 +52,7 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
 
 # Remove all derived files in this directory
 clean:
--- a/progs/mincexample/Makefile
+++ b/progs/mincexample/Makefile
@@ -34,7 +34,7 @@
 $(PROG_OBJ) $(LINT_LIST) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -52,7 +52,7 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
 
 # Remove all derived files in this directory
 clean:
--- a/progs/mincexpand/Makefile
+++ b/progs/mincexpand/Makefile
@@ -41,7 +41,7 @@
 $(PROG_OBJ) $(LINT_LIST) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -59,7 +59,7 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
 
 # how to make man pages
 .man1.1:
--- a/progs/mincextract/Makefile
+++ b/progs/mincextract/Makefile
@@ -34,7 +34,7 @@
 $(PROG_OBJ) $(LINT_LIST) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -52,7 +52,7 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
 
 # Remove all derived files in this directory
 clean:
--- a/progs/mincinfo/Makefile
+++ b/progs/mincinfo/Makefile
@@ -41,7 +41,7 @@
 $(PROG_OBJ) $(LINT_LIST) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -59,7 +59,7 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
 
 # how to make man pages
 .man1.1:
--- a/progs/minclookup/Makefile
+++ b/progs/minclookup/Makefile
@@ -36,7 +36,7 @@
 $(PROG_OBJ) $(LINT_LIST) $(EXTRA_OBJS) $(LINT_EXTRA) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -54,7 +54,8 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_EXTRA) $(LINT_PROG_LIB) $(LINT_MINC_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_EXTRA) $(LINT_PROG_LIB) $(LINT_MINC_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_EXTRA) \
+	      $(LINT_PROG_LIB) $(LINT_MINC_LIB)
 
 # Remove all derived files in this directory
 clean:
--- a/progs/minctoraw/Makefile
+++ b/progs/minctoraw/Makefile
@@ -34,7 +34,7 @@
 $(PROG_OBJ) $(LINT_LIST) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -52,7 +52,7 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
 
 # Remove all derived files in this directory
 clean:
--- a/progs/mincwindow/Makefile
+++ b/progs/mincwindow/Makefile
@@ -36,7 +36,7 @@
 $(PROG_OBJ) $(LINT_LIST) $(EXTRA_OBJS) $(LINT_EXTRA) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -54,7 +54,8 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_EXTRA) $(LINT_PROG_LIB) $(LINT_MINC_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_EXTRA) $(LINT_PROG_LIB) $(LINT_MINC_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_EXTRA) \
+	      $(LINT_PROG_LIB) $(LINT_MINC_LIB)
 
 # Remove all derived files in this directory
 clean:
--- a/progs/rawtominc/Makefile
+++ b/progs/rawtominc/Makefile
@@ -41,7 +41,7 @@
 $(PROG_OBJ) $(LINT_LIST) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -59,7 +59,7 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_PROG_LIB) $(LINT_MINC_LIB)
 
 # how to make man pages
 .man1.1:
--- a/progs/xfm/Makefile
+++ b/progs/xfm/Makefile
@@ -34,7 +34,7 @@
 $(PROG_OBJ) $(LINT_LIST) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -52,7 +52,7 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_PROG_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_PROG_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_PROG_LIB)
 
 # Remove all derived files in this directory
 clean: