diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-06-25 20:42:56 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-06-25 20:42:56 +0000 |
| commit | 83dede5d57dc3d0827cebf9c9fd44d23b054f2d7 (patch) | |
| tree | 79fe40ec94dfa78ffba64b3a30bdc8c7196de4e1 /lib/make/make.config.rules.in | |
| parent | 0b6da916508c5d3444b8b8acbea1b63d5bf5a147 (diff) | |
Lots more changes to get things working under NT.
Almost there. Everything seems to compile, modulo a problem I just spotted,
with only the final linking remaining.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@589 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/make.config.rules.in')
| -rw-r--r-- | lib/make/make.config.rules.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in index 81ea9639..910f639c 100644 --- a/lib/make/make.config.rules.in +++ b/lib/make/make.config.rules.in @@ -26,7 +26,7 @@ cat $< | $(PERL) $(C_FILE_PROCESSOR) $(CONFIG) > $(notdir $<) endef define COMPILE_C -current_wd=`pwd` ; cd $(SCRATCH_BUILD) ; $(CC) $(CFLAGS) $(CCOMPILEONLY) $$current_wd/$@ $$current_wd/$(notdir $<) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE +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 define POSTPROCESS_C @@ -38,7 +38,7 @@ cat $< | $(PERL) $(CCTK_HOME)/lib/sbin/c_file_processor.pl $(CONFIG) > $(notdir endef define COMPILE_CXX -current_wd=`pwd` ; cd $(SCRATCH_BUILD) ; $(CXX) $(CXXFLAGS) $(CCOMPILEONLY) $$current_wd/$@ $$current_wd/$(notdir $<) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE +current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(CXX) $(CXXFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(notdir $<) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE endef define POSTPROCESS_CXX @@ -50,7 +50,7 @@ cat $< | sed 's.//.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.g' | endef define COMPILE_F77 -current_wd=`pwd` ; cd $(SCRATCH_BUILD) ; $(F77) $(F77FLAGS) $(FCOMPILEONLY) $$current_wd/$@ $$current_wd/$(notdir $<) $(INC_DIRS:%=-I%) +current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(F77) $(F77FLAGS) $(FCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(notdir $<) $(INC_DIRS:%=-I%) endef define POSTPROCESS_F77 @@ -62,7 +62,7 @@ cat $< | sed 's.//.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.g' | endef define COMPILE_F90 -current_wd=`pwd` ; cd $(SCRATCH_BUILD) ; $(F90) $(F90FLAGS) $(FCOMPILEONLY) $$current_wd/$@ $$current_wd/$(basename $(notdir $<)).f $(INC_DIRS:%=-I%) +current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(F90) $(F90FLAGS) $(FCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(basename $(notdir $<)).f $(INC_DIRS:%=-I%) endef define POSTPROCESS_F90 @@ -82,7 +82,7 @@ endef %.d: $(SRCDIR)/%.c - $(CC) -E -M $(CPPFLAGS) $< $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE > $@ + $(C_DEPEND) $< $(INC_DIRS:%=-I%) $(SYS_INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE > $@ # Build rules for C++ @@ -105,10 +105,10 @@ endef $(POSTPROCESS_CXX) %.d: $(SRCDIR)/%.cc - $(CXX) -E -M $(CPPFLAGS) $< $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE > $@ + $(CXX_DEPEND) $< $(INC_DIRS:%=-I%) $(SYS_INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE > $@ %.d: $(SRCDIR)/%.C - $(CXX) -E -M $(CPPFLAGS) $< $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE > $@ + $(CXX) -E -M $(CPPFLAGS) $< $(INC_DIRS:%=-I%) $(SYS_INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE > $@ # Build rules for F77 |