forked from OSchip/llvm-project
* Remove cleandeps target
* Implement much nicer .d files, as suggested by Casey Carter llvm-svn: 8020
This commit is contained in:
Chris Lattner
parent
43450cb075
commit
a896edb1bb
|
|
@ -186,7 +186,7 @@ prdirs::
|
|||
# which are marked as Phony.
|
||||
#
|
||||
.PHONY: all dynamic bytecodelib bytecodelib-install
|
||||
.PHONY: clean cleandeps distclean install test bytecode prdirs
|
||||
.PHONY: clean distclean install test bytecode prdirs
|
||||
|
||||
###########################################################################
|
||||
# Miscellaneous paths and commands:
|
||||
|
|
@ -438,7 +438,7 @@ RObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(RObjs))
|
|||
#---------------------------------------------------------
|
||||
|
||||
ifdef DIRS
|
||||
all install clean cleandeps test bytecode ::
|
||||
all install clean test bytecode ::
|
||||
$(VERB) for dir in ${DIRS}; do \
|
||||
(cd $$dir; $(MAKE) $@) || exit 1; \
|
||||
done
|
||||
|
|
@ -449,18 +449,16 @@ ifdef PARALLEL_DIRS
|
|||
all :: $(addsuffix /.makeall , $(PARALLEL_DIRS))
|
||||
install :: $(addsuffix /.makeinstall , $(PARALLEL_DIRS))
|
||||
clean :: $(addsuffix /.makeclean , $(PARALLEL_DIRS))
|
||||
cleandeps:: $(addsuffix /.makecleandeps, $(PARALLEL_DIRS))
|
||||
test :: $(addsuffix /.maketest , $(PARALLEL_DIRS))
|
||||
bytecode :: $(addsuffix /.makebytecode, $(PARALLEL_DIRS))
|
||||
|
||||
%/.makeall %/.makeinstall %/.makeclean %/.makecleandeps %/.maketest \
|
||||
%/.makebytecode:
|
||||
%/.makeall %/.makeinstall %/.makeclean %/.maketest %/.makebytecode:
|
||||
$(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@)
|
||||
endif
|
||||
|
||||
# Handle directories that may or may not exist
|
||||
ifdef OPTIONAL_DIRS
|
||||
all install clean cleandeps test bytecode ::
|
||||
all install clean test bytecode ::
|
||||
$(VERB) for dir in ${OPTIONAL_DIRS}; do \
|
||||
if [ -d $$dir ]; \
|
||||
then\
|
||||
|
|
@ -821,14 +819,14 @@ SourceBaseNames := $(basename $(notdir $(filter-out Debug/%, $(Source))))
|
|||
SourceDepend := $(SourceBaseNames:%=$(BUILD_OBJ_DIR)/Depend/%.d)
|
||||
|
||||
# Create dependencies for the *.cpp files...
|
||||
#$(SourceDepend): \x
|
||||
$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Depend/.dir
|
||||
$(VERB) $(Depend) $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
|
||||
$(VERB) $(Depend) $< | $(SED) 's|$*.o: $*.cpp||' | $(SED) 's|[^\]$$|&::|' >> $@
|
||||
|
||||
# Create dependencies for the *.c files...
|
||||
#$(SourceDepend): \x
|
||||
$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Depend/.dir
|
||||
$(VERB) $(DependC) -o $@ $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
|
||||
$(VERB) $(Depend) $< | $(SED) 's|$*.o: $*.c||' | $(SED) 's|[^\]$$|&::|' >> $@
|
||||
|
||||
#
|
||||
# Include dependencies generated from C/C++ source files, but not if we
|
||||
|
|
@ -836,13 +834,11 @@ $(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Depend/.dir
|
|||
#
|
||||
ifneq ($(MAKECMDGOALS),clean)
|
||||
ifneq ($(MAKECMDGOALS),distclean)
|
||||
ifneq ($(MAKECMDGOALS),cleandeps)
|
||||
ifneq ($(SourceDepend),)
|
||||
-include $(SourceDepend)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
cleandeps::
|
||||
$(VERB) rm -f $(SourceDepend)
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ prdirs::
|
|||
# which are marked as Phony.
|
||||
#
|
||||
.PHONY: all dynamic bytecodelib bytecodelib-install
|
||||
.PHONY: clean cleandeps distclean install test bytecode prdirs
|
||||
.PHONY: clean distclean install test bytecode prdirs
|
||||
|
||||
###########################################################################
|
||||
# Miscellaneous paths and commands:
|
||||
|
|
@ -438,7 +438,7 @@ RObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(RObjs))
|
|||
#---------------------------------------------------------
|
||||
|
||||
ifdef DIRS
|
||||
all install clean cleandeps test bytecode ::
|
||||
all install clean test bytecode ::
|
||||
$(VERB) for dir in ${DIRS}; do \
|
||||
(cd $$dir; $(MAKE) $@) || exit 1; \
|
||||
done
|
||||
|
|
@ -449,18 +449,16 @@ ifdef PARALLEL_DIRS
|
|||
all :: $(addsuffix /.makeall , $(PARALLEL_DIRS))
|
||||
install :: $(addsuffix /.makeinstall , $(PARALLEL_DIRS))
|
||||
clean :: $(addsuffix /.makeclean , $(PARALLEL_DIRS))
|
||||
cleandeps:: $(addsuffix /.makecleandeps, $(PARALLEL_DIRS))
|
||||
test :: $(addsuffix /.maketest , $(PARALLEL_DIRS))
|
||||
bytecode :: $(addsuffix /.makebytecode, $(PARALLEL_DIRS))
|
||||
|
||||
%/.makeall %/.makeinstall %/.makeclean %/.makecleandeps %/.maketest \
|
||||
%/.makebytecode:
|
||||
%/.makeall %/.makeinstall %/.makeclean %/.maketest %/.makebytecode:
|
||||
$(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@)
|
||||
endif
|
||||
|
||||
# Handle directories that may or may not exist
|
||||
ifdef OPTIONAL_DIRS
|
||||
all install clean cleandeps test bytecode ::
|
||||
all install clean test bytecode ::
|
||||
$(VERB) for dir in ${OPTIONAL_DIRS}; do \
|
||||
if [ -d $$dir ]; \
|
||||
then\
|
||||
|
|
@ -821,14 +819,14 @@ SourceBaseNames := $(basename $(notdir $(filter-out Debug/%, $(Source))))
|
|||
SourceDepend := $(SourceBaseNames:%=$(BUILD_OBJ_DIR)/Depend/%.d)
|
||||
|
||||
# Create dependencies for the *.cpp files...
|
||||
#$(SourceDepend): \x
|
||||
$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Depend/.dir
|
||||
$(VERB) $(Depend) $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
|
||||
$(VERB) $(Depend) $< | $(SED) 's|$*.o: $*.cpp||' | $(SED) 's|[^\]$$|&::|' >> $@
|
||||
|
||||
# Create dependencies for the *.c files...
|
||||
#$(SourceDepend): \x
|
||||
$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Depend/.dir
|
||||
$(VERB) $(DependC) -o $@ $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
|
||||
$(VERB) $(Depend) $< | $(SED) 's|$*.o: $*.c||' | $(SED) 's|[^\]$$|&::|' >> $@
|
||||
|
||||
#
|
||||
# Include dependencies generated from C/C++ source files, but not if we
|
||||
|
|
@ -836,13 +834,11 @@ $(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Depend/.dir
|
|||
#
|
||||
ifneq ($(MAKECMDGOALS),clean)
|
||||
ifneq ($(MAKECMDGOALS),distclean)
|
||||
ifneq ($(MAKECMDGOALS),cleandeps)
|
||||
ifneq ($(SourceDepend),)
|
||||
-include $(SourceDepend)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
cleandeps::
|
||||
$(VERB) rm -f $(SourceDepend)
|
||||
|
|
|
|||
Loading…
Reference in New Issue