diff -up ast-8.1.0/Makefile.in.bundled ast-8.1.0/Makefile.in
--- ast-8.1.0/Makefile.in.bundled 2016-03-24 15:54:43.116928732 -0600
+++ ast-8.1.0/Makefile.in 2016-03-24 15:56:10.327361163 -0600
@@ -266,10 +266,6 @@ am__objects_1 = libast_la-axis.lo libast
am__objects_3 =
am__objects_4 = $(am__objects_3)
am__dirstamp = $(am__leading_dot)dirstamp
-am__objects_5 = cminpack/libast_la-lmder1.lo \
- cminpack/libast_la-lmder.lo cminpack/libast_la-dpmpar.lo \
- cminpack/libast_la-enorm.lo cminpack/libast_la-qrfac.lo \
- cminpack/libast_la-lmpar.lo cminpack/libast_la-qrsolv.lo
am__objects_6 = libast_la-proj.lo libast_la-tpn.lo \
libast_la-wcstrig.lo
am_libast_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
@@ -1332,17 +1328,6 @@ PAL_FILES = \
erfa.h \
erfam.h
-CMINPACK_FILES = \
- cminpack/cminpack.h \
- cminpack/cminpackP.h \
- cminpack/lmder1.c \
- cminpack/lmder.c \
- cminpack/dpmpar.c \
- cminpack/enorm.c \
- cminpack/qrfac.c \
- cminpack/lmpar.c \
- cminpack/qrsolv.c
-
bin_SCRIPTS = ast_link
dist_bin_SCRIPTS = ast_link_adam
noinst_SCRIPTS = ast_cpp
@@ -1409,13 +1394,13 @@ libast_la_SOURCES = \
$(WCSLIB_FILES) \
ast_err.h
-@EXTERNAL_PAL_FALSE@libast_la_LIBADD = libast_pal.la
+@EXTERNAL_PAL_FALSE@libast_la_LIBADD = libast_pal.la -lcminpack -lerfa
# Ensure libast links against libraries containing functions used within
# libast. If AST is configured --with-external-pal, then the internal
# libast_pal library will be empty, and we link to an external PAL
# library instead.
-@EXTERNAL_PAL_TRUE@libast_la_LIBADD = $(libdir)/libpal.la
+@EXTERNAL_PAL_TRUE@libast_la_LIBADD = $(libdir)/libpal.la -lcminpack -lerfa
# AST_PAR is really part of GRP_F_INCLUDE_FILES, but it must not be
# distributed, so list it separately.
@@ -1470,7 +1455,7 @@ astbad_SOURCES = astbad.c pointset.h
# configure.ac, and so is not distributed automatically.
#
# makeh is required in order to build ast.h after distribution (see below).
-EXTRA_DIST = ast_par.source sun210_figures sun211_figures pal erfa cminpack
+EXTRA_DIST = ast_par.source sun210_figures sun211_figures pal erfa
# AST_ERR and ast_err.h are `generated source files', and so must be
# generated before any other compilations are done. Note that these
@@ -1623,26 +1608,6 @@ clean-libLTLIBRARIES:
echo rm -f $${locs}; \
rm -f $${locs}; \
}
-cminpack/$(am__dirstamp):
- @$(MKDIR_P) cminpack
- @: > cminpack/$(am__dirstamp)
-cminpack/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) cminpack/$(DEPDIR)
- @: > cminpack/$(DEPDIR)/$(am__dirstamp)
-cminpack/libast_la-lmder1.lo: cminpack/$(am__dirstamp) \
- cminpack/$(DEPDIR)/$(am__dirstamp)
-cminpack/libast_la-lmder.lo: cminpack/$(am__dirstamp) \
- cminpack/$(DEPDIR)/$(am__dirstamp)
-cminpack/libast_la-dpmpar.lo: cminpack/$(am__dirstamp) \
- cminpack/$(DEPDIR)/$(am__dirstamp)
-cminpack/libast_la-enorm.lo: cminpack/$(am__dirstamp) \
- cminpack/$(DEPDIR)/$(am__dirstamp)
-cminpack/libast_la-qrfac.lo: cminpack/$(am__dirstamp) \
- cminpack/$(DEPDIR)/$(am__dirstamp)
-cminpack/libast_la-lmpar.lo: cminpack/$(am__dirstamp) \
- cminpack/$(DEPDIR)/$(am__dirstamp)
-cminpack/libast_la-qrsolv.lo: cminpack/$(am__dirstamp) \
- cminpack/$(DEPDIR)/$(am__dirstamp)
libast.la: $(libast_la_OBJECTS) $(libast_la_DEPENDENCIES)
$(AM_V_CCLD)$(libast_la_LINK) -rpath $(libdir) $(libast_la_LDFLAGS) $(libast_la_OBJECTS) $(libast_la_LIBADD) $(LIBS)
libast_drama.la: $(libast_drama_la_OBJECTS) $(libast_drama_la_DEPENDENCIES)
@@ -1770,8 +1735,6 @@ uninstall-dist_binSCRIPTS:
mostlyclean-compile:
-rm -f *.$(OBJEXT)
- -rm -f cminpack/*.$(OBJEXT)
- -rm -f cminpack/*.lo
distclean-compile:
-rm -f *.tab.c
@@ -1920,13 +1883,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libast_pal_la-palwrap.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libast_pgplot3d_la-grf3d_pgplot.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libast_pgplot_la-grf_pgplot.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@cminpack/$(DEPDIR)/libast_la-dpmpar.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@cminpack/$(DEPDIR)/libast_la-enorm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@cminpack/$(DEPDIR)/libast_la-lmder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@cminpack/$(DEPDIR)/libast_la-lmder1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@cminpack/$(DEPDIR)/libast_la-lmpar.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@cminpack/$(DEPDIR)/libast_la-qrfac.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@cminpack/$(DEPDIR)/libast_la-qrsolv.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -3000,7 +2956,6 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
- -rm -rf cminpack/.libs cminpack/_libs
distclean-libtool:
-rm -f libtool config.lt
@@ -3712,8 +3667,6 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -rm -f cminpack/$(DEPDIR)/$(am__dirstamp)
- -rm -f cminpack/$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -3733,7 +3686,6 @@ clean-am: clean-checkPROGRAMS clean-gene
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf ./$(DEPDIR) cminpack/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -3786,7 +3738,6 @@ installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf ./$(DEPDIR) cminpack/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic