diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-05-19 09:53:23 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-05-19 09:53:23 +0000 |
| commit | 88bd58c546d70805d02a43d51a1640fb398aa5be (patch) | |
| tree | 66b93f4b66f8e14189aeb6af6cd89841a27510c9 /lib/make/make.configuration | |
| parent | 0ead39f665ce2925e8818b5c1be319453abdb01e (diff) | |
Changed to using the cygwin version of Perl under cygwin. This has
the translation of CCTK_HOME to a windows format from the master Makefile,
and forced the addition of a new Make macro
TRANSLATE_DIRS
which is used in various places in Make to translate things like
/cygwin/f/...
into
f:\...
This is a 'call'able macro in Make, and defaults to $(1).
There is a new subroutine in RunTestUtils which serves the same purpose.
This change should not affect anyone not using Cactus on Windows. If you
are using Windows you will need to reconfigure, making sure that the Perl
you use is the cygwin one and not the ActiveState one.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3742 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/make.configuration')
| -rw-r--r-- | lib/make/make.configuration | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/make/make.configuration b/lib/make/make.configuration index 365b1ed6..b426c143 100644 --- a/lib/make/make.configuration +++ b/lib/make/make.configuration @@ -38,9 +38,6 @@ ifneq ($(strip $(OPTIMIZE)), ) $(warning "You specified 'OPTIMIZE=$(OPTIMIZE)'. This option is evaluated only at configuration time and will be ignored at compile time.") endif - -DATESTAMP = $(CCTK_HOME)/src/datestamp.c - export MAKE_DIR = $(CCTK_HOME)/lib/make FLESHLIB = Cactus @@ -55,6 +52,15 @@ DIVIDER = $(DIVEL)$(DIVEL)$(DIVEL)$(DIVEL) # Include the definitions for this configuration include $(CONFIG)/make.config.defn +# Remove this line in 4.0 beta 16, by which all configs should have this defined +ifndef TRANSFORM_DIRS +TRANSFORM_DIRS = $(1) +endif + +# Define the name of the source file which is the one object on the linkline + +DATESTAMP = $(CCTK_HOME)/src/datestamp.c + export PERLINTERP = $(shell echo $(PERL) | sed 's,^/cygdrive/\(.\)/,\1:/,' | sed 's,^//\(.\)/,\1:/,' ) # Use a phony main target to make sure we print a nice ending message 8-) @@ -129,9 +135,9 @@ ALLCACTUSLIBS = $(notdir $(CACTUSLIBS) $(THORN_LINKLIST) $(CACTUSLIBS)) # Build the executable $(EXEDIR)$(DIRSEP)$(EXE): $(CONFIG)/make.thornlist $(CONFIG)/cctki_version.h $(patsubst %,$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX),$(notdir $(THORNS) $(CACTUSLIBS))) @echo Creating $(EXE) in $(EXEDIR) from $(THORNS) - $(CC) $(OPTIMISE_C) $(DEBUG_C) $(CFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$(TOP)$(DIRSEP)datestamp.o -I$(subst /,$(DIRSEP),$(CCTK_HOME)/src/include) -I$(CONFIG) $(subst /,$(DIRSEP),$(DATESTAMP)) + $(CC) $(OPTIMISE_C) $(DEBUG_C) $(CFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)"$(call TRANSFORM_DIRS,$(TOP)/datestamp.o)" -I"$(call TRANSFORM_DIRS,$(CCTK_HOME)/src/include)" -I"$(call TRANSFORM_DIRS,$(CONFIG))" "$(call TRANSFORM_DIRS,$(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) + $(LD) $(CREATEEXE)$(OPTIONSEP)"$(call TRANSFORM_DIRS,$@)" $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) "$(call TRANSFORM_DIRS,$(TOP)/datestamp.o)" $(CACTUSLIBLINKLINE) $(GENERAL_LIBRARIES) @echo $(DIVIDER) # Version file |