summaryrefslogtreecommitdiff
path: root/lib/make/make.subdir
diff options
context:
space:
mode:
authorgoodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>1999-09-10 13:01:41 +0000
committergoodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>1999-09-10 13:01:41 +0000
commit45d44ba5cda7bcf5a467aaa88f7980e32496d8fa (patch)
tree0198eb171e1ec69a377168f8d40c2b65d8ffa146 /lib/make/make.subdir
parented8ab0f9ed5b28a49a981128500d1d35d1cdba5c (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.subdir')
-rw-r--r--lib/make/make.subdir4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/make/make.subdir b/lib/make/make.subdir
index 73cde479..570f8f9f 100644
--- a/lib/make/make.subdir
+++ b/lib/make/make.subdir
@@ -23,7 +23,7 @@ EXTRA_DEFINES += THORN_IS_$(THORN)
include $(SRCDIR)/make.code.defn
# Turn source file names into object file names
-OBJS = $(patsubst %,%.o,$(basename $(SRCS)))
+OBJS = $(SRCS:%=%.o)
# Build all the object files
.PHONY:all
@@ -41,5 +41,5 @@ include $(CONFIG)/make.config.rules
# Dependency stuff
ifneq ($(strip $(SRCS)),)
--include $(patsubst %,%.d,$(basename $(SRCS)))
+-include $(SRCS:%=%.d)
endif