diff options
| author | Eugeniy Mikhailov <evgmik@gmail.com> | 2012-11-28 23:28:39 -0500 |
|---|---|---|
| committer | Eugeniy Mikhailov <evgmik@gmail.com> | 2012-11-28 23:29:19 -0500 |
| commit | f2891fa6f6ea67b9fd6a3fbec4cc6344debfba64 (patch) | |
| tree | 1e49ae63334b2928bf01cc79db10cf5437b07b06 /xmds2 | |
| parent | f58688cf1b100bca69475f0b66c81012078f8a1a (diff) | |
| download | Nresonances-f2891fa6f6ea67b9fd6a3fbec4cc6344debfba64.tar.gz Nresonances-f2891fa6f6ea67b9fd6a3fbec4cc6344debfba64.zip | |
typo in makefile
Diffstat (limited to 'xmds2')
| -rw-r--r-- | xmds2/realistic_Rb/Makefile | 3 | ||||
| -rw-r--r-- | xmds2/realistic_Rb_and_fields/Makefile | 25 |
2 files changed, 20 insertions, 8 deletions
diff --git a/xmds2/realistic_Rb/Makefile b/xmds2/realistic_Rb/Makefile index 583bc6a..1f5c4fd 100644 --- a/xmds2/realistic_Rb/Makefile +++ b/xmds2/realistic_Rb/Makefile @@ -16,7 +16,8 @@ M_FILES = $(patsubst %.xmds,%.m,$(XMDS_FILES)) test_dir = tests test_result_dir = $(test_dir)/testsuite_results -XMDS_INCLUDES_misc = RbChosenRho.txt RbInits.cdata RbEquations.cdata RbAtomConstans.cdata +XMDS_INCLUDES_misc = RbChosenRho.txt RbInits.cdata RbEquations.cdata \ + RbAtomConstants.cdata RbPropEquations.cdata XMDS_INCLUDES_xmds_in_target_dir = $(XMDS_INCLUDES_misc:%=$(test_dir)/%) XMDS_INCLUDES_cdata_in_target_dir = $(XMDS_INCLUDES_misc:%=$(test_result_dir)/%) diff --git a/xmds2/realistic_Rb_and_fields/Makefile b/xmds2/realistic_Rb_and_fields/Makefile index d485891..1f5c4fd 100644 --- a/xmds2/realistic_Rb_and_fields/Makefile +++ b/xmds2/realistic_Rb_and_fields/Makefile @@ -1,9 +1,11 @@ ### -*- make -*- ### This file is part of the Debian xmds package ### Copyright (C) 2006 Rafael Laboissiere -### This file is relased under the GNU General Public License +### This file is released under the GNU General Public License ### NO WARRANTIES! +INSTALL = install --mode=664 -D + ### This makefile can be used to build and run the XMDS examples XMDS_FILES = $(shell ls *.xmds) @@ -12,14 +14,19 @@ CC_FILES = $(patsubst %.xmds,%.cc,$(XMDS_FILES)) XSIL_FILES = $(patsubst %.xmds,%.xsil,$(XMDS_FILES)) M_FILES = $(patsubst %.xmds,%.m,$(XMDS_FILES)) -XMDS_INCLUDES = RbAtomConstants.h RbInits.h +test_dir = tests +test_result_dir = $(test_dir)/testsuite_results +XMDS_INCLUDES_misc = RbChosenRho.txt RbInits.cdata RbEquations.cdata \ + RbAtomConstants.cdata RbPropEquations.cdata +XMDS_INCLUDES_xmds_in_target_dir = $(XMDS_INCLUDES_misc:%=$(test_dir)/%) +XMDS_INCLUDES_cdata_in_target_dir = $(XMDS_INCLUDES_misc:%=$(test_result_dir)/%) XMDS = xmds2 XSIL2GRAPHICS = xsil2graphics all: $(RUN_FILES) -%.run: %.xmds $(XMDS_INCLUDES) +%.run: %.xmds $(XMDS) $< mv $(patsubst %.xmds,%,$<) $@ @@ -48,10 +55,14 @@ $(png_targets): %.png : %.pdf pdf: $(pdf_targets) -test: - cp $(XMDS_FILES) tests/testsuite/ - mkdir -p tests/testsuite_results - cp $(XMDS_INCLUDES) tests/testsuite_results/ +$(XMDS_INCLUDES_cdata_in_target_dir): $(test_result_dir)/% : % + $(INSTALL) $< $@ + +$(XMDS_INCLUDES_xmds_in_target_dir): $(test_dir)/% : % + $(INSTALL) $< $@ + +test: $(XMDS_INCLUDES_cdata_in_target_dir) $(XMDS_INCLUDES_xmds_in_target_dir) + $(INSTALL) $(XMDS_FILES) tests/testsuite/ cd tests; ./run_tests.py test_from_scratch: |