summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2011-12-13 10:26:27 -0800
committerKaz Kylheku <kaz@kylheku.com>2011-12-13 10:26:27 -0800
commitd581aa02b11d67bb097867c44267c4d4cad7c329 (patch)
tree5008891a4354ec568f2543de538a6ad1f0f62f2b
parentd6825dcfed19d2639b304a96d8cec1cabb040783 (diff)
downloadtxr-d581aa02b11d67bb097867c44267c4d4cad7c329.tar.gz
txr-d581aa02b11d67bb097867c44267c4d4cad7c329.tar.bz2
txr-d581aa02b11d67bb097867c44267c4d4cad7c329.zip
* Makefile (repatch): New phony target.
(distclean): Remove mpi directory.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile9
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ca0d8a3..4ab164b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-12-13 Kaz Kylheku <kaz@kylheku.com>
+ * Makefile (repatch): New phony target.
+ (distclean): Remove mpi directory.
+
+2011-12-13 Kaz Kylheku <kaz@kylheku.com>
+
Patch to shrink mpi-int to three words on 32 bit platforms,
so that obj_t stays four pointers wide.
diff --git a/Makefile b/Makefile
index 3d850f40..0ba545bc 100644
--- a/Makefile
+++ b/Makefile
@@ -71,16 +71,21 @@ $(MPI_OBJS): CFLAGS += -DXMALLOC=chk_malloc -DXREALLOC=chk_realloc
$(MPI_OBJS): CFLAGS += -DXCALLOC=chk_calloc -DXFREE=free
.PHONY: rebuild
-rebuild: clean $(PROG)
+rebuild: clean repatch $(PROG)
.PHONY: clean
clean:
rm -f $(PROG) $(OBJS) \
y.tab.c lex.yy.c y.tab.h y.output $(TESTS:.ok=.out)
+.PHONY: repatch
+repatch:
+ cd $(top_srcdir)/mpi-$(mpi_version); quilt pop -af
+ cd $(top_srcdir)/mpi-$(mpi_version); quilt push -a
+
.PHONY: distclean
distclean: clean
- rm -f config.h config.make config.log
+ rm -f config.h config.make config.log $(top_srcdir)/mpi-$(mpi_version)
.PHONY: depend
depend: