SMA miriad merge diff

gistfile1.diff

commit e07320d824afcdc19d85104259659b55221b1858
Author: Peter Williams <peter@newton.cx>
Date:   Mon Oct 18 17:21:07 2010 -0700

    Incorporate new SMA files into autotools build.

diff --git a/src/prog/sma/Makefile.am b/src/prog/sma/Makefile.am
index 916739a..72e906a 100644
--- a/src/prog/sma/Makefile.am
+++ b/src/prog/sma/Makefile.am
@@ -9,7 +9,7 @@ LDADD = $(prog_libs)
 
 ftasks = \
   gildas phatrans schedobs smablflag smablsrc smacheck \
-  smachunkglue smafix smaflux smagpplt smalod smamfcal smarewt \
+  smachunkglue smafix smaflux smagpplt smalod smamfcal smarewt smasplt \
   smatbpass smauvamp smauvplt smauvspec smavarfit smavarplt uvsort \
   vel2fel
 bin_PROGRAMS = $(ftasks)
@@ -17,7 +17,7 @@ CLEANFILES = $(ftasks:=.f)
 EXTRA_DIST = $(ftasks:=.for)
 
 noinst_HEADERS = \
-  gildas.h smablflag.h smablsrc.h smagpplt.h smatbpass.h \
+  gildas.h smablflag.h smablsrc.h smafix.h smagpplt.h smasplt.h smatbpass.h \
   smauvspec.h uvsort.h
 
 dist-hook:
diff --git a/src/prog/vis/Makefile.am b/src/prog/vis/Makefile.am
index fd10796..94b1bdb 100644
--- a/src/prog/vis/Makefile.am
+++ b/src/prog/vis/Makefile.am
@@ -27,7 +27,7 @@ EXTRA_DIST = $(ftasks:=.for)
 noinst_HEADERS = \
   atxy.h sinpoly.h uvaver.h uvdiff.h uvfit.h uvgains.h uvgen.h \
   uvgenmodel.h uvlist.h uvplot.h uvpnt.h uvputhd.h uvspec.h uvsplit.h \
-  uvtrack.h varplot.h
+  uvtrack.h varplot.h maxdimSma.h
 
 dist-hook:
 	-rm -f $(distdir)/*.f
diff --git a/src/subs/Makefile.am b/src/subs/Makefile.am
index 7d6ad9f..86a0497 100644
--- a/src/subs/Makefile.am
+++ b/src/subs/Makefile.am
@@ -45,10 +45,10 @@ nodist_libmir_la_SOURCES = \
 libmir_doc_sources = \
   bug.c dio.c headio.c hio.c \
   interface.c jplread.c key.c maskio.c mir_io.c pack.c \
-  scrio.c sma_csub.c sma_mirRead.c tabio.c uvio.c xyio.c \
+  scrio.c sma_csub.c sma_drxPatch.c sma_mirRead.c tabio.c uvio.c xyio.c \
   xyzio.c
 
-finclude_HEADERS = model.h
+finclude_HEADERS = model.h maxdimSma.h
 cinclude_HEADERS = hio.h io.h miriad.h sma_data.h sysdep.h
 
 dist_libmir_la_SOURCES = \

commit 7dadbacf85f7ee7ddc98e22f598c039636e6d4f7
Author: Peter Williams <peter@newton.cx>
Date:   Mon Oct 18 17:38:11 2010 -0700

    Mac build fixes: duplicated symbols

diff --git a/src/subs/sma_csub.c b/src/subs/sma_csub.c
index b5b56c1..12cf7fd 100644
--- a/src/subs/sma_csub.c
+++ b/src/subs/sma_csub.c
@@ -36,6 +36,8 @@ int check_s2 = sizeof(short);
 int check_s4 = sizeof(int);
 int check_s8 = sizeof(long);
 
+int testlev;
+
 void
 reverse4(char *bytes)
 {
diff --git a/src/subs/sma_data.h b/src/subs/sma_data.h
index 365343a..21bdd6d 100644
--- a/src/subs/sma_data.h
+++ b/src/subs/sma_data.h
@@ -1019,7 +1019,7 @@ struct dbsmlodd {
                  };
 typedef struct dbsmlodd dbsmlodd;
 
-int testlev;
+extern int testlev;
 
 //
 // from drx data+buffer.h
diff --git a/src/subs/sma_drxPatch.c b/src/subs/sma_drxPatch.c
index 11ed94b..7c68d74 100755
--- a/src/subs/sma_drxPatch.c
+++ b/src/subs/sma_drxPatch.c
@@ -75,7 +75,7 @@
 //void hiswrite_c (int tno, Const char *text);
 void hisinput_c (int tno, char *name);
 //void hisclose_c (int tno);
-double jday;
+extern double jday;
 //int input_isb=0;    // default is 0 for lsb; or 1 for usb.
 //int input_rxif=-1;  // default is any rx in the case of single rx;
                     // for daul rx case, user must pick one of the following id
@@ -92,7 +92,7 @@ char *rar2cdrx(double ra);
 char *decr2cdrx(double dec);
 void tsysStoredrx(int tno, int nants, int set);
 void fixed_c(int tno, short dobary);
-struct drxanttsys  **atsys;
+extern struct drxanttsys  **atsys;
 void sfcorr(double sfoff[MAXCHUNK+1], double fres[MAXCHUNK+1]);
 void antTsysDrx(int isb, int irx, int nspect, char tsysfile[81]);
 void drxpatch_c(char pathname[64], char outf[64], int input_isb,
diff --git a/src/subs/sma_mirRead.c b/src/subs/sma_mirRead.c
index 32da13f..a68985e 100644
--- a/src/subs/sma_mirRead.c
+++ b/src/subs/sma_mirRead.c
@@ -4444,7 +4444,6 @@ if(smabuffer.linear==1)
 //void hiswrite_c (int tno, Const char *text);
 void hisinput_c (int tno, char *name);
 //void hisclose_c (int tno);
-double jday;
 // int input_isb=0;    // default is 0 for lsb; or 1 for usb.
 int input_rxif=-1;  // default is any rx in the case of single rx;
                     // for daul rx case, user must pick one of the following id