summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog17
-rw-r--r--Makefile17
2 files changed, 30 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f57a7269..4e6fee1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2015-01-01 Kaz Kylheku <kaz@kylheku.com>
+
+ Version 101
+
+ * RELNOTES: Updated.
+
+ * configure, txr.1: Bumped version.
+
+ * share/txr/stdlib/ver.txr: Likewise
+
+2015-01-01 Kaz Kylheku <kaz@kylheku.com>
+
+ * Makefile (rebuild, clean, repatch): Fail these targets if
+ the program is not configured.
+ (distclean): Providing alternative implementation when the
+ program is not configured.
+
2014-12-31 Kaz Kylheku <kaz@kylheku.com>
* lib.c (replace_str, replace_vec): Bugfix. The replacement item
diff --git a/Makefile b/Makefile
index 64146f9e..8decdd7e 100644
--- a/Makefile
+++ b/Makefile
@@ -185,23 +185,32 @@ $(call EACH_CONF,txr.o): CFLAGS += -DTXR_VER=\"$(txr_ver)\"
$(call EACH_CONF,$(MPI_OBJS)): CFLAGS += -DXMALLOC=chk_malloc -DXREALLOC=chk_realloc
$(call EACH_CONF,$$(MPI_OBJS)): CFLAGS += -DXCALLOC=chk_calloc -DXFREE=free
-.PHONY: rebuild
+.PHONY: rebuild clean repatch distclean
+
+ifeq ($(PROG),)
+rebuild clean repatch: notconfigured
+
+distclean:
+ $(V)echo "executing generic cleanup for non-configured directory"
+ rm -f txr txr.exe txr-dbg txr-dbg.exe y.tab.c lex.yy.c y.tab.h y.output
+ rm -rf config
+ rm -rf config.*
+ rm -rf mpi-1.?.?
+else
rebuild: clean repatch $(PROG)
-.PHONY: clean
clean: conftest.clean tests.clean
rm -f $(PROG)$(EXE) $(PROG)-dbg$(EXE) y.tab.c lex.yy.c y.tab.h y.output
rm -rf opt dbg
-.PHONY: repatch
repatch:
cd mpi-$(mpi_version); quilt pop -af
cd mpi-$(mpi_version); quilt push -a
-.PHONY: distclean
distclean: clean
rm -rf $(conf_dir)
rm -rf mpi-$(mpi_version)
+endif
TESTS_TMP := txr.test.out
TESTS_OUT := $(addprefix tst/,\