diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-01-19 09:31:35 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-01-19 09:31:35 +0000 |
| commit | a692cfb150e1aac9fc21d722d287749feb64635a (patch) | |
| tree | 5edccabdf8528e9f9e6a784a6957c2d8d2625236 /lib | |
| parent | e8a7556fc96163eab4c324b6dc161beb1138bc7b (diff) | |
Changed some include statement to sinclude to prevent extraneous warning
messages.
Now the presence of make.code.deps in a thorn's directory or subdirectories is
optional.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@68 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/make/make.configuration | 6 | ||||
| -rw-r--r-- | lib/make/make.subdir | 2 | ||||
| -rw-r--r-- | lib/make/make.thornlib | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/lib/make/make.configuration b/lib/make/make.configuration index 9ebdf452..8d70ac2d 100644 --- a/lib/make/make.configuration +++ b/lib/make/make.configuration @@ -24,8 +24,10 @@ DIVIDER = $(DIVEL)$(DIVEL)$(DIVEL)$(DIVEL) # Include the definitions for this configuration include $(CONFIG)/make.config.defn -# Include the list of thorns to be built -include $(CONFIG)/make.thornlist +# Include the list of thorns to be built +# (Use sinclude to prevent warnings messages, as the file will be built if +# it is missing .) +sinclude $(CONFIG)/make.thornlist # Build the executable $(EXE): $(CONFIG)/make.thornlist $(patsubst %,$(CCTK_LIBDIR)/lib%.a,$(notdir $(THORNS))) $(CCTK_LIBDIR)/libCCTK.a diff --git a/lib/make/make.subdir b/lib/make/make.subdir index 82a72ac7..5a675731 100644 --- a/lib/make/make.subdir +++ b/lib/make/make.subdir @@ -32,5 +32,7 @@ all: $(OBJS) include $(CONFIG)/make.config.rules # Extra subdir-specific dependencies +# This file isn't strictly necessary, so use sinclude to prevent +# warnings if it is missing. include $(SRCDIR)/make.code.deps diff --git a/lib/make/make.thornlib b/lib/make/make.thornlib index 389bb0f8..0fd815b3 100644 --- a/lib/make/make.thornlib +++ b/lib/make/make.thornlib @@ -33,7 +33,7 @@ CCTK_SRCS += $(SRCS) # These have to be wrapped to allow us to concatanate all the # SRCS definitions, complete with subdirectory names. ifneq ($(strip $(SUBDIRS)),) -include $(foreach DIR,$(SUBDIRS), $(DIR)/make.identity $(MAKE_DIR)/$(PRE_WRAPPER) $(SRCDIR)/$(DIR)/make.code.defn $(MAKE_DIR)/$(POST_WRAPPER)) +sinclude $(foreach DIR,$(SUBDIRS), $(DIR)/make.identity $(MAKE_DIR)/$(PRE_WRAPPER) $(SRCDIR)/$(DIR)/make.code.defn $(MAKE_DIR)/$(POST_WRAPPER)) endif SRCS = $(CCTK_SRCS) @@ -50,7 +50,9 @@ $(NAME): $(addsuffix .check, $(SUBDIRS)) $(OBJS) $(SRCDIR)/make.code.defn $(fore include $(CONFIG)/make.config.rules # Extra thorn-specific dependencies -include $(SRCDIR)/make.code.deps +# This file isn't strictly necessary, so use sinclude to prevent +# warnings if it is missing. +sinclude $(SRCDIR)/make.code.deps # Extra stuff for allowing make to recurse into directories |