Skip to content

Commit ebba859

Browse files
committed
More cleanups in removing sys-proclaim
Actually remove the rule for building tools/sys-proclaim.lisp. Add macro GCL_MAXIMA so that we're consistent with other lisp that have FOO_MAXIMA (usually to distinguish between a core file and an executable). Remove gcl_depends_targets and just use GCL_MAXIMA like other lisps. To test these changes, I build maxima from scratch with gcl. Then I touched cl-info.lisp and ran make. Only cl-info was compiled; everything else was loaded.
1 parent c9967ae commit ebba859

1 file changed

Lines changed: 7 additions & 18 deletions

File tree

src/Makefile.am

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -287,27 +287,16 @@ CLEAN_TARGETS += clean-sbcl
287287
if GCL
288288

289289
gcllibdir = $(verpkglibdir)/binary-gcl
290-
291-
EXTRA_SCRIPTS += binary-gcl/maxima
292-
gcllib_SCRIPTS = binary-gcl/maxima
290+
GCL_MAXIMA = binary-gcl/maxima
291+
EXTRA_SCRIPTS += $(GCL_MAXIMA)
292+
gcllib_SCRIPTS = $(GCL_MAXIMA)
293293

294294
EXECUTEGCL = $(GCL_NAME)
295-
BUILT_FILES += binary-gcl/maxima
296-
297-
gcl_depends_targets = (list "binary-gcl/maxima")
298-
299-
#tools/sys-proclaim.lisp: maxima.system *.lisp
300-
# rm -rf binary-gcl
301-
# touch sys-proclaim.lisp
302-
# $(MAKE) bd
303-
# echo '(load "generate-sys-proclaim.lisp") (system::quit)' | $(EXECUTEGCL)
304-
# rm -rf binary-gcl
305-
# mkdir -p tools
306-
# mv sys-proclaim.lisp tools
295+
BUILT_FILES += $(GCL_MAXIMA)
307296

308-
gcl: binary-gcl/maxima
297+
gcl: $(GCL_MAXIMA)
309298

310-
binary-gcl/maxima: gcl-depends.mk
299+
$(GCL_MAXIMA): gcl-depends.mk
311300
$(MAKE) bd
312301
if GCL_ALT_LINK
313302
echo '$(QUIET) $(LOADDEFSYSTEM) $(DEFSYSTEMCOMPILE) (system::quit)' | $(EXECUTEGCL)
@@ -318,7 +307,7 @@ else
318307
endif
319308

320309
gcl-depends.mk: maxima.system Makefile *.lisp
321-
echo $(call MAKE_DEPENDS,$(gcl_depends_targets),gcl-depends.mk.tmp) '(system::quit)' | $(EXECUTEGCL)
310+
echo $(call MAKE_DEPENDS,$(GCL_MAXIMA),gcl-depends.mk.tmp) '(system::quit)' | $(EXECUTEGCL)
322311
sed -e "s#\\\\#/#g" < gcl-depends.mk.tmp > gcl-depends.mk
323312
-include gcl-depends.mk
324313

0 commit comments

Comments
 (0)