diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2019-02-08 00:50:37 -0800 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2019-02-08 00:50:37 -0800 |
| commit | 3ad90f9e7b6806832849db9e1d908d906d06a87b (patch) | |
| tree | 5de1cd14a67dc048125f1e395f2dd8ddc646d9cf | |
| parent | ab258ae6b13be92d2c8bf1a946aae1a1d902f16a (diff) | |
| download | txr-3ad90f9e7b6806832849db9e1d908d906d06a87b.tar.gz txr-3ad90f9e7b6806832849db9e1d908d906d06a87b.tar.bz2 txr-3ad90f9e7b6806832849db9e1d908d906d06a87b.zip | |
build: get rid of .tlo2 files.
After the defvar bugfix in the previous commit, the only
differences between .tlo and .tlo2 files are the names of
a few gensyms here and there. In other words, they are
identical code; therefore, there is no point in compiling
them.
* Makefile (STDLIB_TLOS2): Variable removed.
(%.tlo2): Implicit rule removed.
(stage1 stage2): Phony targets removed.
(all): Directly depends on $(STDLIB_TLOS) without stage1
intermediary.
(clean-tlo): Don't remove $(STDLIB_TLOS2).
| -rw-r--r-- | Makefile | 15 |
1 files changed, 3 insertions, 12 deletions
@@ -65,7 +65,6 @@ EXTRA_OBJS-$(add_win_res) += win/txr.res STDLIB_SRCS := $(wildcard share/txr/stdlib/*.tl) STDLIB_TLOS := $(patsubst %.tl,%.tlo,$(STDLIB_SRCS)) -STDLIB_TLOS2 := $(patsubst %.tl,%.tlo2,$(STDLIB_SRCS)) STDLIB_EARLY_PATS := %/error.tlo # these must be compiled first STDLIB_EARLY_TLOS := $(filter $(STDLIB_EARLY_PATS),$(STDLIB_TLOS)) @@ -193,10 +192,6 @@ win/%.res: $(top_srcdir)win/%.rc $(top_srcdir)win/%.ico %.tlo: %.tl | $(PROG) $(call COMPILE_TL) -%.tlo2: %.tl | $(PROG) - $(call COMPILE_TL) - $(call SH,F=$@ T=$${F%.tlo2}.tlo; cmp -s $$F $$T || cp $$F $$T) - # The following pattern rule is used for test targets built by configure %.o: %.c $(call COMPILE_C) @@ -219,16 +214,12 @@ tainted: endif endif -.PHONY: all stage1 stage2 +.PHONY: all -all: $(BUILD_TARGETS) stage1 stage2 +all: $(BUILD_TARGETS) $(STDLIB_TLOS) $(STDLIB_LATE_TLOS): | $(STDLIB_EARLY_TLOS) -stage1: $(STDLIB_TLOS) - -stage2: $(STDLIB_TLOS2) - $(PROG): $(OPT_OBJS) $(EXTRA_OBJS-y) $(call LINK_PROG,$(OPT_FLAGS)) @@ -360,7 +351,7 @@ clean: conftest.clean clean-tlo rm -rf opt dbg $(EXTRA_OBJS-y) clean-tlo: - rm -f $(STDLIB_TLOS) $(STDLIB_TLOS2) + rm -f $(STDLIB_TLOS) distclean: clean rm -f config.h config.make config.log |