From bf2f0436595602fcc81ef8c644157417db43e1d7 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 9 Sep 2001 20:59:28 +0000 Subject: [PATCH] Fix automatic dependence on static libs git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@513 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.common | 6 +++--- Makefile.rules | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.common b/Makefile.common index cef989225b7..8e41e495a01 100644 --- a/Makefile.common +++ b/Makefile.common @@ -155,7 +155,7 @@ USED_LIBS_OPTIONS = $(addprefix -l, $(USEDLIBS)) # USED_LIB_PATHS - Compute the path of the libraries used so that tools are # rebuilt if libraries change # -STATICUSEDLIBS = $(addsuffix .a, $(USEDLIBS) +STATICUSEDLIBS = $(addsuffix .a, $(USEDLIBS)) USED_LIB_PATHS_G = $(addprefix $(LEVEL)/lib/Debug/lib, $(STATICUSEDLIBS)) USED_LIB_PATHS_O = $(addprefix $(LEVEL)/lib/Release/lib, $(STATICUSEDLIBS)) @@ -163,10 +163,10 @@ all:: $(TOOLEXENAMES) clean:: rm -f $(TOOLEXENAMES) -$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIBS_PATHS_G) $(LEVEL)/tools/Debug/.dir +$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(LEVEL)/tools/Debug/.dir $(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS) -$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIBS_PATHS_O) $(LEVEL)/tools/Release/.dir +$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(LEVEL)/tools/Release/.dir $(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS) endif diff --git a/Makefile.rules b/Makefile.rules index cef989225b7..8e41e495a01 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -155,7 +155,7 @@ USED_LIBS_OPTIONS = $(addprefix -l, $(USEDLIBS)) # USED_LIB_PATHS - Compute the path of the libraries used so that tools are # rebuilt if libraries change # -STATICUSEDLIBS = $(addsuffix .a, $(USEDLIBS) +STATICUSEDLIBS = $(addsuffix .a, $(USEDLIBS)) USED_LIB_PATHS_G = $(addprefix $(LEVEL)/lib/Debug/lib, $(STATICUSEDLIBS)) USED_LIB_PATHS_O = $(addprefix $(LEVEL)/lib/Release/lib, $(STATICUSEDLIBS)) @@ -163,10 +163,10 @@ all:: $(TOOLEXENAMES) clean:: rm -f $(TOOLEXENAMES) -$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIBS_PATHS_G) $(LEVEL)/tools/Debug/.dir +$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(LEVEL)/tools/Debug/.dir $(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS) -$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIBS_PATHS_O) $(LEVEL)/tools/Release/.dir +$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(LEVEL)/tools/Release/.dir $(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS) endif