Blob Blame History Raw
diff -up ast-9.2.1/Makefile.in.bundled ast-9.2.1/Makefile.in
--- ast-9.2.1/Makefile.in.bundled	2020-09-21 20:14:36.658015929 -0600
+++ ast-9.2.1/Makefile.in	2020-09-21 20:15:34.316467189 -0600
@@ -211,9 +211,6 @@ am__libast_la_SOURCES_DIST = src/yamlcha
 	src/xmlchan.h pal2ast.h erfa2ast.h src/ems.h src/err.h \
 	src/Ers.h src/f77.h src/grf.h src/grf3d.h src/pg3d.h \
 	src/loader.h wcslib/wcsmath.h src/c2f77.h GRF_PAR AST_ERR \
-	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 \
 	wcslib/proj.c wcslib/tpn.c wcslib/wcstrig.c
 am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = src/libast_la-yamlchan.lo src/libast_la-axis.lo \
@@ -321,10 +318,7 @@ am__objects_1 = src/libast_la-yamlchan.l
 @NOFORTRAN_FALSE@	src/libast_la-fzoommap.lo
 am__objects_3 =
 am__objects_4 = $(am__objects_3)
-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_5 =
 am__objects_6 = wcslib/libast_la-proj.lo wcslib/libast_la-tpn.lo \
 	wcslib/libast_la-wcstrig.lo
 am_libast_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
@@ -1454,17 +1448,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
@@ -1490,7 +1473,7 @@ include_MESSAGES = AST_ERR ast_err.h
 # the main include directory.
 @TOPINCLUDE_TRUE@include_HEADERS = GRF_PAR src/grf.h src/grf3d.h
 @TOPINCLUDE_TRUE@nodist_include_HEADERS = ast.h AST_PAR
-@EXTERNAL_PAL_FALSE@PAL_LIB = libast_pal.la
+@EXTERNAL_PAL_FALSE@PAL_LIB = libast_pal.la -lcminpack -lerfa
 @EXTERNAL_PAL_TRUE@PAL_LIB = 
 lib_LTLIBRARIES = \
     $(PAL_LIB) \
@@ -1543,7 +1526,7 @@ libast_la_SOURCES = \
     ast_err.h
 
 libast_la_LDFLAGS = -version-info @version_info@
-@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
@@ -1614,7 +1597,7 @@ astbad_SOURCES = src/astbad.c src/points
 # 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
@@ -2052,26 +2035,6 @@ src/libast_la-fxmlchan.lo: src/$(am__dir
 	src/$(DEPDIR)/$(am__dirstamp)
 src/libast_la-fzoommap.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-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)
 wcslib/$(am__dirstamp):
 	@$(MKDIR_P) wcslib
 	@: > wcslib/$(am__dirstamp)
@@ -2235,8 +2198,6 @@ uninstall-dist_binSCRIPTS:
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f cminpack/*.$(OBJEXT)
-	-rm -f cminpack/*.lo
 	-rm -f src/*.$(OBJEXT)
 	-rm -f src/*.lo
 	-rm -f wcslib/*.$(OBJEXT)
@@ -2247,13 +2208,6 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ast_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libast_pal_la-palwrap.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@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/astbad.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libast_drama_la-err_drama.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libast_ems_la-err_ems.Plo@am__quote@
@@ -3573,7 +3527,6 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-	-rm -rf cminpack/.libs cminpack/_libs
 	-rm -rf src/.libs src/_libs
 	-rm -rf wcslib/.libs wcslib/_libs
 
@@ -4335,8 +4288,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)
 	-rm -f src/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/$(am__dirstamp)
 	-rm -f wcslib/$(DEPDIR)/$(am__dirstamp)