IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 5242


Ignore:
Timestamp:
Oct 7, 2005, 3:07:00 PM (21 years ago)
Author:
eugene
Message:

added support for libdvo

Location:
trunk/Ohana/src
Files:
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/delstar/Makefile

    r4864 r5242  
    1616# 
    1717INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    18 LIBS    =       -L$(LLIB) -lohana -lFITS -lm
     18LIBS    =       -L$(LLIB) -ldvo -lFITS -lohana -lm
    1919CFLAGS  =       -o $*.$(ARCH).o $(INCS) -O2
    2020CCFLAGS =       $(INCS) $(LIBS)

  • trunk/Ohana/src/elixir/include/controller.h

    r4772 r5242  
    11# include <ohana.h>
     2# include <fitsio.h>
    23# include <signal.h>
    34# include <errno.h>

  • trunk/Ohana/src/gastro/Makefile

    r4828 r5242  
    1717# 
    1818INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    19 LIBS    =       -L$(LLIB) -lohana -lFITS -lm -lsocket -lnsl
     19LIBS    =       -L$(LLIB) -ldvo -lFITS -lohana -lm -lsocket -lnsl
    2020CFLAGS  =       $(INCS)
    2121LFLAGS  =       $(LIBS)

  • trunk/Ohana/src/gastro2/Makefile

    r3520 r5242  
    1414# 
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    16 LIBS    =       -L$(LLIB) -lohana -lFITS -lsocket -lnsl -lm
     16LIBS    =       -L$(LLIB) -ldvo -lFITS -lohana -lsocket -lnsl -lm
    1717CFLAGS  =       -o $*.$(ARCH).o $(INCS)
    1818CCFLAGS =       $(INCS) $(LIBS)

  • trunk/Ohana/src/getstar/Makefile

    r2510 r5242  
    1414# 
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    16 LIBS    =       -L$(LLIB) -lFITS -lohana -lm
     16LIBS    =       -L$(LLIB) -ldvo -lFITS -lohana -lm
    1717CFLAGS  =       -o $*.$(ARCH).o $(INCS)
    1818CCFLAGS =       $(INCS) $(LIBS)

  • trunk/Ohana/src/gophot/include/gophot.h

    r2473 r5242  
    22
    33# include <ohana.h>
     4# include <fitsio.h>
    45
    56typedef char bool;

  • trunk/Ohana/src/imclean/Makefile

    r3519 r5242  
    1414# 
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    16 LIBS    =       -L$(LLIB) -lohana -lFITS -lm
     16LIBS    =       -L$(LLIB) -ldvo -lFITS -lohana -lm
    1717CFLAGS  =       -o $*.$(ARCH).o $(INCS)
    1818CCFLAGS =       $(INCS) $(LIBS)

  • trunk/Ohana/src/imregister/Makefile

    r4864 r5242  
    2121
    2222INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    23 LIBS    =       -L$(LLIB) -lohana -lFITS -lm
     23LIBS    =       -L$(LLIB) -ldvo -lFITS -lohana -lm
    2424CFLAGS  =       $(INCS)
    2525LFLAGS  =       $(LIBS)

  • trunk/Ohana/src/imregister/src/imphotmerge.c

    r4864 r5242  
    11# include "imregister.h"
    22
    3 /*** this needs to be written using dvo_image functions ***/
     3/*** this needs to be written using dvo_image functions !!! ***/
    44
    55Image *LoadImageTable (FILE *f, Header *header, int *nimage);
    6 static char *version = "imphotcopy $Revision: 1.3 $";
     6static char *version = "imphotcopy $Revision: 1.4 $";
    77
    88int main (int argc, char **argv) {

  • trunk/Ohana/src/kapa/include/Ximage.h

    r2473 r5242  
    11# include <Xohana.h>
     2# include <fitsio.h>
    23# include "constants.h"
    34# include "structures.h"

  • trunk/Ohana/src/kii/Makefile

    r2510 r5242  
    2121#
    2222INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    23 LIBS    =       -L$(LLIB) $(XLIB) -lohana -lFITS -ljpeg -lX11 -lsocket -lnsl -lm
     23LIBS    =       -L$(LLIB) $(XLIB) -ldvo -lFITS -lohana -ljpeg -lX11 -lsocket -lnsl -lm
    2424# LIBS  =       -L$(LLIB) $(XLIB) -lohana -lFITS -ljpeg -lX11 -lsocket -lnsl -lm -static
    2525CFLAGS  =       -o $*.$(ARCH).o $(INCS)

  • trunk/Ohana/src/libautocode/def/common.h

    r3609 r5242  
    11# include <ohana.h>
     2# include <fitsio.h>
    23
    34# ifndef AUTOCODE_H

  • trunk/Ohana/src/lightcurve/Makefile

    r2510 r5242  
    1616# 
    1717INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    18 LIBS    =       -L$(LLIB) -lohana -lFITS -lm
     18LIBS    =       -L$(LLIB) -ldvo -lFITS -lohana -lm
    1919CFLAGS  =       -o $*.o $(INCS)
    2020CCFLAGS =       $(INCS) $(LIBS)

  • trunk/Ohana/src/markrock/Makefile

    r2510 r5242  
    1515# 
    1616INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    17 LIBS    =       -L$(LLIB) -lohana -lFITS -lm
     17LIBS    =       -L$(LLIB) -ldvo -lFITS -lohana -lm
    1818CFLAGS  =       -o $*.$(ARCH).o $(INCS)
    1919CCFLAGS =       $(INCS) $(LIBS)

  • trunk/Ohana/src/markstar/Makefile

    r2510 r5242  
    1515# 
    1616INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    17 LIBS    =       -L$(LLIB) -lFITS -lohana -lm
     17LIBS    =       -L$(LLIB) -ldvo -lFITS -lohana -lm
    1818CFLAGS  =       -o $*.$(ARCH).o $(INCS)
    1919CCFLAGS =       $(INCS) $(LIBS)

  • trunk/Ohana/src/misc/doc/Changes.log

    r4481 r5242  
     1
     22005.10.07
     3
     4        I was having some memory collision problems, and attempting to
     5        use the ohana_allocate functions reminded me that the libFITS
     6        functions were not supported under ohana_allocate.  This was
     7        unhelpful.  I bit the bullet and split libohana into libohana
     8        (base functions only, including ohana_allocate) and libdvo
     9        (functions based on the libautocode structures).  Doing this
     10        allowed me to make libFITS depend on libohana (including
     11        ohana_allocate).  BUT, this forced me to change all LDFLAGS
     12        entries in ohana to swap -lohana -lFITS for -lFITS -lohana,
     13        and to add include <fitsio.h> in some cases.
    114
    215misc-1-1:

  • trunk/Ohana/src/mosastro/Makefile

    r3526 r5242  
    1717#
    1818INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    19 LIBS    =       -L$(LLIB) -lohana -lFITS -lm
     19LIBS    =       -L$(LLIB) -ldvo -lFITS -lohana -lm
    2020CFLAGS  =       $(INCS)
    2121LFLAGS  =       $(LIBS)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  • trunk/Ohana/src/photdbc/Makefile

    r4864 r5242  
    1515#
    1616INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    17 LIBS    =       -L$(LLIB) -lohana -lFITS -lm
     17LIBS    =       -L$(LLIB) -ldvo -lFITS -lohana -lm
    1818CFLAGS  =       -o $*.$(ARCH).o $(INCS)
    1919CCFLAGS =       $(INCS) $(LIBS)

  • trunk/Ohana/src/relphot/Makefile

    r4864 r5242  
    1515#
    1616INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    17 LIBS    =       -L$(LLIB) -lsocket -lnsl -lohana -lFITS -lm
     17LIBS    =       -L$(LLIB) -lsocket -lnsl -ldvo -lFITS -lohana -lm
    1818CFLAGS  =       -o $*.$(ARCH).o $(INCS)
    1919CCFLAGS =       $(INCS) $(LIBS)

  • trunk/Ohana/src/uniphot/Makefile

    r4864 r5242  
    1515#
    1616INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    17 LIBS    =       -L$(LLIB) -lohana -lFITS -lm
     17LIBS    =       -L$(LLIB) -ldvo -lFITS -lohana -lm
    1818CFLAGS  =       -o $*.$(ARCH).o $(INCS) -Wall
    1919CCFLAGS =       $(INCS) $(LIBS) -Wall

  • trunk/Ohana/src/uniphot/src/wimages.c

    r4797 r5242  
    11# include "uniphot.h"
     2
     3/***** this needs to be changed to use the dvo autocode structures !!! */
    24
    35void wimages (Image *image, int Nimage) {
Note: See TracChangeset for help on using the changeset viewer.