simplify plot-lib build

--- slower, but less of a hack

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)
+	$(MAKE) plot-lib
-	$(WITH_ENV) ../racket/racket3m $(XCOLLECTS) $(srcdir)/build.rkt "libfit" $(FIT_SRCS)
-
-# In just-cgc mode, it's slow to load build.rkt:
 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:

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"))