diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-01-19 10:56:11 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-01-19 10:56:11 +0000 |
| commit | bf0a5785b3a8f523628f4dcf396801c2d9d4618f (patch) | |
| tree | e22fcb58846bc9a1b19d142ddd571c16ff077760 | |
| parent | 425852ca3a04dc21a49f904e4a90e7edf5a354ee (diff) | |
Changed siniclude to -include, as older versions of gmake don't recognise
sinclude.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@70 17b73243-c579-4c4c-a9d2-2d5706c11dac
| -rw-r--r-- | lib/make/make.configuration | 4 | ||||
| -rw-r--r-- | lib/make/make.subdir | 4 | ||||
| -rw-r--r-- | lib/make/make.thornlib | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/lib/make/make.configuration b/lib/make/make.configuration index 8d70ac2d..04f5e698 100644 --- a/lib/make/make.configuration +++ b/lib/make/make.configuration @@ -25,9 +25,9 @@ DIVIDER = $(DIVEL)$(DIVEL)$(DIVEL)$(DIVEL) include $(CONFIG)/make.config.defn # Include the list of thorns to be built -# (Use sinclude to prevent warnings messages, as the file will be built if +# (Use -include to prevent warnings messages, as the file will be built if # it is missing .) -sinclude $(CONFIG)/make.thornlist +-include $(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 5a675731..c196fca4 100644 --- a/lib/make/make.subdir +++ b/lib/make/make.subdir @@ -32,7 +32,7 @@ all: $(OBJS) include $(CONFIG)/make.config.rules # Extra subdir-specific dependencies -# This file isn't strictly necessary, so use sinclude to prevent +# This file isn't strictly necessary, so use -include to prevent # warnings if it is missing. -include $(SRCDIR)/make.code.deps +-include $(SRCDIR)/make.code.deps diff --git a/lib/make/make.thornlib b/lib/make/make.thornlib index 0fd815b3..373a3dac 100644 --- a/lib/make/make.thornlib +++ b/lib/make/make.thornlib @@ -32,8 +32,10 @@ CCTK_SRCS += $(SRCS) # Include all the make.code.defn files for the subdirectories # These have to be wrapped to allow us to concatanate all the # SRCS definitions, complete with subdirectory names. +# Using -include to prevent warnings the first time the make.identity files +# need to be made. ifneq ($(strip $(SUBDIRS)),) -sinclude $(foreach DIR,$(SUBDIRS), $(DIR)/make.identity $(MAKE_DIR)/$(PRE_WRAPPER) $(SRCDIR)/$(DIR)/make.code.defn $(MAKE_DIR)/$(POST_WRAPPER)) +-include $(foreach DIR,$(SUBDIRS), $(DIR)/make.identity $(MAKE_DIR)/$(PRE_WRAPPER) $(SRCDIR)/$(DIR)/make.code.defn $(MAKE_DIR)/$(POST_WRAPPER)) endif SRCS = $(CCTK_SRCS) @@ -50,9 +52,9 @@ $(NAME): $(addsuffix .check, $(SUBDIRS)) $(OBJS) $(SRCDIR)/make.code.defn $(fore include $(CONFIG)/make.config.rules # Extra thorn-specific dependencies -# This file isn't strictly necessary, so use sinclude to prevent +# This file isn't strictly necessary, so use -include to prevent # warnings if it is missing. -sinclude $(SRCDIR)/make.code.deps +-include $(SRCDIR)/make.code.deps # Extra stuff for allowing make to recurse into directories |