summaryrefslogtreecommitdiff
path: root/Makefile.common
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2003-08-21 20:39:08 +0000
committerChris Lattner <sabre@nondot.org>2003-08-21 20:39:08 +0000
commitfbb574d7a171b510c053ff0901bdb850ddb7d033 (patch)
tree9a5fbf96ff654647b265b015f32e577087f239dc /Makefile.common
parentf3526e22070a193c56f90be63aeca1d1829942b4 (diff)
downloadllvm-fbb574d7a171b510c053ff0901bdb850ddb7d033.tar.gz
llvm-fbb574d7a171b510c053ff0901bdb850ddb7d033.tar.bz2
llvm-fbb574d7a171b510c053ff0901bdb850ddb7d033.tar.xz
* Remove cleandeps target
* Implement much nicer .d files, as suggested by Casey Carter git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8020 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common16
1 files changed, 6 insertions, 10 deletions
diff --git a/Makefile.common b/Makefile.common
index 360f834782..95fa3b2758 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -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)