diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/make/make.config.rules.in | 29 | ||||
-rw-r--r-- | lib/make/make.subdir | 4 | ||||
-rw-r--r-- | lib/make/make.thornlib | 4 |
3 files changed, 19 insertions, 18 deletions
diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in index dbc3271f..f0ff2047 100644 --- a/lib/make/make.config.rules.in +++ b/lib/make/make.config.rules.in @@ -14,6 +14,7 @@ # all module files end up there. # # @enddesc +# @version $Header$ # @@*/ # Dividers to make the screen output slightly nicer @@ -102,7 +103,7 @@ endef # Build rules for C -%.o: $(SRCDIR)/%.c +%.c.o: $(SRCDIR)/%.c @echo $(DIVIDER) @echo Preprocessing $< $(PREPROCESS_C) @@ -112,12 +113,12 @@ endef $(POSTPROCESS_C) -%.d: $(SRCDIR)/%.c +%.c.d: $(SRCDIR)/%.c $(C_DEPENDENCIES) # Build rules for C++ -%.o: $(SRCDIR)/%.cc +%.cc.o: $(SRCDIR)/%.cc @echo $(DIVIDER) @echo Preprocessing $< $(PREPROCESS_CXX) @@ -126,7 +127,7 @@ endef @echo Postprocessing $< $(POSTPROCESS_CXX) -%.o: $(SRCDIR)/%.C +%.C.o: $(SRCDIR)/%.C @echo $(DIVIDER) @echo Preprocessing $< $(PREPROCESS_CXX) @@ -135,15 +136,15 @@ endef @echo Postprocessing $< $(POSTPROCESS_CXX) -%.d: $(SRCDIR)/%.cc +%.cc.d: $(SRCDIR)/%.cc $(CXX_DEPENDENCIES) -%.d: $(SRCDIR)/%.C +%.C.d: $(SRCDIR)/%.C $(CXX_DEPENDENCIES) # Build rules for F77 -%.o: $(SRCDIR)/%.F77 +%.F77.o: $(SRCDIR)/%.F77 @echo $(DIVIDER) @echo Preprocessing $< $(PREPROCESS_F77) @@ -152,7 +153,7 @@ endef @echo Postprocessing $< $(POSTPROCESS_F77) -%.o: $(SRCDIR)/%.f77 +%.f77.o: $(SRCDIR)/%.f77 @echo $(DIVIDER) @echo Copying $< $(PREPROCESS_f77) @@ -161,16 +162,16 @@ endef @echo Postprocessing $< $(POSTPROCESS_F77) -%.d: $(SRCDIR)/%.F77 +%.F77.d: $(SRCDIR)/%.F77 $(F77_DEPENDENCIES) -%.d: $(SRCDIR)/%.f77 +%.f77.d: $(SRCDIR)/%.f77 $(F77_DEPENDENCIES) # Build rules for F90 -%.o: $(SRCDIR)/%.F +%.F.o: $(SRCDIR)/%.F @echo $(DIVIDER) @echo Preprocessing $< $(PREPROCESS_F90) @@ -179,7 +180,7 @@ endef @echo Postprocessing $< $(POSTPROCESS_F90) -%.o: $(SRCDIR)/%.f +%.f.o: $(SRCDIR)/%.f @echo $(DIVIDER) @echo Copying $< $(PREPROCESS_f) @@ -188,9 +189,9 @@ endef @echo Postprocessing $< $(POSTPROCESS_F90) -%.d: $(SRCDIR)/%.F +%.F.d: $(SRCDIR)/%.F $(F_DEPENDENCIES) -%.d: $(SRCDIR)/%.f +%.f.d: $(SRCDIR)/%.f $(F_DEPENDENCIES) 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 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 |