summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile3
-rw-r--r--lib/make/make.config.rules.in22
-rw-r--r--lib/make/make.configuration5
-rw-r--r--lib/make/make.thornlib2
4 files changed, 16 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index 1cad4c47..84deffe9 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
#
#
# @enddesc
-# @version $Id: Makefile,v 1.144 2003-07-20 11:08:39 jthorn Exp $
+# @version $Id: Makefile,v 1.145 2003-10-13 17:22:43 schnetter Exp $
# @@*/
##################################################################################
@@ -236,6 +236,7 @@ $(CONFIGURATIONS):
echo $(DIVIDER);\
echo "Cactus - version: $(CCTK_VERSION)"; \
echo "Building configuration $@"; \
+ echo $(DIVIDER);\
fi; \
cd $(CONFIGS_DIR)/$@
$(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$@ CCTK_HOME=$(CCTK_HOME) $(TPARFLAGS)
diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in
index de1f5c97..00e3bd09 100644
--- a/lib/make/make.config.rules.in
+++ b/lib/make/make.config.rules.in
@@ -160,13 +160,13 @@ endef
# Build rules for C
%.c.o: $(SRCDIR)/%.c
- @echo $(DIVIDER)
@echo Preprocessing $<
$(PREPROCESS_C)
@echo Compiling $<
$(COMPILE_C)
@echo Postprocessing $<
$(POSTPROCESS_C)
+ @echo $(DIVIDER)
%.c.d: $(SRCDIR)/%.c
$(C_DEPENDENCIES)
@@ -174,51 +174,51 @@ endef
# Build rules for C++
%.cc.o: $(SRCDIR)/%.cc
- @echo $(DIVIDER)
@echo Preprocessing $<
$(PREPROCESS_CXX)
@echo Compiling $<
$(COMPILE_CXX)
@echo Postprocessing $<
$(POSTPROCESS_CXX)
+ @echo $(DIVIDER)
%.cc.d: $(SRCDIR)/%.cc
$(CXX_DEPENDENCIES)
%.C.o: $(SRCDIR)/%.C
- @echo $(DIVIDER)
@echo Preprocessing $<
$(PREPROCESS_CXX)
@echo Compiling $<
$(COMPILE_CXX)
@echo Postprocessing $<
$(POSTPROCESS_CXX)
+ @echo $(DIVIDER)
%.C.d: $(SRCDIR)/%.C
$(CXX_DEPENDENCIES)
%.cpp.o: $(SRCDIR)/%.cpp
- @echo $(DIVIDER)
@echo Preprocessing $<
$(PREPROCESS_CXX)
@echo Compiling $<
$(COMPILE_CXX)
@echo Postprocessing $<
$(POSTPROCESS_CXX)
+ @echo $(DIVIDER)
%.cpp.d: $(SRCDIR)/%.cpp
$(CXX_DEPENDENCIES)
%.cxx.o: $(SRCDIR)/%.cxx
- @echo $(DIVIDER)
@echo Preprocessing $<
$(PREPROCESS_CXX)
@echo Compiling $<
$(COMPILE_CXX)
@echo Postprocessing $<
$(POSTPROCESS_CXX)
+ @echo $(DIVIDER)
%.cxx.d: $(SRCDIR)/%.cxx
@@ -227,22 +227,22 @@ endef
# Build rules for F77
%.F77.o: $(SRCDIR)/%.F77
- @echo $(DIVIDER)
@echo Preprocessing $<
$(PREPROCESS_F77)
@echo Compiling $<
$(COMPILE_F77)
@echo Postprocessing $<
$(POSTPROCESS_F77)
+ @echo $(DIVIDER)
%.f77.o: $(SRCDIR)/%.f77
- @echo $(DIVIDER)
@echo Copying $<
$(PREPROCESS_f77)
@echo Compiling $<
$(COMPILE_F77)
@echo Postprocessing $<
$(POSTPROCESS_F77)
+ @echo $(DIVIDER)
%.F77.d: $(SRCDIR)/%.F77
$(F77_DEPENDENCIES)
@@ -253,22 +253,22 @@ endef
# Build rules for F90
%.F.o: $(SRCDIR)/%.F
- @echo $(DIVIDER)
@echo Preprocessing $<
$(PREPROCESS_F)
@echo Compiling $<
$(COMPILE_F)
@echo Postprocessing $<
$(POSTPROCESS_F)
+ @echo $(DIVIDER)
%.f.o: $(SRCDIR)/%.f
- @echo $(DIVIDER)
@echo Copying $<
$(PREPROCESS_f)
@echo Compiling $<
$(COMPILE_F)
@echo Postprocessing $<
$(POSTPROCESS_F)
+ @echo $(DIVIDER)
%.F.d: $(SRCDIR)/%.F
$(F_DEPENDENCIES)
@@ -279,22 +279,22 @@ endef
# Build rules for free-format F90
%.F90.o: $(SRCDIR)/%.F90
- @echo $(DIVIDER)
@echo Preprocessing $<
$(PREPROCESS_F90)
@echo Compiling $<
$(COMPILE_F90)
@echo Postprocessing $<
$(POSTPROCESS_F90)
+ @echo $(DIVIDER)
%.f90.o: $(SRCDIR)/%.f90
- @echo $(DIVIDER)
@echo Copying $<
$(PREPROCESS_f90)
@echo Compiling $<
$(COMPILE_F90)
@echo Postprocessing $<
$(POSTPROCESS_F90)
+ @echo $(DIVIDER)
%.F90.d: $(SRCDIR)/%.F90
$(F90_DEPENDENCIES)
diff --git a/lib/make/make.configuration b/lib/make/make.configuration
index acfc4044..9b8521fd 100644
--- a/lib/make/make.configuration
+++ b/lib/make/make.configuration
@@ -91,7 +91,6 @@ main: $(EXEDIR)$(DIRSEP)$(EXE)
# Build the executable
$(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$(subst /,$(DIRSEP),$(CCTK_HOME)/src/include) -I$(CONFIG) $(subst /,$(DIRSEP),$(DATESTAMP))
if [ ! -d $(EXEDIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(EXEDIR) ; fi
@@ -120,7 +119,6 @@ $(CONFIG)/cctki_version.h: $(CCTK_HOME)/Makefile
# directory.
$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX): update
- @echo $(DIVIDER)
@echo Checking status of $(notdir $@)
# protect the following mkdir against parallel makes
if [ ! -d $(SCRATCH_BUILD) ]; then msg=`$(MKDIR) $(MKDIRFLAGS) $(SCRATCH_BUILD) 2>&1`; if [ -d $(SCRATCH_BUILD) ]; then exit 0; else echo "$$msg"; exit 1; fi; fi
@@ -131,6 +129,7 @@ $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX): update
else src_dir=$(PACKAGE_DIR)/$(@:$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX)=$(filter %/$(@:$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX)=%), $(THORNS)))/src ; fi ; fi ;\
if [ ! -d $(BUILD_DIR)/$$thorn_name ]; then $(MKDIR) $(MKDIRFLAGS) $(BUILD_DIR)/$$thorn_name ; fi ; \
cd $(BUILD_DIR)/$$thorn_name ; \
+ echo $(DIVIDER) ; \
if [ -r "$$src_dir/Makefile" ] ; then make_file=$$src_dir/Makefile ; \
else make_file=$(MAKE_DIR)/make.thornlib ; fi ; \
$(MAKE) TOP=$(TOP) SRCDIR=$$src_dir CONFIG=$(CONFIG) NAME=$@ THORN=$$thorn_name -f $$make_file $(FPARFLAGS)
@@ -240,7 +239,7 @@ UNKNOWN_THORNS = $(filter-out $(ALLCACTUSLIBS), $(BUILDLIST))
build: $(CONFIG)/make.thornlist $(CONFIG)/cctki_version.h $(patsubst %, $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX), $(THORN_BUILDLIST))
if test "x$(UNKNOWN_THORNS)" != "x"; then \
echo "WARNING: Don't know anything about '$(UNKNOWN_THORNS)' !"; \
- echo $(DIVIDER); \
+ echo $(DIVIDER); \
fi
diff --git a/lib/make/make.thornlib b/lib/make/make.thornlib
index 2fbc27a2..35890b01 100644
--- a/lib/make/make.thornlib
+++ b/lib/make/make.thornlib
@@ -67,11 +67,11 @@ SUBDIRS = $(LOCAL_SUBDIRS)
OBJS = $(SRCS:%=%.o)
$(NAME): $(addsuffix /make.checked, $(SUBDIRS) $(THORNBINDINGS))
- @echo $(DIVIDER)
if [ -r $(NAME) ] ; then echo Updating $(NAME) ; else echo Creating $(NAME) ; fi
if [ -r $@ ] ; then rm $@ ; fi
$(AR) $(ARFLAGS) $@ $(OBJS)
if test "x$(USE_RANLIB)" = "xyes" ; then $(RANLIB) $(RANLIBFLAGS) $@ ; fi
+ @echo $(DIVIDER)
# Extra stuff for allowing make to recurse into directories
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-09 00:28:44 +0000