diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-09-10 13:01:41 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-09-10 13:01:41 +0000 |
| commit | 45d44ba5cda7bcf5a467aaa88f7980e32496d8fa (patch) | |
| tree | 0198eb171e1ec69a377168f8d40c2b65d8ffa146 /lib/make/make.thornlib | |
| parent | ed8ab0f9ed5b28a49a981128500d1d35d1cdba5c (diff) | |
Change to allow files with the same basename but differnt languages to be
allowed in a thorn.
This also makes the names of the dependency files unique, so should also solve
PR CCTK/75.
You will need to do a <config>-config
after this,
or do
cp lib/make/make.config.rules.in configs/<config>/config-data/make.config.rules
in order for everything to work again.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@894 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/make.thornlib')
| -rw-r--r-- | lib/make/make.thornlib | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/make/make.thornlib b/lib/make/make.thornlib index 6513a0ab..d17cc9ac 100644 --- a/lib/make/make.thornlib +++ b/lib/make/make.thornlib @@ -56,7 +56,7 @@ SRCS = $(CCTK_SRCS) SUBDIRS = $(LOCAL_SUBDIRS) # Turn source file names into object file names -OBJS = $(patsubst %,%.o,$(basename $(SRCS))) +OBJS = $(SRCS:%=%.o) $(NAME): $(addsuffix .check, $(SUBDIRS)) $(OBJS) $(SRCDIR)/make.code.defn $(foreach DIR,$(SUBDIRS), $(SRCDIR)/$(DIR)/make.code.defn) @echo $(DIVIDER) @@ -90,5 +90,5 @@ $(addsuffix /make.identity, $(SUBDIRS)): # Dependency stuff ifneq ($(strip $(LOCAL_SRCS)),) --include $(patsubst %,%.d,$(basename $(LOCAL_SRCS))) +-include $(LOCAL_SRCS:%=%.d) endif |