aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVikram S. Adve <vadve@cs.uiuc.edu>2001-10-17 12:33:55 +0000
committerVikram S. Adve <vadve@cs.uiuc.edu>2001-10-17 12:33:55 +0000
commitc4bed346ece5f6c6967a1c002f04fa25d6042b38 (patch)
treeef5a242dfbbddc28dd33a45c315c2537a7ac526a
parent386a3b7b953a9de769824a7f3516d9dd3021d3e2 (diff)
Allow only extra Source files to be listed in a local Makefile.
Needed for automatically generated .cpp files. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@853 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--Makefile.common6
-rw-r--r--Makefile.rules6
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.common b/Makefile.common
index 0d4cfb6ba1..d1fd8e70ea 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -78,9 +78,9 @@ MakeLib = $(AR)
# Source includes all of the cpp files, and objects are derived from the
# source files...
-ifndef Source
-Source = $(wildcard *.cpp *.c *.y *.l)
-endif
+# The local Makefile can list other Source files via Source = ...
+#
+Source := $(Source) $(wildcard *.cpp *.c *.y *.l)
Objs = $(sort $(addsuffix .o,$(basename $(Source))))
ObjectsO = $(addprefix Release/,$(Objs))
diff --git a/Makefile.rules b/Makefile.rules
index 0d4cfb6ba1..d1fd8e70ea 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -78,9 +78,9 @@ MakeLib = $(AR)
# Source includes all of the cpp files, and objects are derived from the
# source files...
-ifndef Source
-Source = $(wildcard *.cpp *.c *.y *.l)
-endif
+# The local Makefile can list other Source files via Source = ...
+#
+Source := $(Source) $(wildcard *.cpp *.c *.y *.l)
Objs = $(sort $(addsuffix .o,$(basename $(Source))))
ObjectsO = $(addprefix Release/,$(Objs))