diff -Naur ast-5.1-0/Makefile.in ast-5.1-0.new/Makefile.in --- ast-5.1-0/Makefile.in 2009-03-04 14:46:43.000000000 -0500 +++ ast-5.1-0.new/Makefile.in 2009-09-15 23:26:24.000000000 -0400 @@ -77,7 +77,15 @@ "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -libast_la_LIBADD = +libast_la_LIBADD = \ + libast_err.la \ + libast_grf3d.la \ + libast_grf_2.0.la \ + libast_grf_3.2.la \ + libast_pal.la \ + libast_wcslib.la \ + -lm + am__objects_1 = libast_la-axis.lo libast_la-box.lo libast_la-c2f77.lo \ libast_la-channel.lo libast_la-circle.lo libast_la-cmpframe.lo \ libast_la-cmpmap.lo libast_la-cmpregion.lo \ @@ -163,10 +171,10 @@ libast_pal_la_LIBADD = am_libast_pal_la_OBJECTS = libast_pal_la-pal.lo libast_pal_la_OBJECTS = $(am_libast_pal_la_OBJECTS) -libast_pgplot_la_LIBADD = +libast_pgplot_la_LIBADD = -lpgplot am_libast_pgplot_la_OBJECTS = libast_pgplot_la-grf_pgplot.lo libast_pgplot_la_OBJECTS = $(am_libast_pgplot_la_OBJECTS) -libast_pgplot3d_la_LIBADD = +libast_pgplot3d_la_LIBADD = -lpgplot am_libast_pgplot3d_la_OBJECTS = libast_pgplot3d_la-grf3d_pgplot.lo libast_pgplot3d_la_OBJECTS = $(am_libast_pgplot3d_la_OBJECTS) libast_wcslib_la_LIBADD = @@ -682,7 +690,6 @@ nodist_include_HEADERS = ast.h AST_PAR include_MESSAGES = AST_ERR ast_err.h lib_LTLIBRARIES = \ - libast.la \ libast_err.la \ libast_ems.la \ libast_drama.la \ @@ -692,11 +699,12 @@ libast_pgplot.la \ libast_pgplot3d.la \ libast_pal.la \ - libast_wcslib.la + libast_wcslib.la \ + libast.la -stardocs_DATA = @STAR_LATEX_DOCUMENTATION@ -dist_starnews_DATA = ast.news -dist_pkgdata_DATA = LICENCE +stardocs_DATA = +dist_starnews_DATA = +dist_pkgdata_DATA = # Make all library code position independent by default. This is handy for # creating shareable libraries from the static ones (Java JNI libraries). @@ -813,7 +821,7 @@ #ast_test_LDADD = `ast_link` # Expand ast_link to avoid libast_pass2, which causes problems for Solaris ast_test_LDADD = libast.la libast_pal.la libast_grf_3.2.la libast_wcslib.la libast_grf_2.0.la libast_grf3d.la libast_err.la -lm -starfacs_DATA = fac_1521_err +starfacs_DATA = all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -2608,7 +2616,6 @@ echo ""; \ echo ""; \ ) >$$MF; \ - $(INSTALL_DATA) $$MF $(DESTDIR)$(STAR_MANIFEST_DIR)/$(PACKAGE); \ else \ echo "Installation of component $(DESTDIR)$(STAR_MANIFEST_DIR)/$(PACKAGE) failed" >&2; \ fi; \ @@ -2762,14 +2769,14 @@ $(mkdir_p) $(DESTDIR)$(libdir) cd $(DESTDIR)$(libdir); \ for f in `ls libast.*`; do \ - ff=`echo $$f | sed -e 's/libast/libast_pass2/'`; \ + ff=`echo $$f | sed -e 's/libast\./libast_pass2\./'`; \ if test -f "$$ff"; then rm "$$ff"; fi; \ $(LN_S) $$f $$ff; \ $(MANIFEST) && echo "MANIFEST:$(DESTDIR)$(libdir)/$$ff" || :; \ done; \ if test -f "libast.la"; then \ if test -f "libast_pass2.la"; then rm "libast_pass2.la"; fi; \ - sed -e 's/libast/libast_pass2/g' libast.la > libast_pass2.la; \ + sed -e 's/libast\./libast_pass2\./g' libast.la > libast_pass2.la; \ fi @PREDIST@version.h: version.h.in configure.ac @PREDIST@ rm -f $@; $(predist_subs) version.h.in >$@