diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-01-19 19:55:01 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-01-19 19:55:01 +0000 |
| commit | b49870c673acfff5664d9629c8128aca9e0d2f63 (patch) | |
| tree | 732beb0ed9425cffd4fa8bcf2695bdbe8fa1ffdb /lib | |
| parent | e4964451690b9118fea1c596060bc0dc92bfbcf6 (diff) | |
Fixed a bug I introduced earlier when I tidied up the rule for
making libraries - now will find the thorn source directories !
Now calls the config_parser.pl script to generate make.thornlist
from ActiveThorns.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@81 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/make/make.configuration | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/make/make.configuration b/lib/make/make.configuration index 678bb644..443b1cfe 100644 --- a/lib/make/make.configuration +++ b/lib/make/make.configuration @@ -57,7 +57,7 @@ $(CCTK_LIBDIR)/lib%.a: update if [ ! -d $(BUILD_DIR) ]; then $(MKDIR) $(BUILD_DIR) ; fi thorn_name=$(@:$(CCTK_LIBDIR)/lib%.a=%); \ if [ "$$thorn_name" = "Cactus" ] ; then src_dir=$(CCTK_HOME)/src ; \ - else src_dir=$(TOOLKIT_DIR)/$(@:$(CCTK_LIBDIR)/lib%.a=$(filter %,$(@:$(CCTK_LIBDIR)/lib%.a=%)))/src ; fi ; \ + else src_dir=$(TOOLKIT_DIR)/$(@:$(CCTK_LIBDIR)/lib%.a=$(filter %/$(@:$(CCTK_LIBDIR)/lib%.a=%), $(THORNS)))/src ; fi ; \ if [ ! -d $(BUILD_DIR)/$$thorn_name ]; then $(MKDIR) $(BUILD_DIR)/$$thorn_name ; fi ; \ cd $(BUILD_DIR)/$$thorn_name ; \ if [ -r "$$src_dir/Makefile" ] ; then make_file=$$src_dir/Makefile ; \ @@ -73,8 +73,9 @@ include $(CONFIG)/make.config.deps # Rule to build the make.thornlist file from the ActiveThorns file $(CONFIG)/make.thornlist: $(TOP)/ActiveThorns - @echo Currently $@ must be edited by hand. - if [ ! -r $@ ] ; then touch $@ ; fi + @echo $(DIVIDER) + @echo Configuring thorns + $(PERL) -s $(CCTK_HOME)/lib/sbin/config_parser.pl -config_dir=$(CONFIG) -cctk_home=$(CCTK_HOME) -top=$(TOP) $< # Rule to build ActiveThorns |