Skip to content

Commit

Permalink
autotools: start building RPFITS library
Browse files Browse the repository at this point in the history
And enable the four ATNF tasks that depended on it. I hadn't gotten around to
this but somebody requested it, and getting things going was a piece of cake.
  • Loading branch information
pkgw committed Aug 26, 2013
1 parent 71a3e97 commit fd079b2
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 9 deletions.
1 change: 1 addition & 0 deletions Makefile.am
Expand Up @@ -24,6 +24,7 @@ SUBDIRS = \
borrow/pgplot \
borrow/linpack \
borrow/wcslib \
borrow/rpfits \
src/subs \
src/scripts \
src/scripts/ata/rapid \
Expand Down
30 changes: 30 additions & 0 deletions borrow/rpfits/Makefile.am
@@ -0,0 +1,30 @@
## The wcslib source tree includes a "GNUmakefile", which would override
## our Makefiles when using GNU make ... which we require. Automake
## recurses into the PWD for some operations, so we need to specify
## AM_MAKEFLAGS here the same way we do in the toplevel Makefile.am

AM_MAKEFLAGS = -f Makefile

lib_LTLIBRARIES = libmir_rpfits.la

rpfcincdir = $(includedir)/miriad-c/rpfits
rpffincdir = $(includedir)/miriad-f/rpfits

rpfcinc_HEADERS = code/RPFITS.h
rpffinc_HEADERS = code/rpfits.inc

libmir_rpfits_la_SOURCES = \
$(rpfcinc_HEADERS) \
$(rpffinc_HEADERS) \
code/datfit.f \
code/dconv.f \
code/ljusty.f \
code/nchar.f \
code/rjusty.f \
code/rpferr.f \
code/rpfitsin.f \
code/rpfitsout.f \
code/rpfits_tables.f \
code/utdate.c \
code/linux/atio.f \
code/linux/cvt_ieee.f
1 change: 1 addition & 0 deletions configure.ac
Expand Up @@ -468,6 +468,7 @@ AC_CONFIG_FILES([
src/scripts/Makefile
src/scripts/ata/rapid/Makefile
borrow/linpack/Makefile
borrow/rpfits/Makefile
borrow/wcslib/Makefile
src/prog/analysis/Makefile
src/prog/calib/Makefile
Expand Down
20 changes: 11 additions & 9 deletions src/prog/atnf/Makefile.am
@@ -1,23 +1,25 @@
include $(top_srcdir)/mircommon.mak

# We do not build atlod, fakeotf, mopfix, or wblod, because they
# require the rpfits library. This resides in borrow/rpfits/, but I
# don't feel like hooking it up to autotools right now. If someone
# needs one of these tasks, I'll look into hooking it up.
# A few of these programs need the RPFITS library from borrow/rpfits.

LDADD = $(prog_libs)
rpfits_libs = $(top_builddir)/borrow/rpfits/libmir_rpfits.la

ftasks = \
at_mfcal at_moment at_uvlist at_uvplt atfix atmos atrtfix atscfix attsys atwvr \
elevcor lagflg mbspect mfboot plboot plplt wbplt
at_mfcal at_moment at_uvlist at_uvplt atfix atlod atmos atrtfix atscfix \
attsys atwvr elevcor fakeotf lagflg mbspect mfboot mopfix plboot plplt \
wblod wbplt
bin_PROGRAMS = $(ftasks)
CLEANFILES = $(ftasks:=.f)
EXTRA_DIST = $(ftasks:=.for)

noinst_HEADERS = \
at_uvlist.h atfix.h atmos.h mbspect.h mfcal.h wbcomm.h
atlod_LDADD = $(prog_libs) $(rpfits_libs)
fakeotf_LDADD = $(prog_libs) $(rpfits_libs)
mopfix_LDADD = $(prog_libs) $(rpfits_libs)
wblod_LDADD = $(prog_libs) $(rpfits_libs)

EXTRA_DIST += atlod.for atlod.h mopfix.for wblod.for wblod.h
noinst_HEADERS = \
at_uvlist.h atfix.h atlod.h atmos.h mbspect.h mfcal.h wbcomm.h wblod.h

dist-hook:
-rm -f $(distdir)/*.f
Expand Down

0 comments on commit fd079b2

Please sign in to comment.