diff options
Diffstat (limited to 'lib/make/make.config.rules.in')
| -rw-r--r-- | lib/make/make.config.rules.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in index 9e292d06..6afb23c0 100644 --- a/lib/make/make.config.rules.in +++ b/lib/make/make.config.rules.in @@ -67,7 +67,7 @@ endif # object file. ifeq ($(strip $(PERL_BACKUP_NECESSARY)),) define DEPENDENCY_FIXER - $(PERL) -pi -e 's{^\Q$(basename $(basename $@)).o:\E}{$(basename $@).o $(basename $@).d:}' $@ + $(PERL) -pi -e 's{^\s*\Q$(basename $(basename $@)).o\E\s*:}{$(basename $@).o $(basename $@).d:}' $@ endef else define DEPENDENCY_FIXER @@ -86,17 +86,17 @@ define CXX_DEPENDENCIES $(DEPENDENCY_FIXER) endef +define CUCC_DEPENDENCIES + $(CUCC_DEPEND) $< $(INCLUDE_LINE) $(EXTRA_DEFINES:%=-D%) -DCCODE $(CUCC_DEPEND_OUT) + $(DEPENDENCY_FIXER) +endef + define CL_DEPENDENCIES # An OpenCL source file has no external dependencies $(CL_DEPEND) $< $(CL_DEPEND_OUT) $(DEPENDENCY_FIXER) endef -define CU_DEPENDENCIES - $(CU_DEPEND) $< $(INCLUDE_LINE) $(EXTRA_DEFINES:%=-D%) -DCCODE $(CU_DEPEND_OUT) - $(DEPENDENCY_FIXER) -endef - define F77_DEPENDENCIES $(F77_DEPEND) $(INCLUDE_LINE) $(EXTRA_DEFINES:%=-D%) -DFCODE $< $(F77_DEPEND_OUT) $(DEPENDENCY_FIXER) @@ -188,7 +188,7 @@ current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(CUCC) $(CUCCFLAGS) $(CCOMPILEON endef define POSTPROCESS_CU -$(CU_POSTPROCESSING) +$(CUCC_POSTPROCESSING) endef # Define how to do a F77 compilation @@ -338,7 +338,7 @@ endef $(NOTIFY_DIVIDER) %.cu.d: $(SRCDIR)/%.cu - $(CU_DEPENDENCIES) + $(CUCC_DEPENDENCIES) # Build rules for F77 |