Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert to CFITSIO for table i/o using a re-usable cfitsio library #384

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export CFLAGS ?= -g -O2
export XC_CFLAGS = $(CPPFLAGS) $(CFLAGS)
export XC_LFLAGS = $(LDFLAGS)

.PHONY: all sysgen clean test arch noao host novos core bindirs bin_links config inplace starttime
.PHONY: all sysgen clean test arch noao host novos core vendor bindirs bin_links config inplace starttime

all:: sysgen

Expand Down Expand Up @@ -73,12 +73,18 @@ host: novos
$(MAKE) -C $(host) bindir=$(hbin) boot/install
$(MAKE) -C $(host) clean

# Build vendor libs (libvotable)
vendor: host
$(MAKE) -C $(iraf)vendor \
includedir=$(iraf)include/ bindir=$(bin) install
$(MAKE) -C $(iraf)vendor clean

# Build the core system.
core: host
core: host vendor
$(MKPKG)

# Build the NOAO package.
noao: host core
noao: host core vendor
cd $(noao) && $(MKPKG) -p noao

# Run the test suite.
Expand All @@ -90,6 +96,7 @@ test:
# by generic, xyacc and similar.
clean:
$(MAKE) -C unix clean
$(MAKE) -C vendor clean
find ./local ./math ./pkg ./sys ./noao/[adfimnorst]* \
-type f -name \*.\[aeo\] -exec rm -f {} \;
rm -f $(bin)/* noao/bin$(arch)/* $(hbin)* .build_started \
Expand Down
2 changes: 1 addition & 1 deletion noao/digiphot/daophot/mkpkg
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ install:
;

trelink:
$set LIBS = "-lncar -lgks -ltbtables -lxtools -lds"
$set LIBS = "-lncar -lgks -ltbtables -lcfitsio -lxtools -lds"
$set XFLAGS = "$(XFLAGS) $(XF)"
$set LFLAGS = "$(LFLAGS) $(LF)"
$update libpkg.a
Expand Down
2 changes: 1 addition & 1 deletion noao/digiphot/ptools/mkpkg
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ install:
;

trelink:
$set LIBS = "-lds -lncar -lgks -lxtools -ltbtables"
$set LIBS = "-lds -lncar -lgks -lxtools -ltbtables -lcfitsio"
$set XFLAGS = "$(XFLAGS) $(XF)"
$set LFLAGS = "$(LFLAGS) $(LF)"
$update libpkg.a
Expand Down
14 changes: 10 additions & 4 deletions pkg/tbtables/mkpkg
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ update:


libtbtables.a:
$set XFLAGS = "-Inolibc $(XFLAGS)"
$set XFLAGS = "-Inolibc -I$(iraf)include $(XFLAGS)"

tbagt.x <mach.h> <tbset.h> tbtables.h
tbapt.x <tbset.h> tbtables.h
Expand Down Expand Up @@ -235,7 +235,13 @@ libtbtables.a:
tbnparse.x <ctype.h> <ctotok.h> <tbset.h>
@selector

$echo "NOTE: SPP FITSIO will be used for FITS tables."
tbfhp_f.x <tbset.h> tbtables.h tblfits.h
@fitsio
$ifdef (SPPFITSIO)
$echo "NOTE: SPP FITSIO will be used for FITS tables."
tbfhp_f.x <tbset.h> tbtables.h tblfits.h
@fitsio
$else
$echo "NOTE: CFITSIO will be used for FITS tables."
tbfxff.c fitsio_spp.h underscore.h
tbfhp.x <tbset.h> tbtables.h tblfits.h
$endif
;
Loading