diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-12-15 18:04:01 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-12-15 18:04:01 +0000 |
| commit | 596d9b6e4bb1c524a8d197b01f7e7268884955b5 (patch) | |
| tree | 145947ed13044180e41433353f3e74afd186f831 /lib/make/make.configuration | |
| parent | 31d6a423e2b3c01e43116b24a4310d4776aaefd5 (diff) | |
Tidied up the versioning stuff a bit.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1954 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/make.configuration')
| -rw-r--r-- | lib/make/make.configuration | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/make/make.configuration b/lib/make/make.configuration index a060f7da..f32acb37 100644 --- a/lib/make/make.configuration +++ b/lib/make/make.configuration @@ -75,10 +75,10 @@ endif UTIL_DIR=$(EXEDIR)$(DIRSEP)$(CONFIG_NAME) # Build the executable -$(EXEDIR)$(DIRSEP)$(EXE): $(CONFIG)/make.thornlist $(CONFIG)/cctk_version.h $(patsubst %,$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX),$(notdir $(THORNS) $(CACTUSLIBS))) +$(EXEDIR)$(DIRSEP)$(EXE): $(CONFIG)/make.thornlist $(CONFIG)/cctki_version.h $(patsubst %,$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX),$(notdir $(THORNS) $(CACTUSLIBS))) @echo $(DIVIDER) @echo Creating $(EXE) in $(EXEDIR) from $(THORNS) - $(CC) $(OPTIMISE_C) $(DEBUG_C) $(CFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$(TOP)$(DIRSEP)datestamp.o -I$(CONFIG) $(subst /,$(DIRSEP),$(DATESTAMP)) + $(CC) $(OPTIMISE_C) $(DEBUG_C) $(CFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$(TOP)$(DIRSEP)datestamp.o -I$(subst /,$(DIRSEP), $(CCTK_HOME)/src/include) -I$(CONFIG) $(subst /,$(DIRSEP),$(DATESTAMP)) if [ ! -d $(EXEDIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(EXEDIR) ; fi $(LD) $(CREATEEXE)$(OPTIONSEP)$(subst /,$(DIRSEP),$@) $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $(subst /,$(DIRSEP), $(TOP)/datestamp.o) $(CACTUSLIBLINKLINE) $(GENERAL_LIBRARIES) @echo $(DIVIDER) @@ -86,14 +86,14 @@ $(EXEDIR)$(DIRSEP)$(EXE): $(CONFIG)/make.thornlist $(CONFIG)/cctk_version.h $(pa @echo $(DIVIDER) # Version file -$(CONFIG)/cctk_version.h: $(CCTK_HOME)/Makefile - echo "#ifndef _CCTK_VERSION_H_" > $@ - echo "#define _CCTK_VERSION_H_" >> $@ +$(CONFIG)/cctki_version.h: $(CCTK_HOME)/Makefile + echo "#ifndef _CCTKI_VERSION_H_" > $@ + echo "#define _CCTKI_VERSION_H_" >> $@ echo "#define CCTK_VERSION_MAJOR $(CCTK_VERSION_MAJOR)" >> $@ echo "#define CCTK_VERSION_MINOR $(CCTK_VERSION_MINOR)" >> $@ echo "#define CCTK_VERSION_OTHER $(CCTK_VERSION_OTHER)" >> $@ echo "#define CCTK_VERSION $(CCTK_VERSION)" >> $@ - echo "#endif /* _CCTK_VERSION_H_*/" >> $@ + echo "#endif /* _CCTKI_VERSION_H_*/" >> $@ # Build a thorn library # Libraries go into the appropriate library directory |