diff options
| author | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-01-19 14:01:08 +0000 |
|---|---|---|
| committer | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-01-19 14:01:08 +0000 |
| commit | 539f0616473c60e35b88780ac7b96d4cba1ef6f9 (patch) | |
| tree | 77142d870b6e312193ae09b0a64bfc5683d9ef04 /lib/make/make.config.rules.in | |
| parent | 020da1a8deb806b7c4ad5ea9588d1e739b999eb5 (diff) | |
Protect the // concatenation operator in Fortran again
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3523 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/make.config.rules.in')
| -rw-r--r-- | lib/make/make.config.rules.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in index f449010f..4228bd4a 100644 --- a/lib/make/make.config.rules.in +++ b/lib/make/make.config.rules.in @@ -79,7 +79,7 @@ endef define PREPROCESS_C cat $< | $(PERL) -s $(C_FILE_PROCESSOR) -source_file_name=\"$<\" $(CONFIG) > $(notdir $<) endef - + define COMPILE_C current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(CC) $(CFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(notdir $<) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE endef @@ -103,7 +103,7 @@ endef # Define how to do a F77 compilation define PREPROCESS_F77 -$(FPP) $(FPPFLAGS) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE $< | sed -e 's/__FORTRANFILE__/\"$(basename $(notdir $<)).F77\"/g' | $(PERL) -s $(F_FILE_PROCESSOR) > $(basename $(notdir $<)).f +cat $< | sed -e 's.//.(CCTK_AUTOMATICALLY_GENERATED_CONCATENATION_PROTECTION).g' | $(FPP) $(FPPFLAGS) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE | sed -e 's.(CCTK_AUTOMATICALLY_GENERATED_CONCATENATION_PROTECTION).//.g' | sed -e 's/__FORTRANFILE__/\"$(basename $(notdir $<)).F77\"/g' | $(PERL) -s $(F_FILE_PROCESSOR) > $(basename $(notdir $<)).f endef define COMPILE_F77 @@ -116,7 +116,7 @@ endef # Define how to do a fixed-format F90 compilation define PREPROCESS_F -$(FPP) $(FPPFLAGS) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE -DF90CODE $< | sed -e 's/__FORTRANFILE__/\"$(basename $(notdir $<)).F\"/g' | $(PERL) -s $(F_FILE_PROCESSOR) > $(basename $(notdir $<)).f +cat $< | sed -e 's.//.(CCTK_AUTOMATICALLY_GENERATED_CONCATENATION_PROTECTION).g' | $(FPP) $(FPPFLAGS) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE -DF90CODE | sed -e 's.(CCTK_AUTOMATICALLY_GENERATED_CONCATENATION_PROTECTION).//.g' | sed -e 's/__FORTRANFILE__/\"$(basename $(notdir $<)).F\"/g' | $(PERL) -s $(F_FILE_PROCESSOR) > $(basename $(notdir $<)).f endef define COMPILE_F @@ -129,7 +129,7 @@ endef # Define how to do a free-format F90 compilation define PREPROCESS_F90 -$(FPP) $(FPPFLAGS) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE $< | sed -e 's/__FORTRANFILE__/\"$(basename $(notdir $<)).F90\"/g' | $(PERL) -s $(F_FILE_PROCESSOR) -free_format > $(basename $(notdir $<)).$(F90_SUFFIX) +cat $< | sed -e 's.//.(CCTK_AUTOMATICALLY_GENERATED_CONCATENATION_PROTECTION).g' | $(FPP) $(FPPFLAGS) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE | sed -e 's.(CCTK_AUTOMATICALLY_GENERATED_CONCATENATION_PROTECTION).//.g' | sed -e 's/__FORTRANFILE__/\"$(basename $(notdir $<)).F90\"/g' | $(PERL) -s $(F_FILE_PROCESSOR) -free_format > $(basename $(notdir $<)).$(F90_SUFFIX) endef define COMPILE_F90 |