summaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2004-10-22 21:02:08 +0000
committerReid Spencer <rspencer@reidspencer.com>2004-10-22 21:02:08 +0000
commit8c2c3152d64aafe24b5b67cd7d670658eb65df18 (patch)
treedc32473730cf8b02d1e11eabbfe86a4b963823e3 /projects
parent4d71b6611e9281c999f34712bfd014cc3c95ef3f (diff)
Adjust to changes in Makefile.rules
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17167 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'projects')
-rw-r--r--projects/Makefile2
-rw-r--r--projects/Stacker/lib/compiler/Makefile2
-rw-r--r--projects/sample/tools/sample/Makefile2
3 files changed, 4 insertions, 2 deletions
diff --git a/projects/Makefile b/projects/Makefile
index 1e89f6d91bd..ddb9323ba5f 100644
--- a/projects/Makefile
+++ b/projects/Makefile
@@ -10,7 +10,7 @@ LEVEL=..
include $(LEVEL)/Makefile.config
-DIRS:= $(filter-out llvm-test,$(patsubst $(SourceDir)/%/Makefile,%,$(wildcard $(SourceDir)/*/Makefile)))
+DIRS:= $(filter-out llvm-test,$(patsubst $(BUILD_SRC_DIR)/%/Makefile,%,$(wildcard $(BUILD_SRC_DIR)/*/Makefile)))
# Sparc cannot link shared libraries (libtool problem?) which Stacker uses
ifeq ($(ARCH), Sparc)
diff --git a/projects/Stacker/lib/compiler/Makefile b/projects/Stacker/lib/compiler/Makefile
index 67c9e13ff21..1b767058a0e 100644
--- a/projects/Stacker/lib/compiler/Makefile
+++ b/projects/Stacker/lib/compiler/Makefile
@@ -18,3 +18,5 @@ include $(LEVEL)/Makefile.common
ifdef PARSE_DEBUG
INCLUDES += -DPARSE_DEBUG
endif
+
+$(OBJDIR)/Lexer.o : StackerParser.h
diff --git a/projects/sample/tools/sample/Makefile b/projects/sample/tools/sample/Makefile
index 17ea11ac790..1127f755755 100644
--- a/projects/sample/tools/sample/Makefile
+++ b/projects/sample/tools/sample/Makefile
@@ -14,7 +14,7 @@ TOOLNAME=sample
# List libraries that we'll need
# We use LIBS because sample is a dynamic library.
#
-LIBS+=-lsample
+USEDLIBS = sample
#
# Include Makefile.common so we know what to do.