summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorallen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac>1999-01-29 20:36:29 +0000
committerallen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac>1999-01-29 20:36:29 +0000
commit41f5bd04a10996967d9bd8e4c9b916cb6d457c93 (patch)
tree6554711d9d9e6e7b6be9427704cd14b9e6897330
parentd82cb23b86be5275292c605cf64d2d85f9d1cc61 (diff)
Fixed problems with fortran with preprocessing
git-svn-id: http://svn.cactuscode.org/flesh/trunk@153 17b73243-c579-4c4c-a9d2-2d5706c11dac
-rw-r--r--lib/make/make.config.rules.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in
index 9de09cac..95817e38 100644
--- a/lib/make/make.config.rules.in
+++ b/lib/make/make.config.rules.in
@@ -42,7 +42,7 @@ endef
# Define how to do a F77 compilation
define PREPROCESS_F77
-$(CPP) $(CPPFLAGS) $< | $(PERL) $(CCTK_HOME)/lib/sbin/f_file_processor.pl $(CONFIG) > $(notdir $<)
+cat $< | $(CPP) $(CPPFLAGS) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE - | $(PERL) $(CCTK_HOME)/lib/sbin/f_file_processor.pl > $(notdir $<)
endef
define COMPILE_F77
@@ -54,7 +54,7 @@ endef
# Define how to do a F90 compilation
define PREPROCESS_F90
-$(CPP) $(CPPFLAGS) $< | $(PERL) $(CCTK_HOME)/lib/sbin/f_file_processor.pl $(CONFIG) > $(notdir $<)
+cat $< | $(CPP) $(CPPFLAGS) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE - | $(PERL) $(CCTK_HOME)/lib/sbin/f_file_processor.pl > $(notdir $<)
endef
define COMPILE_F90
@@ -105,7 +105,7 @@ endef
@echo Postprocessing $<
$(POSTPROCESS_F77)
-%.d: $(SRCDIR)/%.F77
+%.d: $(SRCDIR)/%.F77
$(CPP) -M $(F77FLAGS) $< $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE > $@
# Build rules for F90
@@ -120,5 +120,5 @@ endef
$(POSTPROCESS_F90)
%.d: $(SRCDIR)/%.F
- $(CPP) -M $(F77FLAGS) $< $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE > $@
+ cat $< | $(CPP) -M $(F90FLAGS) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE - > $@