Index: trunk/Ohana/src/opihi/cmd.astro/cdot.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/cdot.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/cdot.c (revision 34088) @@ -30,5 +30,6 @@ status = fRD_to_XY (&x, &y, r, d, &graphmode.coords); - + if (!status) return TRUE; + if (!KapaPrepPlot (kapa, 1, &graphmode)) return (FALSE); KapaPlotVector (kapa, 1, &x, "x"); Index: trunk/Ohana/src/opihi/cmd.astro/cline.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/cline.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/cline.c (revision 34088) @@ -23,6 +23,13 @@ graphmode.etype = 0; + // need to plot to edge of picture.. status = fRD_to_XY (&x[0], &y[0], r[0], d[0], &graphmode.coords); + if (!status) { + return FALSE; + } status = fRD_to_XY (&x[1], &y[1], r[1], d[1], &graphmode.coords); + if (!status) { + return FALSE; + } if (!KapaPrepPlot (kapa, 2, &graphmode)) return (FALSE); Index: trunk/Ohana/src/opihi/cmd.astro/fixcols.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/fixcols.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/fixcols.c (revision 34088) @@ -68,5 +68,5 @@ int fixcols (int argc, char **argv) { - int ix, iy, Nx, Ny, Nvect, start, stop; + int ix, iy, Nx, Nvect, start, stop; float *Vin, *vect, *meds, median, stdev, sigma, Nsigma, value; Buffer *in; @@ -84,5 +84,5 @@ Nx = in[0].matrix.Naxis[0]; - Ny = in[0].matrix.Naxis[1]; + // Ny = in[0].matrix.Naxis[1]; ALLOCATE (meds, float, Nx); Index: trunk/Ohana/src/opihi/cmd.astro/fiximage.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/fiximage.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/fiximage.c (revision 34088) @@ -3,12 +3,12 @@ int fiximage (int argc, char **argv) { - int ix, iy, N; + int ix, iy; Buffer *in, *ct, *mask; - int VERBOSE = FALSE; - if ((N = get_argument (argc, argv, "-v"))) { - VERBOSE = TRUE; - remove_argument (N, &argc, argv); - } + // int VERBOSE = FALSE; + // if ((N = get_argument (argc, argv, "-v"))) { + // VERBOSE = TRUE; + // remove_argument (N, &argc, argv); + // } if (argc != 4) { Index: trunk/Ohana/src/opihi/cmd.astro/gauss.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/gauss.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/gauss.c (revision 34088) @@ -5,5 +5,5 @@ char key[20]; int i, N, Npix, Nborder, Nspot; - double X, Y, Z, ZP, RA, DEC, max; + double X, Y, ZP, RA, DEC, max; int kapa; char *name; @@ -58,5 +58,5 @@ KiiCursorRead (kapa, &X, &Y, &ZP, &RA, &DEC, key); if (!strcasecmp (key, "Q")) break; - Z = get_aperture_stats (&buf[0].matrix, (int)(X+0.5), (int)(Y+0.5), Npix, Nborder, max); + get_aperture_stats (&buf[0].matrix, (int)(X+0.5), (int)(Y+0.5), Npix, Nborder, max); } KiiCursorOff (kapa); Index: trunk/Ohana/src/opihi/cmd.astro/getvel.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/getvel.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/getvel.c (revision 34088) @@ -4,5 +4,4 @@ int i, n, Ncurve; - int nx, ny; double L, V, Vo, dV, Bo, dB; double xo, yo; @@ -29,6 +28,6 @@ if ((buf = SelectBuffer (argv[1], OLDBUFFER, TRUE)) == NULL) return (FALSE); - nx = buf[0].matrix.Naxis[0]; - ny = buf[0].matrix.Naxis[1]; + // int nx = buf[0].matrix.Naxis[0]; + // int ny = buf[0].matrix.Naxis[1]; /* we expect the input image to have units of velocity, lattitude, and longitude */ Index: trunk/Ohana/src/opihi/cmd.astro/imfit.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/imfit.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/imfit.c (revision 34088) @@ -3,5 +3,5 @@ int imfit (int argc, char **argv) { - int i, j, N, Npts, Save, VERBOSE, ShapeVariation; + int i, j, N, Npts, Save, VERBOSE; int sx, sy, nx, ny, Nx, Ny; float chisq, ochisq, dchisq, Gain, RDnoise, SatThreshold; @@ -16,9 +16,9 @@ } - ShapeVariation = FALSE; - if ((N = get_argument (argc, argv, "-shapes"))) { - remove_argument (N, &argc, argv); - ShapeVariation = TRUE; - } + // int ShapeVariation = FALSE; + // if ((N = get_argument (argc, argv, "-shapes"))) { + // remove_argument (N, &argc, argv); + // ShapeVariation = TRUE; + // } SatThreshold = 0xffff; Index: trunk/Ohana/src/opihi/cmd.astro/imsub.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/imsub.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/imsub.c (revision 34088) @@ -3,5 +3,5 @@ int imsub (int argc, char **argv) { - int i, j, N, VERBOSE; + int i, j, N; int sx, sy, nx, ny, Nx, Ny; float value; @@ -9,9 +9,9 @@ Buffer *buf; - VERBOSE = FALSE; - if ((N = get_argument (argc, argv, "-v"))) { - remove_argument (N, &argc, argv); - VERBOSE = TRUE; - } + // int VERBOSE = FALSE; + // if ((N = get_argument (argc, argv, "-v"))) { + // remove_argument (N, &argc, argv); + // VERBOSE = TRUE; + // } /* set fitting function */ Index: trunk/Ohana/src/opihi/cmd.astro/kronflux.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/kronflux.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/kronflux.c (revision 34088) @@ -67,12 +67,12 @@ int i, j; - double gain; - char *string = get_variable ("GAIN"); - if (string == (char *) NULL) { - if (VERBOSE) gprint (GP_ERR, "assuming a value of 1.0\n"); - gain = 1.0; - } else { - gain = atof (string); - } + // double gain; + // char *string = get_variable ("GAIN"); + // if (string == (char *) NULL) { + // if (VERBOSE) gprint (GP_ERR, "assuming a value of 1.0\n"); + // gain = 1.0; + // } else { + // gain = atof (string); + // } float *data = (float *) matrix->buffer; Index: trunk/Ohana/src/opihi/cmd.astro/medianmap.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/medianmap.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/medianmap.c (revision 34088) @@ -6,5 +6,5 @@ int i, j, k, I0, I1, J0, J1, I, J, n, N; int nx, ny, Nx, Ny, NX, NY, Ignore; - float Mv, Nv, Mv2, value, min, max, IgnoreValue; + float value, min, max, IgnoreValue; float *In, *Out, *ip; float fx, fy; @@ -71,5 +71,5 @@ ALLOCATE (temp, float, 2*nx*ny); - Nv = Mv = Mv2 = 0.0; + // float Mv = Mv2 = 0.0; for (j = 0; j < Ny; j++) { Index: trunk/Ohana/src/opihi/cmd.astro/objload.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/objload.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/objload.c (revision 34088) @@ -52,5 +52,7 @@ for (i = 0; i < Nline; i++) { /* we are now using all entries on the *.obj line */ - status = sscanf (&buffer[i*CHAR_LINE], "%d %f %f", &type, &overlay[Noverlay].x, &overlay[Noverlay].y); + status = sscanf (&buffer[i*CHAR_LINE], "%d %f %f", &type, &overlay[Noverlay].x, & +overlay[Noverlay].y); + if (status != 3) continue; if (Objtype && (Objtype != type)) continue; overlay[Noverlay].type = KII_OVERLAY_BOX; Index: trunk/Ohana/src/opihi/cmd.astro/outline.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/outline.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/outline.c (revision 34088) @@ -8,5 +8,5 @@ int outline (int argc, char **argv) { - int i, j, k, Npar, BigChange, ABigChange; + int i, j, k, BigChange, ABigChange; float Io, *in, ochisq, dchi, chisq, chisq_p, chisq_m, dp, tmp_par; float curve, frac; @@ -14,5 +14,5 @@ if (argc != 9) { - gprint (GP_ERR, "USAGE: outline x y dx dy dxy Io (buffer) Npar\n"); + gprint (GP_ERR, "USAGE: outline x y dx dy dxy Io (buffer)\n"); return (FALSE); } @@ -26,5 +26,5 @@ par[4] = atof(argv[5]); Io = atof(argv[6]); - Npar = atof (argv[8]); + // int Npar = atof (argv[8]); dpar[0] = 10; Index: trunk/Ohana/src/opihi/cmd.astro/rotcurve.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/rotcurve.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/rotcurve.c (revision 34088) @@ -8,5 +8,5 @@ double L, dL, Lo, V, Vo, dV, Bo, dB, Do, dD; double xo, yo, Xo, Yo; - double sl, cl, wo, Ro, Rs, wr, r, fr, d, min; + double sl, cl, wo, Ro, Rs, wr, r, d, min; double R[100], T[100], W[100]; FILE *f; @@ -99,5 +99,5 @@ } r = (wr - W[n]) * (R[n-1] - R[n]) / (W[n-1] - W[n]) + R[n]; - fr = (Ro/r); + // fr = (Ro/r); if (r < fabs(Rs)) { /* can't be on rotation curve */ continue; Index: trunk/Ohana/src/opihi/cmd.astro/spec.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/spec.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/spec.c (revision 34088) @@ -3,5 +3,5 @@ int spec (int argc, char **argv) { - int i, j, Xo, X1, y1, y2, Nx, Ny; + int i, j, Xo, X1, y1, y2, Nx; int Nlong, Ngap, Nrow, N, Nring; float *buffer, *V; @@ -45,5 +45,5 @@ if ((buf = SelectBuffer (argv[1], OLDBUFFER, TRUE)) == NULL) return (FALSE); Nx = buf[0].matrix.Naxis[0]; - Ny = buf[0].matrix.Naxis[1]; + // int Ny = buf[0].matrix.Naxis[1]; Xo = atof (argv[2]); Index: trunk/Ohana/src/opihi/cmd.astro/star.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/star.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/star.c (revision 34088) @@ -4,5 +4,5 @@ int x, y, N, dx, Nborder; - double Z, max; + double max; Buffer *buf; @@ -36,5 +36,5 @@ } - Z = get_aperture_stats (&buf[0].matrix, x, y, dx, Nborder, max); + get_aperture_stats (&buf[0].matrix, x, y, dx, Nborder, max); return (TRUE); Index: trunk/Ohana/src/opihi/cmd.astro/transform.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/transform.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.astro/transform.c (revision 34088) @@ -5,5 +5,4 @@ int i, j, Nx, Ny; Coords coords_in, coords_out; - double scale_in, scale_out; int X, Y; double x, y, r, d, dx, dy; @@ -30,6 +29,6 @@ } - scale_in = sqrt(fabs(coords_in.cdelt1*coords_in.cdelt2*(coords_in.pc1_1*coords_in.pc2_2 - coords_in.pc1_2*coords_in.pc2_1))); - scale_out = sqrt(fabs(coords_out.cdelt1*coords_out.cdelt2*(coords_out.pc1_1*coords_out.pc2_2 - coords_out.pc1_2*coords_out.pc2_1))); + // double scale_in = sqrt(fabs(coords_in.cdelt1*coords_in.cdelt2*(coords_in.pc1_1*coords_in.pc2_2 - coords_in.pc1_2*coords_in.pc2_1))); + // double scale_out = sqrt(fabs(coords_out.cdelt1*coords_out.cdelt2*(coords_out.pc1_1*coords_out.pc2_2 - coords_out.pc1_2*coords_out.pc2_1))); Vin = (float *) in[0].matrix.buffer; Index: trunk/Ohana/src/opihi/cmd.data/densify.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/densify.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.data/densify.c (revision 34088) @@ -5,5 +5,5 @@ int densify (int argc, char **argv) { - int i, Nx, Ny, Xb, Yb, Normalize, N, Xpix, Ypix, good, UseGraph; + int i, Nx, Ny, Xb, Yb, N, Xpix, Ypix, good, UseGraph; double Xmin, Xmax, dX, Ymin, Ymax, dY; float *val; @@ -12,9 +12,9 @@ opihi_flt *x, *y; - Normalize = TRUE; - if ((N = get_argument (argc, argv, "-raw"))) { - remove_argument (N, &argc, argv); - Normalize = FALSE; - } + // int Normalize = TRUE; + // if ((N = get_argument (argc, argv, "-raw"))) { + // remove_argument (N, &argc, argv); + // Normalize = FALSE; + // } UseGraph = FALSE; Index: trunk/Ohana/src/opihi/cmd.data/gaussdeviate.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/gaussdeviate.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.data/gaussdeviate.c (revision 34088) @@ -34,5 +34,4 @@ int i, Npts; - double mean, sigma; Vector *vec; @@ -42,6 +41,6 @@ Npts = atoi (argv[2]); - mean = atof (argv[3]); - sigma = atof (argv[4]); + // mean = atof (argv[3]); + // sigma = atof (argv[4]); ResetVector (vec, OPIHI_FLT, Npts); Index: trunk/Ohana/src/opihi/cmd.data/list_header.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/list_header.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.data/list_header.c (revision 34088) @@ -41,5 +41,10 @@ strcpy (buf[0].file, "*"); strcat (buf[0].file, filename); + status = gfits_read_header (argv[2], &buf[0].header); + if (!status) { + gprint (GP_ERR, "failed to read header for %s\n", argv[2]); + return FALSE; + } buf[0].header.bitpix = bitpix; buf[0].header.bzero = bzero; Index: trunk/Ohana/src/opihi/cmd.data/load.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/load.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.data/load.c (revision 34088) @@ -3,5 +3,5 @@ int load (int argc, char **argv) { - int i, N, n, ISCEL; + int i, N, ISCEL; int kapa, Noverlay, NOVERLAY; char *c, type[10], string[128], line[1024]; @@ -59,5 +59,5 @@ dx = dy = 0; - for (n = 0; scan_line (f, line) != EOF;) { + while (scan_line (f, line) != EOF) { c = strchr (line, '#'); if (c != (char *) NULL) Index: trunk/Ohana/src/opihi/cmd.data/lookup.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/lookup.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.data/lookup.c (revision 34088) @@ -37,5 +37,5 @@ for (j = 0; (*ip < *xp) && (j < yv[0].Nelements); j++); - *op = j; + *op = *yp; } Index: trunk/Ohana/src/opihi/cmd.data/rotate.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/rotate.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.data/rotate.c (revision 34088) @@ -3,5 +3,5 @@ int rotate (int argc, char **argv) { - int i, j, NX, NY, X, Y, Lx, Ly, N, newCenter; + int i, j, NX, NY, X, Y, Lx, Ly, N; float *in_buff, *out_buff, *c; double angle, CosAngle, SinAngle, Xo, Yo, dX, dY, fx, fy, x, y, X1, Y1; @@ -12,5 +12,4 @@ Yo = 0; if ((N = get_argument (argc, argv, "-center"))) { - newCenter = TRUE; remove_argument (N, &argc, argv); Xo = atof(argv[N]); @@ -19,6 +18,4 @@ remove_argument (N, &argc, argv); } - else - newCenter = FALSE; if (argc != 3) { Index: trunk/Ohana/src/opihi/cmd.data/shift.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/shift.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.data/shift.c (revision 34088) @@ -3,5 +3,5 @@ int shift (int argc, char **argv) { - int i, j, N, ROLL; + int i, j; int nx, ny, dx, dy, DXin, DXot, DYin, DYot; float *Vin, *Vot; @@ -9,9 +9,9 @@ Buffer *in, *out; - ROLL = FALSE; - if ((N = get_argument (argc, argv, "-roll"))) { - remove_argument (N, &argc, argv); - ROLL = TRUE; - } + // int ROLL = FALSE; + // if ((N = get_argument (argc, argv, "-roll"))) { + // remove_argument (N, &argc, argv); + // ROLL = TRUE; + // } if (argc != 5) { Index: trunk/Ohana/src/opihi/cmd.data/spline_apply.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/spline_apply.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.data/spline_apply.c (revision 34088) @@ -5,5 +5,5 @@ int i, j, I, J; - int nx, ny, Nx, Ny, xdir; + int nx, ny, Nx, Ny; float rx, ry, x, y; float *Tx1, *Tx2, *Txc, *Ty1, *Ty2, *Tyc, *V, *V1, *V2; @@ -19,6 +19,6 @@ if ((out = SelectBuffer (argv[3], ANYBUFFER, TRUE)) == NULL) return (FALSE); - xdir = FALSE; - if (!strcmp (argv[4], "x")) xdir = TRUE; + // xdir = FALSE; + // if (!strcmp (argv[4], "x")) xdir = TRUE; nx = atoi (argv[5]); Index: trunk/Ohana/src/opihi/cmd.data/spline_construct.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/spline_construct.c (revision 33963) +++ trunk/Ohana/src/opihi/cmd.data/spline_construct.c (revision 34088) @@ -4,5 +4,5 @@ int spline_construct_cmd (int argc, char **argv) { - int i, j, Nx, Ny, xdir; + int i, j, Nx, Ny; float *Tx, *Ty, *Ty2, *V; Buffer *in, *out; @@ -31,6 +31,6 @@ gfits_create_matrix (&out[0].header, &out[0].matrix); - xdir = FALSE; - if (!strcmp (argv[3], "x")) xdir = TRUE; + // int xdir = FALSE; + // if (!strcmp (argv[3], "x")) xdir = TRUE; /* ideally, the resulting image should carry this info (in header?) */ Index: trunk/Ohana/src/opihi/dvo/avextract.c =================================================================== --- trunk/Ohana/src/opihi/dvo/avextract.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/avextract.c (revision 34088) @@ -5,5 +5,5 @@ off_t i, j, n, m; int N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack; - int Nsecfilt, mode, VERBOSE, needMeasures; + int Nsecfilt, VERBOSE, needMeasures; char **cstack, name[1024]; void *Signal; @@ -25,6 +25,4 @@ skylist = NULL; selection = NULL; - - mode = MAG_AVE; if ((N = get_argument (argc, argv, "-h"))) goto help; Index: trunk/Ohana/src/opihi/dvo/calextract.c =================================================================== --- trunk/Ohana/src/opihi/dvo/calextract.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/calextract.c (revision 34088) @@ -6,5 +6,5 @@ off_t i, Nr; - int Nsecfilt, NSTAR, N, mode[2]; + int N, mode[2]; PhotCode *code[2]; @@ -24,5 +24,4 @@ /* load photcode information */ if (!InitPhotcodes ()) return (FALSE); - Nsecfilt = GetPhotcodeNsecfilt (); /* command line arguments */ @@ -41,5 +40,4 @@ /* one unique value per star */ N = 0; - NSTAR = 1; ALLOCATE (vec, Vector *, NVEC); if ((vec[Nd] = SelectVector ("cal:dmag", ANYVECTOR, TRUE)) == NULL) goto escape; @@ -74,4 +72,6 @@ # if (0) + int NSTAR = 1; + int Nsecfilt = GetPhotcodeNsecfilt (); /* extract values, assign to vectors */ for (i = 0; i < catalog.Naverage; i++) { Index: trunk/Ohana/src/opihi/dvo/calmextract.c =================================================================== --- trunk/Ohana/src/opihi/dvo/calmextract.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/calmextract.c (revision 34088) @@ -7,5 +7,5 @@ off_t i, k, Nr; - int NSTAR, Nstar, Nsecfilt, N, mode[2]; + int NSTAR, N, mode[2]; Catalog catalog; @@ -25,5 +25,4 @@ /* load photcode information */ if (!InitPhotcodes ()) goto escape; - Nsecfilt = GetPhotcodeNsecfilt (); /* command line arguments */ @@ -61,5 +60,4 @@ N = 0; - Nstar = 0; NSTAR = 100; for (k = 0; k < NVEC; k++) { @@ -87,4 +85,7 @@ # if (0) + int Nstar = 0; + int Nsecfilt = GetPhotcodeNsecfilt (); + /* extract values, assign to vectors */ for (i = 0; i < catalog.Naverage; i++) { Index: trunk/Ohana/src/opihi/dvo/ccd.c =================================================================== --- trunk/Ohana/src/opihi/dvo/ccd.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/ccd.c (revision 34088) @@ -8,5 +8,4 @@ int mode[4]; int Nsecfilt, KeepNulls; - void *Signal; Catalog catalog; @@ -63,5 +62,5 @@ // grab data from all selected sky regions - Signal = signal (SIGINT, handle_interrupt); + signal (SIGINT, handle_interrupt); interrupt = FALSE; Index: trunk/Ohana/src/opihi/dvo/cmd.c =================================================================== --- trunk/Ohana/src/opihi/dvo/cmd.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/cmd.c (revision 34088) @@ -8,5 +8,4 @@ int Npts, NPTS, mode[3]; int Nsecfilt, KeepNulls; - void *Signal; PhotCode *code[3]; @@ -61,5 +60,6 @@ // grab data from all selected sky regions - Signal = signal (SIGINT, handle_interrupt); + // void *Signal = signal (SIGINT, handle_interrupt); + signal (SIGINT, handle_interrupt); interrupt = FALSE; Index: trunk/Ohana/src/opihi/dvo/cmpload.c =================================================================== --- trunk/Ohana/src/opihi/dvo/cmpload.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/cmpload.c (revision 34088) @@ -6,5 +6,5 @@ int cmpload (int argc, char **argv) { - int i, Noverlay, NOVERLAY, Nstar, N, Nin, Nextra, Objtype, type; + int i, Noverlay, NOVERLAY, Nstar, N, Nextra, Objtype, type; int doneread, done, Nskip, Nbytes, nbytes, Ninstar; char *c, *c2, *name; @@ -63,5 +63,4 @@ /* load in stars by blocks of 1000 */ - Nin = 0; ALLOCATE (buffer, char, (BLOCK*BYTES_STAR) + 1); buffer[BLOCK*BYTES_STAR] = 0; Index: trunk/Ohana/src/opihi/dvo/fitsed.c =================================================================== --- trunk/Ohana/src/opihi/dvo/fitsed.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/fitsed.c (revision 34088) @@ -26,5 +26,5 @@ off_t i, j, k, m; int N, done, Nfit; - int Nsecfilt, status; + int status; void *oldsignal; char name[64], line[1024], key[20]; @@ -41,5 +41,5 @@ KapaSection magSection, resSection; - Catalog catalog, outcat; + Catalog catalog; SkyList *skylist; SkyRegionSelection *selection; @@ -57,7 +57,7 @@ catalog.secfilt = NULL; - outcat.average = NULL; - outcat.measure = NULL; - outcat.secfilt = NULL; + // outcat.average = NULL; + // outcat.measure = NULL; + // outcat.secfilt = NULL; SEDtable = NULL; @@ -80,5 +80,4 @@ /* load photcode information */ if (!InitPhotcodes ()) goto escape; - Nsecfilt = GetPhotcodeNsecfilt (); /* interpret command-line options */ Index: trunk/Ohana/src/opihi/dvo/gcat.c =================================================================== --- trunk/Ohana/src/opihi/dvo/gcat.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/gcat.c (revision 34088) @@ -8,5 +8,4 @@ SkyTable *sky; SkyList *skylist; - void *Signal; int ShowHost = FALSE; @@ -43,5 +42,5 @@ // prepare to handle interrupt signals - Signal = signal (SIGINT, handle_interrupt); + signal (SIGINT, handle_interrupt); interrupt = FALSE; Index: trunk/Ohana/src/opihi/dvo/hosts.c =================================================================== --- trunk/Ohana/src/opihi/dvo/hosts.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/hosts.c (revision 34088) @@ -15,4 +15,5 @@ if (!strncmp(argv[1], "purge-temp", MAX(strlen(argv[1]), 3))) { glob_t pglob; + int ALL_PID = FALSE; int PID = getpid(); int N; @@ -20,4 +21,10 @@ remove_argument (N, &argc, argv); PID = atoi(argv[N]); + remove_argument (N, &argc, argv); + } + + if ((N = get_argument (argc, argv, "-all-pid"))) { + remove_argument (N, &argc, argv); + ALL_PID = TRUE; remove_argument (N, &argc, argv); } @@ -60,5 +67,9 @@ pglob.gl_offs = 0; char name[DVO_MAX_PATH]; - snprintf (name, DVO_MAX_PATH, "%s/dvo.results.%05d.*.fits", table->hosts[i].pathname, PID); + if (ALL_PID) { + snprintf (name, DVO_MAX_PATH, "%s/dvo.results.*.*.fits", table->hosts[i].pathname); + } else { + snprintf (name, DVO_MAX_PATH, "%s/dvo.results.%05d.*.fits", table->hosts[i].pathname, PID); + } if (VERBOSE) gprint (GP_ERR, "checking %s\n", name); glob (name, 0, NULL, &pglob); Index: trunk/Ohana/src/opihi/dvo/images.c =================================================================== --- trunk/Ohana/src/opihi/dvo/images.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/images.c (revision 34088) @@ -13,5 +13,5 @@ off_t i, Nimage, Nmosaic; int j, status, InPic, leftside, *plist, TimeSelect, ByName; - int WITH_MOSAIC, SOLO_MOSAIC, HIDDEN; + int WITH_MOSAIC, SOLO_MOSAIC; time_t tzero, tend; int N, NPTS, n, npts, Npts, kapa, *foundMosaic; @@ -42,9 +42,9 @@ } - HIDDEN = FALSE; - if ((N = get_argument (argc, argv, "-hidden"))) { - remove_argument (N, &argc, argv); - HIDDEN = TRUE; - } + // int HIDDEN = FALSE; + // if ((N = get_argument (argc, argv, "-hidden"))) { + // remove_argument (N, &argc, argv); + // HIDDEN = TRUE; + // } photcode = NULL; Index: trunk/Ohana/src/opihi/dvo/imdata.c =================================================================== --- trunk/Ohana/src/opihi/dvo/imdata.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/imdata.c (revision 34088) @@ -15,5 +15,4 @@ Vector *vec; SkyRegionSelection *selection; - void *Signal; // parse skyregion options @@ -130,5 +129,5 @@ // prepare to handle interrupt signals - Signal = signal (SIGINT, handle_interrupt); + signal (SIGINT, handle_interrupt); interrupt = FALSE; Index: trunk/Ohana/src/opihi/dvo/imextract.c =================================================================== --- trunk/Ohana/src/opihi/dvo/imextract.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/imextract.c (revision 34088) @@ -5,5 +5,4 @@ off_t i, j, Nimage; int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack; - int VERBOSE; char **cstack, name[1024]; void *Signal; @@ -27,9 +26,9 @@ if ((N = get_argument (argc, argv, "--help"))) goto help; - VERBOSE = FALSE; - if ((N = get_argument (argc, argv, "-v"))) { - remove_argument (N, &argc, argv); - VERBOSE = TRUE; - } + // int VERBOSE = FALSE; + // if ((N = get_argument (argc, argv, "-v"))) { + // remove_argument (N, &argc, argv); + // VERBOSE = TRUE; + // } if (!InitPhotcodes ()) goto escape; Index: trunk/Ohana/src/opihi/dvo/imlist.c =================================================================== --- trunk/Ohana/src/opihi/dvo/imlist.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/imlist.c (revision 34088) @@ -4,5 +4,5 @@ off_t i, j, Nimage, *subset, Nsubset; - int N, TimeSelect, RegionSelect, TimeFormat, NameSelect; + int N, TimeSelect, TimeFormat, NameSelect; int PhotcodeSelect; time_t tzero, TimeReference; @@ -38,9 +38,9 @@ } - RegionSelect = FALSE; - if ((N = get_argument (argc, argv, "-region"))) { - remove_argument (N, &argc, argv); - RegionSelect = TRUE; - } + // int RegionSelect = FALSE; + // if ((N = get_argument (argc, argv, "-region"))) { + // remove_argument (N, &argc, argv); + // RegionSelect = TRUE; + // } PhotcodeValue = NULL; Index: trunk/Ohana/src/opihi/dvo/imphot.c =================================================================== --- trunk/Ohana/src/opihi/dvo/imphot.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/imphot.c (revision 34088) @@ -9,5 +9,5 @@ char bufname[64]; float *p; - double fx, fy, x, y; + double x, y; Image *image; Buffer *buf; @@ -58,6 +58,6 @@ if (GreyScale && Nsubset) { - fx = image[subset[0]].NX / 100; - fy = image[subset[0]].NY / 200; + // double fx = image[subset[0]].NX / 100; + // double fy = image[subset[0]].NY / 200; p = (float *) buf[0].matrix.buffer; for (y = 0; y < 200; y+=1.0) { Index: trunk/Ohana/src/opihi/dvo/lcurve.c =================================================================== --- trunk/Ohana/src/opihi/dvo/lcurve.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/lcurve.c (revision 34088) @@ -7,5 +7,5 @@ double *RA, *DEC; int kapa, TimeFormat; - int found, AutoLimits, ErrorBars, GalMag, AbsPhot, SaveVectors; + int found, AutoLimits, ErrorBars, SaveVectors; off_t i, j, m, Nstars, *N1; int N, NPTS; @@ -39,15 +39,15 @@ } - AbsPhot = FALSE; - if ((N = get_argument (argc, argv, "-abs"))) { - remove_argument (N, &argc, argv); - AbsPhot = TRUE; - } + // int AbsPhot = FALSE; + // if ((N = get_argument (argc, argv, "-abs"))) { + // remove_argument (N, &argc, argv); + // AbsPhot = TRUE; + // } - GalMag = FALSE; - if ((N = get_argument (argc, argv, "-gal"))) { - gprint (GP_ERR, "galaxy magnitudes currently disabled\n"); - return (FALSE); - } + // int GalMag = FALSE; + // if ((N = get_argument (argc, argv, "-gal"))) { + // gprint (GP_ERR, "galaxy magnitudes currently disabled\n"); + // return (FALSE); + // } ErrorBars = FALSE; Index: trunk/Ohana/src/opihi/dvo/objectcoverage.c =================================================================== --- trunk/Ohana/src/opihi/dvo/objectcoverage.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/objectcoverage.c (revision 34088) @@ -5,9 +5,7 @@ int objectcoverage (int argc, char **argv) { - void *Signal; int ShowDensity; - int N, status, TimeSelect, xs, ys; - time_t tzero, tend; - double pixscale, r, d, Xs, Ys, trange, RaCenter, DecCenter; + int N, status, xs, ys; + double pixscale, r, d, Xs, Ys, RaCenter, DecCenter; char projection[16]; float *V; @@ -77,42 +75,44 @@ } - TimeSelect = FALSE; - if ((N = get_argument (argc, argv, "-time"))) { - remove_argument (N, &argc, argv); - if (!ohana_str_to_time (argv[N], &tzero)) { - gprint (GP_ERR, "syntax error\n"); - return (FALSE); - } - remove_argument (N, &argc, argv); - if (!ohana_str_to_dtime (argv[N], &trange)) { - gprint (GP_ERR, "syntax error\n"); - return (FALSE); - } - remove_argument (N, &argc, argv); - if (trange < 0) { - trange = fabs (trange); - tzero -= trange; - } - TimeSelect = TRUE; - } - if ((N = get_argument (argc, argv, "-trange"))) { - remove_argument (N, &argc, argv); - if (!ohana_str_to_time (argv[N], &tzero)) { - gprint (GP_ERR, "syntax error\n"); - return (FALSE); - } - remove_argument (N, &argc, argv); - if (!ohana_str_to_time (argv[N], &tend)) { - gprint (GP_ERR, "syntax error\n"); - return (FALSE); - } - remove_argument (N, &argc, argv); - trange = tend - tzero; - if (trange < 0) { - trange = fabs (trange); - tzero -= trange; - } - TimeSelect = TRUE; - } + // double trange; + // time_t tzero, tend; + // int TimeSelect = FALSE; + // if ((N = get_argument (argc, argv, "-time"))) { + // remove_argument (N, &argc, argv); + // if (!ohana_str_to_time (argv[N], &tzero)) { + // gprint (GP_ERR, "syntax error\n"); + // return (FALSE); + // } + // remove_argument (N, &argc, argv); + // if (!ohana_str_to_dtime (argv[N], &trange)) { + // gprint (GP_ERR, "syntax error\n"); + // return (FALSE); + // } + // remove_argument (N, &argc, argv); + // if (trange < 0) { + // trange = fabs (trange); + // tzero -= trange; + // } + // TimeSelect = TRUE; + // } + // if ((N = get_argument (argc, argv, "-trange"))) { + // remove_argument (N, &argc, argv); + // if (!ohana_str_to_time (argv[N], &tzero)) { + // gprint (GP_ERR, "syntax error\n"); + // return (FALSE); + // } + // remove_argument (N, &argc, argv); + // if (!ohana_str_to_time (argv[N], &tend)) { + // gprint (GP_ERR, "syntax error\n"); + // return (FALSE); + // } + // remove_argument (N, &argc, argv); + // trange = tend - tzero; + // if (trange < 0) { + // trange = fabs (trange); + // tzero -= trange; + // } + // TimeSelect = TRUE; + // } if (argc != 3) { @@ -178,5 +178,5 @@ Nsecfilt = GetPhotcodeNsecfilt(); // grab data from all selected sky regions - Signal = signal (SIGINT, handle_interrupt); + signal (SIGINT, handle_interrupt); interrupt = FALSE; Index: trunk/Ohana/src/opihi/dvo/paverage.c =================================================================== --- trunk/Ohana/src/opihi/dvo/paverage.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/paverage.c (revision 34088) @@ -4,5 +4,4 @@ int paverage (int argc, char **argv) { - FILE *f; off_t i, j; int kapa, Narg, Npts, NPTS, status, VERBOSE; @@ -12,5 +11,4 @@ unsigned IDclip, IDchoice, LimExclude; float *Xvec, *Yvec, *Zvec; - void *Signal; PhotCode *photcode; @@ -27,5 +25,4 @@ if (!style_args (&graphmode, &argc, argv, &kapa)) return FALSE; - f = (FILE *) NULL; Mz = 17.0; Mr = -5.0; @@ -102,5 +99,5 @@ // prepare to handle interrupt signals - Signal = signal (SIGINT, handle_interrupt); + signal (SIGINT, handle_interrupt); interrupt = FALSE; Index: trunk/Ohana/src/opihi/dvo/pmeasure.c =================================================================== --- trunk/Ohana/src/opihi/dvo/pmeasure.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/pmeasure.c (revision 34088) @@ -6,5 +6,4 @@ int pmeasure (int argc, char **argv) { - FILE *f; off_t i, j, k, m; int kapa, Narg, Npts, NPTS, status, VERBOSE, TimeSelect, Nloaded; @@ -17,5 +16,4 @@ float *Xvec, *Yvec, *Zvec; time_t tzero, tend; - void *Signal; SkyTable *sky; @@ -27,5 +25,4 @@ if (!style_args (&graphmode, &argc, argv, &kapa)) return FALSE; - f = (FILE *) NULL; Mz = 17.0; Mr = -5.0; @@ -175,5 +172,5 @@ // prepare to handle interrupt signals - Signal = signal (SIGINT, handle_interrupt); + signal (SIGINT, handle_interrupt); interrupt = FALSE; Index: trunk/Ohana/src/opihi/dvo/simage.c =================================================================== --- trunk/Ohana/src/opihi/dvo/simage.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/simage.c (revision 34088) @@ -12,5 +12,5 @@ Header header; Coords coords; - int i, j, kapa, Nstars, nstars, Nbytes, nbytes, Npts, N; + int i, j, kapa, Nstars, nstars, Nbytes, nbytes, N; Graphdata graphmode; @@ -150,5 +150,4 @@ graphmode.size = -1; graphmode.etype = 0; - Npts = Xvec.Nelements; PlotVectorTriplet (kapa, &Xvec, &Yvec, &Zvec, &graphmode); Index: trunk/Ohana/src/opihi/dvo/skycat.c =================================================================== --- trunk/Ohana/src/opihi/dvo/skycat.c (revision 33963) +++ trunk/Ohana/src/opihi/dvo/skycat.c (revision 34088) @@ -14,5 +14,4 @@ SkyList *skylist; SkyRegion **regions; - void *Signal; VERBOSE = FALSE; @@ -62,5 +61,5 @@ // prepare to handle interrupt signals - Signal = signal (SIGINT, handle_interrupt); + signal (SIGINT, handle_interrupt); interrupt = FALSE; Index: trunk/Ohana/src/opihi/lib.data/starfuncs.c =================================================================== --- trunk/Ohana/src/opihi/lib.data/starfuncs.c (revision 33963) +++ trunk/Ohana/src/opihi/lib.data/starfuncs.c (revision 34088) @@ -125,5 +125,5 @@ opihi_flt *zs, opihi_flt *zp, opihi_flt *sk) { - double Ra2, Ri2, Ro2, rad2; + double Ro2, rad2; int i, j, Npts, Nsky; int Xs, Xe, Ys, Ye, off, Xc, Yc; @@ -132,6 +132,4 @@ /* define circular boundaries */ - Ra2 = SQ(Raper); - Ri2 = SQ(Rinner); Ro2 = SQ(Router); @@ -145,4 +143,5 @@ /* this sample uses a circular aperture */ # if (0) + double Ri2 = SQ(Rinner); Nsky = 0; for (j = Ys; j < Ye; j++) { Index: trunk/Ohana/src/opihi/lib.data/svdcmp.c =================================================================== --- trunk/Ohana/src/opihi/lib.data/svdcmp.c (revision 33963) +++ trunk/Ohana/src/opihi/lib.data/svdcmp.c (revision 34088) @@ -14,5 +14,5 @@ int svdcmp (float *a, opihi_flt *w, float *v, int Nx, int Ny) { - int flag, i, its, j, jj, k, l, nm, status; + int flag, i, its, j, jj, k, l, nm; float c, f, h, s, x, y, z; float anorm=0.0, g = 0.0, scale = 0.0; @@ -111,5 +111,5 @@ } - status = 1; + // int status = 1; for (k = Nx - 1; k >= 0; k--) { for (its = 0; its < 30; its++) { @@ -152,5 +152,5 @@ break; } - if (its == 29) status = 0; + // if (its == 29) status = 0; x = w[l]; nm = k-1; Index: trunk/Ohana/src/opihi/lib.shell/convert_to_RPN.c =================================================================== --- trunk/Ohana/src/opihi/lib.shell/convert_to_RPN.c (revision 33963) +++ trunk/Ohana/src/opihi/lib.shell/convert_to_RPN.c (revision 34088) @@ -4,5 +4,5 @@ StackVar *convert_to_RPN (int argc, char **argv, int *nstack) { - int type, Nx, Ny; + int type; int i, j, Nstack, Nop_stack, NSTACK; StackVar *stack, *op_stack; @@ -17,5 +17,5 @@ } - Nx = Ny = Nstack = Nop_stack = 0; + Nstack = Nop_stack = 0; for (i = 0; i < argc; i++) { Index: trunk/Ohana/src/opihi/lib.shell/evaluate_stack.c =================================================================== --- trunk/Ohana/src/opihi/lib.shell/evaluate_stack.c (revision 33963) +++ trunk/Ohana/src/opihi/lib.shell/evaluate_stack.c (revision 34088) @@ -12,8 +12,7 @@ int evaluate_stack (StackVar *stack, int *Nstack) { - int i, j, Nvar, Nout, status; + int i, j, status; char line[512]; // this is only used to report an error StackVar tmp_stack; - Nout = Nvar = 0; status = TRUE; Index: trunk/Ohana/src/opihi/lib.shell/opihi.c =================================================================== --- trunk/Ohana/src/opihi/lib.shell/opihi.c (revision 33963) +++ trunk/Ohana/src/opihi/lib.shell/opihi.c (revision 34088) @@ -4,5 +4,5 @@ int opihi (int argc, char **argv) { - int Nbad, status; + int Nbad; char *line, *prompt, *history; pid_t ppid; @@ -39,5 +39,5 @@ stripwhite (line); if (*line) { - status = multicommand (line); + multicommand (line); add_history (line); Index: trunk/Ohana/src/opihi/pantasks/ControllerOps.c =================================================================== --- trunk/Ohana/src/opihi/pantasks/ControllerOps.c (revision 33963) +++ trunk/Ohana/src/opihi/pantasks/ControllerOps.c (revision 34088) @@ -63,11 +63,10 @@ int CheckControllerJob (Job *job) { struct timeval start, stop; - float dtime; gettimeofday (&start, (void *) NULL); CheckControllerJobStatus (job); gettimeofday (&stop, (void *) NULL); - dtime = DTIME (stop, start); - /* if (VerboseMode()) gprint (GP_ERR, "check job status %f\n", dtime); */ + // float dtime = DTIME (stop, start); + // if (VerboseMode()) gprint (GP_ERR, "check job status %f\n", dtime); if ((job[0].state == JOB_EXIT) || (job[0].state == JOB_CRASH)) { @@ -75,5 +74,5 @@ GetJobOutput ("stdout", job[0].pid, &job[0].stdout_buff, job[0].stdout_size); gettimeofday (&stop, (void *) NULL); - dtime = DTIME (stop, start); + // float dtime = DTIME (stop, start); /* if (VerboseMode()) gprint (GP_ERR, "get stdout %f\n", dtime); */ @@ -81,5 +80,5 @@ GetJobOutput ("stderr", job[0].pid, &job[0].stderr_buff, job[0].stderr_size); gettimeofday (&stop, (void *) NULL); - dtime = DTIME (stop, start); + // float dtime = DTIME (stop, start); /* if (VerboseMode()) gprint (GP_ERR, "get stderr %f\n", dtime); */ @@ -87,5 +86,5 @@ DeleteControllerJob (job); gettimeofday (&stop, (void *) NULL); - dtime = DTIME (stop, start); + // float dtime = DTIME (stop, start); /* if (VerboseMode()) gprint (GP_ERR, "delete job %f\n", dtime); */ } @@ -578,5 +577,4 @@ int QuitController () { - int status; char cmd[128]; IOBuffer buffer; @@ -586,5 +584,5 @@ sprintf (cmd, "quit"); InitIOBuffer (&buffer, 0x100); - status = ControllerCommand (cmd, NULL, &buffer); + ControllerCommand (cmd, NULL, &buffer); FreeIOBuffer (&buffer); Index: trunk/Ohana/src/opihi/pantasks/client_shell.c =================================================================== --- trunk/Ohana/src/opihi/pantasks/client_shell.c (revision 33963) +++ trunk/Ohana/src/opihi/pantasks/client_shell.c (revision 34088) @@ -4,5 +4,5 @@ int client_shell (int argc, char **argv) { - int Nbad, status; + int Nbad; char *line, *prompt, *history; pid_t ppid; @@ -41,5 +41,6 @@ if (*line) { - status = multicommand (line); + // status = multicommand (line); do something different if false? + multicommand (line); add_history (line); append_history (1, history); Index: trunk/Ohana/src/opihi/pantasks/task.c =================================================================== --- trunk/Ohana/src/opihi/pantasks/task.c (revision 33963) +++ trunk/Ohana/src/opihi/pantasks/task.c (revision 34088) @@ -5,5 +5,5 @@ int hash; - int ThisList, status; + int ThisList; char *input, *outline; Task *task; @@ -82,8 +82,7 @@ case TASK_NPENDING: case TASK_ACTIVE: - status = command (input, &outline, TRUE); + // status = command(); do something with this info? + command (input, &outline, TRUE); if (outline != NULL) free (outline); - /* what to do if command is invalid? - if (!status) return (FALSE); */ break; Index: trunk/Ohana/src/opihi/pcontrol/CheckHost.c =================================================================== --- trunk/Ohana/src/opihi/pcontrol/CheckHost.c (revision 33963) +++ trunk/Ohana/src/opihi/pcontrol/CheckHost.c (revision 34088) @@ -40,9 +40,6 @@ int CheckHostResponse (Host *host) { - IOBuffer *buffer; - /* we only check IDLE hosts without jobs */ ASSERT (host, "missing host"); - buffer = &host[0].comms_buffer; // XXX check on the value of the response? (OK) Index: trunk/Ohana/src/opihi/pcontrol/CheckSystem.c =================================================================== --- trunk/Ohana/src/opihi/pcontrol/CheckSystem.c (revision 33963) +++ trunk/Ohana/src/opihi/pcontrol/CheckSystem.c (revision 34088) @@ -62,7 +62,5 @@ void *CheckSystem_Threaded (void *data) { - int Njobchecks, Nhostchecks, Nlivechecks, Ndonejobs; - - Nlivechecks = 0; + int Njobchecks, Nhostchecks, Ndonejobs; gprintInit (); Index: trunk/Ohana/src/opihi/pcontrol/Makefile =================================================================== --- trunk/Ohana/src/opihi/pcontrol/Makefile (revision 33963) +++ trunk/Ohana/src/opihi/pcontrol/Makefile (revision 34088) @@ -13,5 +13,5 @@ LIBS1 = -lkapa -lFITS -lohana LIBS2 = -lbasiccmd -lshell -ldata -FULL_CFLAGS = $(BASE_CFLAGS) -Wall -Werror +FULL_CFLAGS = $(BASE_CFLAGS) FULL_CPPFLAGS = $(BASE_CPPFLAGS) FULL_LDFLAGS = $(LIBS1) $(LIBS2) $(BASE_LDFLAGS)