Changeset 5238

Timestamp:

Oct 7, 2005, 2:59:07 PM (21 years ago)

Author:

eugene

Message:

added dependency on libohana (for ohana_allocate), dropped fits.h

Location:

trunk/Ohana/src/libfits

Files:

• Makefile (modified) (5 diffs)
• doc/ChangeLog.txt (modified) (1 diff)
• doc/sample.c (modified) (1 diff)
• doc/sample2.c (modified) (1 diff)
• header/F_H_field.c (modified) (1 diff)
• header/F_copy_H.c (modified) (1 diff)
• header/F_create_H.c (modified) (1 diff)
• header/F_delete.c (modified) (1 diff)
• header/F_free_H.c (modified) (1 diff)
• header/F_init_H.c (modified) (1 diff)
• header/F_insert_array.c (modified) (1 diff)
• header/F_modify.c (modified) (1 diff)
• header/F_print.c (modified) (1 diff)
• header/F_read_H.c (modified) (1 diff)
• header/F_read_XH.c (modified) (1 diff)
• header/F_scan.c (modified) (1 diff)
• header/F_write_H.c (modified) (1 diff)
• header/version.c (modified) (1 diff)
• include/fits.h (deleted)
• include/fitsio.h (modified) (1 diff)
• matrix/F_add_M.c (modified) (1 diff)
• matrix/F_add_M_value.c (modified) (1 diff)
• matrix/F_convert_format.c (modified) (1 diff)
• matrix/F_copy_M.c (modified) (1 diff)
• matrix/F_create_M.c (modified) (1 diff)
• matrix/F_divide_M.c (modified) (1 diff)
• matrix/F_free_M.c (modified) (1 diff)
• matrix/F_get_M_value.c (modified) (1 diff)
• matrix/F_insert_M.c (modified) (1 diff)
• matrix/F_load_M.c (modified) (1 diff)
• matrix/F_matrix.c (modified) (1 diff)
• matrix/F_multiply_M.c (modified) (1 diff)
• matrix/F_read_M.c (modified) (1 diff)
• matrix/F_read_portion.c (modified) (1 diff)
• matrix/F_read_segment.c (modified) (1 diff)
• matrix/F_set_M_value.c (modified) (1 diff)
• matrix/F_write_M.c (modified) (1 diff)
• table/F_create_T.c (modified) (1 diff)
• table/F_create_TH.c (modified) (1 diff)
• table/F_define_column.c (modified) (1 diff)
• table/F_free_T.c (modified) (1 diff)
• table/F_get_T_column.c (modified) (1 diff)
• table/F_get_T_value.c (modified) (1 diff)
• table/F_get_column.c (modified) (1 diff)
• table/F_read_T.c (modified) (1 diff)
• table/F_read_TH.c (modified) (1 diff)
• table/F_set_column.c (modified) (1 diff)
• table/F_table_column.c (modified) (1 diff)
• table/F_table_format.c (modified) (1 diff)
• table/F_table_row.c (modified) (1 diff)
• table/F_write_T.c (modified) (1 diff)
• table/F_write_TH.c (modified) (1 diff)

trunk/Ohana/src/libfits/Makefile

@@ -2 +2 @@
 
 include ../../Configure
-HOME    =       .
 
+HOME    =       $(ROOT)/src/libfits
 HEAD    =       $(HOME)/header
 MATR    =       $(HOME)/matrix
@@ -14 +14 @@
 DESTMAN =       $(LMAN)
 
-INCS    =       -I$(INC) 
-CFLAGS  =       -o $*.$(ARCH).o $(INCS) -D$(ARCH)
-LFLAGS  =       -c $(INCS)
+CFLAGS  =       -I$(LINC) -D$(ARCH)
 
 default: install
 
-sample: /h/eugene/src/ohana/lib/linux/libFITS.a sample.o
-        gcc -g -o sample sample.o /h/eugene/src/ohana/lib/linux/libFITS.a -lm
+install: $(DESTLIB)/libFITS.a $(DESTMAN)/fits.1
 
-sample2: /h/eugene/src/ohana/lib/linux/libFITS.a sample2.o
-        gcc -g -o sample2 sample2.o /h/eugene/src/ohana/lib/linux/libFITS.a -lm
+libfits: $(LIB)/libFITS.$(ARCH).a
 
-fits: $(DESTLIB)/libFITS.a
-
-install: $(DESTINC)/fitsio.h $(DESTLIB)/libFITS.a $(DESTMAN)/fits.1
+INCS = $(DESTINC)/fitsio.h 
 
 HEADER_OBJ = \
@@ -62 +56 @@
 # $(TABL)/F_get_T_value.$(ARCH).o
 
-LIBOBJ = $(HEADER_OBJ) $(MATRIX_OBJ) $(TABLE_OBJ)
+OBJS = $(HEADER_OBJ) $(MATRIX_OBJ) $(TABLE_OBJ)
 
-$(LIBOBJ): $(INC)/fits.h $(INC)/fitsio.h
-
-$(LIB)/libFITS.$(ARCH).a: $(LIBOBJ)
-        @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-        rm -f $(LIB)/libFITS.$(ARCH).a
-        ar rcv $(LIB)/libFITS.$(ARCH).a $(LIBOBJ)
-        $(RANLIB) $(LIB)/libFITS.$(ARCH).a
+$(OBJS): $(INCS)
 
 $(DESTLIB)/libFITS.a: $(LIB)/libFITS.$(ARCH).a 
@@ -77 +65 @@
         cp $(LIB)/libFITS.$(ARCH).a $(DESTLIB)/libFITS.a
 
-$(DESTINC)/fitsio.h: $(INC)/fitsio.h
+$(LIB)/libFITS.$(ARCH).a: $(OBJS)
+        @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
+        rm -f $(LIB)/libFITS.$(ARCH).a
+        ar rcv $(LIB)/libFITS.$(ARCH).a $(OBJS)
+        $(RANLIB) $(LIB)/libFITS.$(ARCH).a
+
+$(DESTINC)/%: $(INC)/%
         @if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
-        rm -f $(DESTINC)/fitsio.h
-        cp $(INC)/fitsio.h $(DESTINC)/
+        rm -f $(DESTINC)/$*
+        cp $(INC)/$* $(DESTINC)/
 
 $(DESTMAN)/fits.1: $(MAN)/fits.1
@@ -93 +87 @@
         rm -f */#*
 
+dist: clean
+
 .SUFFIXES: .$(ARCH).o
 
 .c.$(ARCH).o:
-        $(CC) $(CFLAGS) -c $<
-
+        $(CC) $(CFLAGS) -c $*.c -o $@

trunk/Ohana/src/libfits/doc/ChangeLog.txt

@@ +1 @@
+
+2005.10.07
+
+        I was having some memory collision problems, and attempting to
+        use the ohana_allocate functions reminded me that the libFITS
+        functions were not supported under ohana_allocate.  This was
+        unhelpful.  I bit the bullet and split libohana into libohana
+        (base functions only, including ohana_allocate) and libdvo
+        (functions based on the libautocode structures).  Doing this
+        allowed me to make libFITS depend on libohana (including
+        ohana_allocate).  BUT, this forced me to change all LDFLAGS
+        entries in ohana to swap -lohana -lFITS for -lFITS -lohana,
+        and to add include <fitsio.h> in some cases.
 
 libfits-1-3:

trunk/Ohana/src/libfits/doc/sample.c

@@ -1 @@
-# include "fitsio.h"
+# include <ohana.h>
+# include <fitsio.h>
 # define TRUE 1
 

trunk/Ohana/src/libfits/doc/sample2.c

@@ -1 @@
-# include "fitsio.h"
+# include <ohana.h>
+# include <fitsio.h>
 # include <stdio.h>
 # define TRUE 1

trunk/Ohana/src/libfits/header/F_H_field.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits header field ****************************/

trunk/Ohana/src/libfits/header/F_copy_H.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits copy header ***********************************/

trunk/Ohana/src/libfits/header/F_create_H.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 # define NBYTES 2880
 

trunk/Ohana/src/libfits/header/F_delete.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits delete ****************************/

trunk/Ohana/src/libfits/header/F_free_H.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits free header ***********************************/

trunk/Ohana/src/libfits/header/F_init_H.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 int FT_UNSIGN_MODE;
 

trunk/Ohana/src/libfits/header/F_insert_array.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits insert array ***********************************/

trunk/Ohana/src/libfits/header/F_modify.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 char *fits_keyword_start (char *line);

trunk/Ohana/src/libfits/header/F_print.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 int fits_print (Header *header, char *field, char *mode, int N,...) {

trunk/Ohana/src/libfits/header/F_read_H.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 int FT_UNSIGN_MODE;
 

trunk/Ohana/src/libfits/header/F_read_XH.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 int FT_UNSIGN_MODE;
 

trunk/Ohana/src/libfits/header/F_scan.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 char *fits_keyword_start (char *line);

trunk/Ohana/src/libfits/header/F_write_H.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits write header ***********************************/

trunk/Ohana/src/libfits/header/version.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 static char *name = "$Name: not supported by cvs2svn $";
 

trunk/Ohana/src/libfits/include/fitsio.h

@@ -3 +3 @@
 # ifndef FITSIO
 # define FITSIO
+
+/* also defined in libautocode/def/common.h */
+/* what about lin64 ?? - 'linux' might be defined automatically by linux */
+# ifndef BYTE_SWAP
+# ifdef linux
+# define BYTE_SWAP
+# endif
+
+# ifdef sid
+# define BYTE_SWAP
+# endif
+
+# ifdef dec
+# define BYTE_SWAP
+# endif
+# endif /* BYTE_SWAP */
+
+# ifndef NEWLINE
+# define NEWLINE                 10  /* UNIX RETURN character */
+# endif /* NEWLINE */
 
 /********** FITS Constants *********/

trunk/Ohana/src/libfits/matrix/F_add_M.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits insert array ***********************************/

trunk/Ohana/src/libfits/matrix/F_add_M_value.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /***************** fits add matrix value ***********************************/

trunk/Ohana/src/libfits/matrix/F_convert_format.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 # define CONVERTDOWN \

trunk/Ohana/src/libfits/matrix/F_copy_M.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits copy header ***********************************/

trunk/Ohana/src/libfits/matrix/F_create_M.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits create matrix *******************************/

trunk/Ohana/src/libfits/matrix/F_divide_M.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /********************* fits divide matrix ***********************************/

trunk/Ohana/src/libfits/matrix/F_free_M.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits free matrix ***********************************/

trunk/Ohana/src/libfits/matrix/F_get_M_value.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /***************** fits get matrix value ***********************************/

trunk/Ohana/src/libfits/matrix/F_insert_M.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits insert array ***********************************/

trunk/Ohana/src/libfits/matrix/F_load_M.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 int fits_fread_matrix (FILE *f, Matrix *matrix, Header *header) {

trunk/Ohana/src/libfits/matrix/F_matrix.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 int fits_matrix_size (Header *header) {

trunk/Ohana/src/libfits/matrix/F_multiply_M.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /******************* fits multiply matrix ***********************************/

trunk/Ohana/src/libfits/matrix/F_read_M.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits read matrix ***********************************/

trunk/Ohana/src/libfits/matrix/F_read_portion.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 # ifndef SEEK_CUR 
 # define SEEK_SET 0   

trunk/Ohana/src/libfits/matrix/F_read_segment.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /** warning: this function requires 'dparse' which is included in libohana.a **/

trunk/Ohana/src/libfits/matrix/F_set_M_value.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /****************** fits set matrix value ***********************************/

trunk/Ohana/src/libfits/matrix/F_write_M.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits write matrix ***********************************/

trunk/Ohana/src/libfits/table/F_create_T.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits create table *******************************/

trunk/Ohana/src/libfits/table/F_create_TH.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /* a basic table header (extension) is different from a primary header

trunk/Ohana/src/libfits/table/F_define_column.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /***********************/

trunk/Ohana/src/libfits/table/F_free_T.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 int fits_free_table (FTable *table) {

trunk/Ohana/src/libfits/table/F_get_T_column.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits get table column *****************************/

trunk/Ohana/src/libfits/table/F_get_T_value.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits get table value ********************************/

trunk/Ohana/src/libfits/table/F_get_column.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 # define SWAP_BYTE \
   tmp = Pin[0]; Pin[0] = Pin[1]; Pin[1] = tmp;

trunk/Ohana/src/libfits/table/F_read_T.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits read table ***********************************/

trunk/Ohana/src/libfits/table/F_read_TH.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits read Theader ***********************************/

trunk/Ohana/src/libfits/table/F_set_column.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 # define SWAP_BYTE \
   tmp = Pout[0]; Pout[0] = Pout[1]; Pout[1] = tmp;

trunk/Ohana/src/libfits/table/F_table_column.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits table column ****************************/

trunk/Ohana/src/libfits/table/F_table_format.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /***********************/

trunk/Ohana/src/libfits/table/F_table_row.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits table column ****************************/

trunk/Ohana/src/libfits/table/F_write_T.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits write header *********************************/

trunk/Ohana/src/libfits/table/F_write_TH.c

@@ -1 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits write header *********************************/