IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4833


Ignore:
Timestamp:
Aug 19, 2005, 5:14:08 PM (21 years ago)
Author:
eugene
Message:

re-ordered -lFITS and -lohana to support fits_db calls

Location:
trunk/Ohana/src/opihi
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/opihi/cmd.astro/Makefile

    r4747 r4833  
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1616LFLAGS  =       -L$(LLIB) -L$(LIB)
    17 LIBS    =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
     17LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
    1818CFLAGS  =       $(INCS)
    1919CCFLAGS =       $(LIBS)

  • trunk/Ohana/src/opihi/cmd.basic/Makefile

    r4748 r4833  
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1616LFLAGS  =       -L$(LLIB) -L$(LIB)
    17 LIBS    =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
     17LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
    1818CFLAGS  =       $(INCS)
    1919CCFLAGS =       $(LIBS)

  • trunk/Ohana/src/opihi/cmd.data/Makefile

    r4747 r4833  
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1616LFLAGS  =       -L$(LLIB) -L$(LIB)
    17 LIBS    =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
     17LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
    1818CFLAGS  =       $(INCS)
    1919CCFLAGS =       $(LIBS)

  • trunk/Ohana/src/opihi/dimm/Makefile

    r4748 r4833  
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1616LFLAGS  =       -L$(LLIB) -L$(LIB)
    17 LIBS1   =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
     17LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
    1818LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata -lsbig
    1919LIBS    =       $(LIBS2) $(LIBS1)

  • trunk/Ohana/src/opihi/dvo/Makefile

    r4748 r4833  
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1616LFLAGS  =       -L$(LLIB) -L$(LIB)
    17 LIBS1   =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
     17LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
    1818LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata
    1919LIBS    =       $(LIBS2) $(LIBS1)

  • trunk/Ohana/src/opihi/dvo/gstar.c

    r4800 r4833  
    1717  PhotCode *code;
    1818
    19   VarConfig ("CATDIR", "%s", catdir);
     19  if (VarConfig ("CATDIR", "%s", catdir) == NULL) return (FALSE);
     20  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     21    strcpy (catalog.catmode, "RAW");
     22
    2023  if (!InitPhotcodes ()) return (FALSE);
    2124  Nsec = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/opihi/dvo/mextract.c

    r4689 r4833  
    2929  /* find CATDIR in config system */
    3030  if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
     31  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     32    strcpy (catalog.catmode, "RAW");
    3133
    3234  /* interpret command-line options */

  • trunk/Ohana/src/opihi/dvo/pmeasure.c

    r4800 r4833  
    1919
    2020  Ngraph = -1;
     21  if (!InitPhotcodes ()) return (FALSE);
    2122  if (!GetGraph (&graphmode, NULL, &Ngraph)) return (FALSE);
    2223  if (VarConfig ("CATDIR", "%s", catdir) == NULL) return (FALSE);
    23   if (!InitPhotcodes ()) return (FALSE);
     24  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     25    strcpy (catalog.catmode, "RAW");
    2426
    2527  regions = (RegionFile *) NULL;

  • trunk/Ohana/src/opihi/dvo2/Makefile

    r3525 r4833  
    1717INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1818LFLAGS  =       -L$(LLIB) -L$(LIB)
    19 LIBS1   =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
     19LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
    2020LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata
    2121LIBS    =       $(LIBS2) $(LIBS1)

  • trunk/Ohana/src/opihi/lib.data/Makefile

    r4806 r4833  
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1616LFLAGS  =       -L$(LLIB) -L$(LIB)
    17 LIBS    =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
     17LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
    1818CFLAGS  =       $(INCS)
    1919CCFLAGS =       $(LIBS)

  • trunk/Ohana/src/opihi/lib.shell/ConfigInit.c

    r2598 r4833  
    2626
    2727  answer = get_variable (keyword);
    28   if (answer != (char *) NULL) {
    29 
    30     if (!strcmp (mode, "%s")) {
    31       strcpy ((char *) ptr, answer);
    32     } else {
    33       if (!strcmp (mode, "%d"))  *(int *) ptr       = atoi (answer);
    34       if (!strcmp (mode, "%u"))  *(unsigned *) ptr  = atoi (answer);
    35       if (!strcmp (mode, "%ld")) *(long *) ptr      = atoi (answer);
    36       if (!strcmp (mode, "%hd")) *(short *) ptr     = atoi (answer);
    37       if (!strcmp (mode, "%f"))  *(float *) ptr     = atof (answer);
    38       if (!strcmp (mode, "%lf")) *(double *) ptr    = atof (answer);
    39     }
    40     free (answer);
    41     return (ptr);
     28  if (answer == (char *) NULL) {
     29    answer = ScanConfig (GlobalConfig, keyword, mode, 0, ptr);
     30    return (answer);
    4231  }
    4332
    44   answer = ScanConfig (GlobalConfig, keyword, mode, 0, ptr);
    45   return (answer);
     33  if (!strcmp (mode, "%s"))  strcpy ((char *) ptr, answer);
     34  if (!strcmp (mode, "%d"))  *(int *) ptr       = atoi (answer);
     35  if (!strcmp (mode, "%u"))  *(unsigned *) ptr  = atoi (answer);
     36  if (!strcmp (mode, "%ld")) *(long *) ptr      = atoi (answer);
     37  if (!strcmp (mode, "%hd")) *(short *) ptr     = atoi (answer);
     38  if (!strcmp (mode, "%f"))  *(float *) ptr     = atof (answer);
     39  if (!strcmp (mode, "%lf")) *(double *) ptr    = atof (answer);
     40
     41  free (answer);
     42  return (ptr);
    4643}
    47 
    48  

  • trunk/Ohana/src/opihi/lib.shell/Makefile

    r4751 r4833  
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1616LFLAGS  =       -L$(LLIB) -L$(LIB)
    17 LIBS    =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
     17LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
    1818CFLAGS  =       $(INCS)
    1919CCFLAGS =       $(LIBS)

  • trunk/Ohana/src/opihi/mana/Makefile

    r4748 r4833  
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1616LFLAGS  =       -L$(LLIB) -L$(LIB)
    17 LIBS1   =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
     17LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
    1818LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata
    1919LIBS    =       $(LIBS2) $(LIBS1)

  • trunk/Ohana/src/opihi/pantasks/Makefile

    r4763 r4833  
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1616LFLAGS  =       -L$(LLIB) -L$(LIB)
    17 LIBS1   =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
     17LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
    1818LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata
    1919LIBS    =       $(LIBS2) $(LIBS1)

  • trunk/Ohana/src/opihi/pclient/Makefile

    r4748 r4833  
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1616LFLAGS  =       -L$(LLIB) -L$(LIB)
    17 LIBS1   =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
     17LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
    1818LIBS2   =       -lbasiccmd -lshell -ldata
    1919LIBS    =       $(LIBS2) $(LIBS1)

  • trunk/Ohana/src/opihi/pcontrol/Makefile

    r4767 r4833  
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1616LFLAGS  =       -L$(LLIB) -L$(LIB)
    17 LIBS1   =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
     17LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
    1818LIBS2   =       -lbasiccmd -lshell -ldata
    1919LIBS    =       $(LIBS2) $(LIBS1)
Note: See TracChangeset for help on using the changeset viewer.