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

diff --git a/Makefile.common b/Makefile.common
index 0d4cfb6ba1bbbc235f15bba1e436fffd34b305bf..d1fd8e70ea97f5afc0bb8aa31050506f6c299838 100644 (file)
--- 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 0d4cfb6ba1bbbc235f15bba1e436fffd34b305bf..d1fd8e70ea97f5afc0bb8aa31050506f6c299838 100644 (file)
--- 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))