From 5354e557d445ce040f31f62a55a90ae4e21f5390 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Mon, 8 Nov 2010 06:31:46 -0700
Subject: [PATCH] simplify plot-lib build  --- slower, but less of a hack

---
 src/plot/Makefile.in         | 28 ++++++++++++++++------------
 src/racket/gc2/xform-mod.rkt |  7 -------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/plot/Makefile.in b/src/plot/Makefile.in
index e52176c5b1..581b9799bf 100644
--- a/src/plot/Makefile.in
+++ b/src/plot/Makefile.in
@@ -10,6 +10,15 @@ builddir = @builddir@
 
 ICP=@ICP@
 
+CC = @CC@
+
+# Setting the compiler and linker when using dynext
+#   seems like a good idea, but it doesn't work with
+#  libtool as the compiler. So, we trust the configuration
+#  that is built into dynext, instead.
+# WITH-ENV = env CC="$(CC)" LD="@MZLINKER@"
+WITH_ENV =
+
 PLPLOT_SRCS = $(srcdir)/plplot/dc_drv.c \
               $(srcdir)/plplot/plcont.c \
               $(srcdir)/plplot/plfill.c \
@@ -41,22 +50,17 @@ FIT_SRCS = $(srcdir)/fit/fit.c $(srcdir)/fit/matrix.c
 
 XCOLLECTS = -X ../racket/gc2/xform-collects 
 
-CC = @CC@
+plot-lib: libplplot@SO_SUFFIX@ libfit@SO_SUFFIX@
 
-# This seems like a good idea, but it doesn't work with
-#  libtool as the compiler. So, we trust the configuration
-#  taht is built into dynext, instead.
-# WITH-ENV = env CC="$(CC)" LD="@MZLINKER@"
-WITH_ENV =
-
-# In 3m mode, we can reply on an xform-collects setup
 3m:
-	$(WITH_ENV) ../racket/racket3m $(XCOLLECTS) $(srcdir)/build.rkt "libplplot" $(PLPLOT_SRCS)
-	$(WITH_ENV) ../racket/racket3m $(XCOLLECTS) $(srcdir)/build.rkt "libfit" $(FIT_SRCS)
-
-# In just-cgc mode, it's slow to load build.rkt:
+	$(MAKE) plot-lib
 cgc:
+	$(MAKE) plot-lib
+
+libplplot@SO_SUFFIX@:
 	$(WITH_ENV) ../racket/racketcgc -c $(srcdir)/build.rkt "libplplot" $(PLPLOT_SRCS)
+
+libfit@SO_SUFFIX@:
 	$(WITH_ENV) ../racket/racketcgc -c $(srcdir)/build.rkt "libfit" $(FIT_SRCS)
 
 install:
diff --git a/src/racket/gc2/xform-mod.rkt b/src/racket/gc2/xform-mod.rkt
index 5e972f3b23..32a32fb8cf 100644
--- a/src/racket/gc2/xform-mod.rkt
+++ b/src/racket/gc2/xform-mod.rkt
@@ -2,13 +2,6 @@
   (require (lib "xform.rkt" "compiler" "private")
 	   mzlib/cmdline)
 
-  ;; bogus requires that set up files for "plot" compilation:
-  (require (only racket/path)
-           (only racket/file)
-           (only dynext/file)
-           (only dynext/link)
-           (only dynext/compile))
-
   (define precompiling-header? (getenv "XFORM_PRECOMP"))
   (define precompiled-header (getenv "XFORM_USE_PRECOMP"))