Changes to allow building lib/Target/Sparc the FIRST time.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3078 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.common b/Makefile.common
index aef05750ace06161b4253359c4695211256b5419..de40eabfcdbae9773f85c865b19b0f34a418fc20 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -117,7 +117,7 @@ MakeLib   = $(AR)
 # 
 Source  := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l)
 
-Objs := $(sort $(addsuffix .o,$(basename $(Source))))
+Objs := $(sort $(patsubst Debug/%.o, %.o, $(addsuffix .o,$(basename $(Source)))))
 ObjectsO = $(addprefix Release/,$(Objs))
 ObjectsG = $(addprefix Debug/,$(Objs))
 
@@ -296,8 +296,8 @@ Debug/%.o: %.cpp Debug/.dir Depend/.dir
 #      $(CompileGC) $< -o $@
 
 # Create a .cpp source file from a burg input file
-%.burm.cpp: Debug/%.burg Debug/.dir
-       $(RunBurg) $< -o $@
+#Debug/%.cpp: Debug/% Debug/.dir
+#      $(RunBurg) $< -o $@
 
 # Create a .cpp source file from a flex input file... this uses sed to cut down
 # on the warnings emited by GCC...
@@ -324,7 +324,7 @@ clean::
 # If dependancies were generated for the file that included this file,
 # include the dependancies now...
 #
-SourceDepend = $(addsuffix .d,$(addprefix Depend/,$(basename $(Source))))
+SourceDepend = $(addsuffix .d,$(addprefix Depend/,$(basename $(filter-out Debug/%, $(Source)))))
 ifneq ($(SourceDepend),)
 include $(SourceDepend)
 endif

diff --git a/Makefile.rules b/Makefile.rules
index aef05750ace06161b4253359c4695211256b5419..de40eabfcdbae9773f85c865b19b0f34a418fc20 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -117,7 +117,7 @@ MakeLib   = $(AR)
 # 
 Source  := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l)
 
-Objs := $(sort $(addsuffix .o,$(basename $(Source))))
+Objs := $(sort $(patsubst Debug/%.o, %.o, $(addsuffix .o,$(basename $(Source)))))
 ObjectsO = $(addprefix Release/,$(Objs))
 ObjectsG = $(addprefix Debug/,$(Objs))
 
@@ -296,8 +296,8 @@ Debug/%.o: %.cpp Debug/.dir Depend/.dir
 #      $(CompileGC) $< -o $@
 
 # Create a .cpp source file from a burg input file
-%.burm.cpp: Debug/%.burg Debug/.dir
-       $(RunBurg) $< -o $@
+#Debug/%.cpp: Debug/% Debug/.dir
+#      $(RunBurg) $< -o $@
 
 # Create a .cpp source file from a flex input file... this uses sed to cut down
 # on the warnings emited by GCC...
@@ -324,7 +324,7 @@ clean::
 # If dependancies were generated for the file that included this file,
 # include the dependancies now...
 #
-SourceDepend = $(addsuffix .d,$(addprefix Depend/,$(basename $(Source))))
+SourceDepend = $(addsuffix .d,$(addprefix Depend/,$(basename $(filter-out Debug/%, $(Source)))))
 ifneq ($(SourceDepend),)
 include $(SourceDepend)
 endif