diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2015-04-22 20:10:44 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2015-04-22 20:10:44 -0700 |
| commit | b0ebf843ce862f8448aad85e61cc1b3727745fd0 (patch) | |
| tree | 47b934781729c5d2143de03eb8021521771c500f /Makefile | |
| parent | 790cbdccac0540d2af12438fc7bccef2e17bc124 (diff) | |
| download | txr-b0ebf843ce862f8448aad85e61cc1b3727745fd0.tar.gz txr-b0ebf843ce862f8448aad85e61cc1b3727745fd0.tar.bz2 txr-b0ebf843ce862f8448aad85e61cc1b3727745fd0.zip | |
Switch to in-tree mpi directory.
* Makefile (CFLAGS, MPI_OBJS): Refer to mpi directory without version
number.
(repatch): Target removed.
(distclean): Don't try to remove old unpacked tarball mpi directory.
* configure (mpi_version, have_quilt, have_patch): Variables removed.
(gen_config_make): Do not generate mpi_version make variable.
Do not test for quilt or patch. No longer extract MPI tarball or
try to apply patches.
* mpi-1.8.6.tar.gz: File removed.
* mpi-patches: Directory and all files under it removed.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -29,7 +29,7 @@ VERBOSE := CFLAGS := -iquote $(conf_dir) -iquote $(top_srcdir) \ $(LANG_FLAGS) $(DIAG_FLAGS) \ $(DBG_FLAGS) $(PLATFORM_FLAGS) $(EXTRA_FLAGS) -CFLAGS += -iquote mpi-$(mpi_version) +CFLAGS += -iquote mpi CFLAGS := $(filter-out $(REMOVE_FLAGS),$(CFLAGS)) ifneq ($(subst g++,@,$(notdir $(CC))),$(notdir $(CC))) @@ -63,7 +63,7 @@ endif # MPI objects MPI_OBJ_BASE=mpi.o mplogic.o -MPI_OBJS := $(addprefix mpi-$(mpi_version)/,$(MPI_OBJ_BASE)) +MPI_OBJS := $(addprefix mpi/,$(MPI_OBJ_BASE)) OBJS += $(MPI_OBJS) @@ -233,13 +233,8 @@ 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 $(EXTRA_OBJS-y) -repatch: - cd mpi-$(mpi_version); quilt pop -af - cd mpi-$(mpi_version); quilt push -a - distclean: clean rm -rf $(conf_dir) - rm -rf mpi-$(mpi_version) endif TESTS_TMP := txr.test.out |