diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2012-04-20 18:29:27 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2012-04-20 18:29:27 -0700 |
| commit | 21a927997f92fd67e3b4bd07a9264fdd4fa38df9 (patch) | |
| tree | 8a44c8e5729efe22dc20d273c616c3fb556eaedc /Makefile | |
| parent | 6631b687b9761613aee2c07b4ce0c310ff718a70 (diff) | |
| download | txr-21a927997f92fd67e3b4bd07a9264fdd4fa38df9.tar.gz txr-21a927997f92fd67e3b4bd07a9264fdd4fa38df9.tar.bz2 txr-21a927997f92fd67e3b4bd07a9264fdd4fa38df9.zip | |
Fixes for configuring and building in a separate directory.
* configure: MPI is now extracted and patched in the build directory,
not in the source directory.
* Makefile (CFLAGS): Refer to mpi headers relative to current
directory, not $(top_srcdir).
(repatch): Run MPI repatching steps in correct directory.
(clean): Remove extracted MPI from build directory.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -30,7 +30,7 @@ include config.make CFLAGS := -I. -I$(top_srcdir) $(LANG_FLAGS) $(DIAG_FLAGS) \ $(OPT_FLAGS) $(DBG_FLAGS) $(PLATFORM_FLAGS) $(EXTRA_FLAGS) -CFLAGS += -I$(top_srcdir)/mpi-$(mpi_version) +CFLAGS += -Impi-$(mpi_version) CFLAGS := $(filter-out $(REMOVE_FLAGS),$(CFLAGS)) ifneq ($(subst g++,@,$(notdir $(CC))),$(notdir $(CC))) @@ -81,13 +81,13 @@ clean: .PHONY: repatch repatch: - cd $(top_srcdir)/mpi-$(mpi_version); quilt pop -af - cd $(top_srcdir)/mpi-$(mpi_version); quilt push -a + cd mpi-$(mpi_version); quilt pop -af + cd mpi-$(mpi_version); quilt push -a .PHONY: distclean distclean: clean rm -f config.h config.make config.log - rm -rf $(top_srcdir)/mpi-$(mpi_version) + rm -rf mpi-$(mpi_version) .PHONY: depend depend: |