diff options
Diffstat (limited to 'lib/make/make.configuration')
| -rw-r--r-- | lib/make/make.configuration | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/lib/make/make.configuration b/lib/make/make.configuration index f145eb89..cef05216 100644 --- a/lib/make/make.configuration +++ b/lib/make/make.configuration @@ -9,7 +9,7 @@ # @@*/ # Silence all but designated output -#.SILENT: +#.VERBOSE: # Some configuration variables CONFIG = $(TOP)/config-data @@ -48,6 +48,9 @@ CACTUSLIBS = $(FLESHLIB) $(BINDINGSLIB) # Dividers to make the screen output slightly nicer DIVEL = __________________ DIVIDER = $(DIVEL)$(DIVEL)$(DIVEL)$(DIVEL) +define NOTIFY_DIVIDER + { if test "$(VERBOSE)" == "yes"; then echo $(DIVIDER); fi } +endef # Include the definitions for this configuration include $(CONFIG)/make.config.defn @@ -63,7 +66,7 @@ export PERLINTERP = $(shell echo $(PERL) | sed 's,^/cygdrive/\(.\)/,\1:/,' | sed main: $(EXEDIR)$(DIRSEP)$(EXE) @echo All done ! - @echo $(DIVIDER) + $(NOTIFY_DIVIDER) # Put this in temporarily to make sure that people with existing @@ -132,7 +135,7 @@ $(EXEDIR)$(DIRSEP)$(EXE): $(CONFIG)/make.thornlist $(CONFIG)/cctki_version.h $(p $(CC) $(CFLAGS) -DCCTK_COMPILE_DATETIME="$$datetime" $(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)"$(call TRANSFORM_DIRS,$@)" $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(EXTRAFLAGS) "$(call TRANSFORM_DIRS,$(TOP)/datestamp.o)" $(CACTUSLIBLINKLINE) $(GENERAL_LIBRARIES) - @echo $(DIVIDER) + $(NOTIFY_DIVIDER) # Version file $(CONFIG)/cctki_version.h: $(CCTK_HOME)/Makefile @@ -193,7 +196,7 @@ $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)%$(LIBNAME_SUFFIX): update $(MKDIR) $(MKDIRFLAGS) $(BUILD_DIR)/$$thorn_name ; \ fi ; \ cd $(BUILD_DIR)/$$thorn_name ; \ - echo $(DIVIDER) ; \ + $(NOTIFY_DIVIDER) ; \ if [ -r "$$src_dir/Makefile" ] ; \ then \ make_file=$$src_dir/Makefile ; \ @@ -201,7 +204,7 @@ $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)%$(LIBNAME_SUFFIX): update make_file=$(MAKE_DIR)/make.thornlib ; \ fi ; \ $(MAKE) TOP=$(TOP) SRCDIR=$$src_dir CONFIG=$(CONFIG) NAME=$@ THORN=$$thorn_name USESTHORNS="$(USESTHORNS_$(@:$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)%$(LIBNAME_SUFFIX)=%))" -f $$make_file $(FPARFLAGS) - @echo $(DIVIDER) + $(NOTIFY_DIVIDER) # Include any extra dependencies @@ -227,16 +230,16 @@ $(TOP)/ThornList: while [ "x$$action" = "xyes" -o "x$$action" = "xy" -o "x$$action" = "xYES" -o "x$$action" = "xY" ] ; \ do \ echo The thorn list is ; \ - echo $(DIVIDER) ; \ + $(NOTIFY_DIVIDER) ; \ cat $@ ; \ - echo $(DIVIDER) ; \ + $(NOTIFY_DIVIDER) ; \ echo Edit this list \(no\) \? ; \ read action rest ; \ if [ "x$$action" = "xyes" -o "x$$action" = "xy" -o "x$$action" = "xYES" -o "x$$action" = "xY" ] ; \ then $$EDITOR $@ ; fi ; \ done; \ fi - @echo $(DIVIDER) + $(NOTIFY_DIVIDER) # Allow each thorn to include some global dependencies ifneq ($(strip $(THORNS)),) @@ -268,15 +271,15 @@ editthorns: while [ "x$$action" = "xyes" -o "x$$action" = "xy" -o "x$$action" = "xYES" -o "x$$action" = "xY" ] ; \ do \ echo The thorn list is ; \ - echo $(DIVIDER) ; \ + $(NOTIFY_DIVIDER) ; \ cat $(TOP)/ThornList ; \ - echo $(DIVIDER) ; \ + $(NOTIFY_DIVIDER) ; \ echo Edit this list \(no\) \? ; \ read action rest ; \ if [ "x$$action" = "xyes" -o "x$$action" = "xy" -o "x$$action" = "xYES" -o "x$$action" = "xY" ] ; \ then $$EDITOR $(TOP)/ThornList ; fi ; \ done - @echo $(DIVIDER) + $(NOTIFY_DIVIDER) clean: @echo Deleting all object and dependency files in $(TOP) @@ -309,7 +312,7 @@ UNKNOWN_THORNS = $(filter-out $(ALLCACTUSLIBS_BASE), $(BUILDLIST)) build: $(CONFIG)/make.thornlist $(CONFIG)/cctki_version.h $(patsubst %, $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)%$(LIBNAME_SUFFIX), $(THORN_BUILDLIST)) if test "x$(UNKNOWN_THORNS)" != "x"; then \ echo "WARNING: Don't know anything about '$(UNKNOWN_THORNS)' !"; \ - echo $(DIVIDER); \ + $(NOTIFY_DIVIDER); \ fi |