From 30e3732e8535674744f3f6cb875ccf986a214b15 Mon Sep 17 00:00:00 2001 From: "Peter W. Draper" Date: Wed, 27 Nov 2013 14:38:15 +0000 Subject: [PATCH] buildsupport: remove more traces of restFP support Note that we have linker magic support in automake as well, that claims generality so is left in place for now --- applications/startcl/Makefile.am | 3 +-- libraries/pcs/dtask/Makefile.am | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/applications/startcl/Makefile.am b/applications/startcl/Makefile.am index 677de05490f..853eb5fe5c8 100644 --- a/applications/startcl/Makefile.am +++ b/applications/startcl/Makefile.am @@ -72,10 +72,9 @@ libtkGwm_la_SOURCES = $(GWM_ROUTINES) libtkGwm_la_LIBADD = -ljpeg atclsh_SOURCES = tclAppInit.c $(NBS_ROUTINES) -# Note C_FC_FCLINK_MAGIC needed under OS X to work around restFP. atclsh_LDADD = libtclAdam.la `nbs_link` `ams_link_adam` `ems_link_adam` \ `cnfrtl_link` \ - @TCL_LD_SEARCH_FLAGS@ @TCL_LIBS@ @FCLIBS@ @C_FC_FCLINK_MAGIC@ + @TCL_LD_SEARCH_FLAGS@ @TCL_LIBS@ @FCLIBS@ awish_SOURCES = tkAppInit.c $(NBS_ROUTINES) awish_LDADD = libtclAdam.la libtkGwm.la `nbs_link` `chr_link_adam` \ diff --git a/libraries/pcs/dtask/Makefile.am b/libraries/pcs/dtask/Makefile.am index 6cbe635e737..f7a1294e66b 100644 --- a/libraries/pcs/dtask/Makefile.am +++ b/libraries/pcs/dtask/Makefile.am @@ -75,7 +75,6 @@ edit = sed \ -e 's,@STAR_CPPFLAGS\@,@STAR_CPPFLAGS@,g' \ -e 's,@STAR_LDFLAGS\@,@STAR_LDFLAGS@,g' \ -e 's,@FCLIBS\@,$(FCLIBS),g' \ - -e 's,@C_FC_FCLINK_MAGIC\@,$(C_FC_FCLINK_MAGIC),g' \ -e 's,@FCFLAGS\@,@FCFLAGS@,g' \ -e "s!@DTASK_LINK_ADAM\@!`PATH=../subpar:$$PATH ./dtask_link_adam`!g" \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \