Changeset 15487 for trunk/Ohana/src/libfits/Makefile

Timestamp:

Nov 6, 2007, 5:09:52 PM (19 years ago)

Author:

eugene

Message:

merging changes from eam_branch_20071015 (read compressed images, clean addstar I/O, other minor issues)

File:

• trunk/Ohana/src/libfits/Makefile (modified) (5 diffs)

trunk/Ohana/src/libfits/Makefile

@@ -10 +10 @@
 MATR    =       $(HOME)/matrix
 TABL    =       $(HOME)/table
+EXT     =       $(HOME)/extern
 INC     =       $(HOME)/include
 MAN     =       $(HOME)/doc
@@ -15 +16 @@
 
 # programs may add their own internal requirements here
-FULL_CFLAGS   = $(BASE_CFLAGS) -fPIC
-FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_CFLAGS   = $(BASE_CFLAGS) -fPIC -Wall -Werror
+FULL_CPPFLAGS = $(BASE_CPPFLAGS) -I$(EXT)
 FULL_LDFLAGS  = $(BASE_LDFLAGS)
 
@@ -32 +33 @@
 $(HEAD)/F_copy_H.$(ARCH).o                      $(HEAD)/F_delete.$(ARCH).o    \
 $(HEAD)/F_read_XH.$(ARCH).o                     $(HEAD)/F_init_H.$(ARCH).o    \
-$(HEAD)/version.$(ARCH).o
+$(HEAD)/F_convert_H.$(ARCH).o                   $(HEAD)/version.$(ARCH).o
 
 MATRIX_OBJ = \
@@ -43 +44 @@
 $(MATR)/F_convert_format.$(ARCH).o              $(MATR)/F_read_segment.$(ARCH).o \
 $(MATR)/F_read_portion.$(ARCH).o                $(MATR)/F_load_M.$(ARCH).o       \
-$(MATR)/F_matrix.$(ARCH).o
+$(MATR)/F_matrix.$(ARCH).o                      $(MATR)/F_compress_M.$(ARCH).o   \
+$(MATR)/F_uncompress_data.$(ARCH).o
 
 TABLE_OBJ = \
@@ -51 +53 @@
 $(TABL)/F_define_column.$(ARCH).o               $(TABL)/F_table_format.$(ARCH).o \
 $(TABL)/F_set_column.$(ARCH).o                  $(TABL)/F_get_column.$(ARCH).o   \
-$(TABL)/F_table_row.$(ARCH).o                   $(TABL)/F_free_T.$(ARCH).o
+$(TABL)/F_table_row.$(ARCH).o                   $(TABL)/F_free_T.$(ARCH).o       \
+$(TABL)/F_table_varlength.$(ARCH).o
 
-OBJS = $(HEADER_OBJ) $(MATRIX_OBJ) $(TABLE_OBJ)
+EXTERN_OBJ = \
+$(EXT)/fits_hcompress.$(ARCH).o \
+$(EXT)/fits_hdecompress.$(ARCH).o \
+$(EXT)/pliocomp.$(ARCH).o \
+$(EXT)/ricecomp.$(ARCH).o
+
+OBJS = $(HEADER_OBJ) $(MATRIX_OBJ) $(TABLE_OBJ) $(EXTERN_OBJ)
+
+extern: $(EXTERN_OBJ)
 
 $(OBJS): $(INCS)