Fix automatic dependence on static libs

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@513 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2001-09-09 20:59:28 +00:00
parent 9856e0c56b
commit bf2f043659
2 changed files with 6 additions and 6 deletions

View File

@ -155,7 +155,7 @@ USED_LIBS_OPTIONS = $(addprefix -l, $(USEDLIBS))
# USED_LIB_PATHS - Compute the path of the libraries used so that tools are # USED_LIB_PATHS - Compute the path of the libraries used so that tools are
# rebuilt if libraries change # 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_G = $(addprefix $(LEVEL)/lib/Debug/lib, $(STATICUSEDLIBS))
USED_LIB_PATHS_O = $(addprefix $(LEVEL)/lib/Release/lib, $(STATICUSEDLIBS)) USED_LIB_PATHS_O = $(addprefix $(LEVEL)/lib/Release/lib, $(STATICUSEDLIBS))
@ -163,10 +163,10 @@ all:: $(TOOLEXENAMES)
clean:: clean::
rm -f $(TOOLEXENAMES) 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) $(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) $(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS)
endif endif

View File

@ -155,7 +155,7 @@ USED_LIBS_OPTIONS = $(addprefix -l, $(USEDLIBS))
# USED_LIB_PATHS - Compute the path of the libraries used so that tools are # USED_LIB_PATHS - Compute the path of the libraries used so that tools are
# rebuilt if libraries change # 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_G = $(addprefix $(LEVEL)/lib/Debug/lib, $(STATICUSEDLIBS))
USED_LIB_PATHS_O = $(addprefix $(LEVEL)/lib/Release/lib, $(STATICUSEDLIBS)) USED_LIB_PATHS_O = $(addprefix $(LEVEL)/lib/Release/lib, $(STATICUSEDLIBS))
@ -163,10 +163,10 @@ all:: $(TOOLEXENAMES)
clean:: clean::
rm -f $(TOOLEXENAMES) 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) $(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) $(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS)
endif endif