diff --git a/dkarm/rules/base_rules b/dkarm/rules/base_rules index 662a7d1..0dea46a 100644 --- a/dkarm/rules/base_rules +++ b/dkarm/rules/base_rules @@ -14,12 +14,6 @@ export AS := $(PREFIX)as export AR := $(PREFIX)ar export OBJCOPY := $(PREFIX)objcopy -define adjustdepends -cp $(DEPSDIR)/$*.d $(DEPSDIR)/$*.P; -sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/^ *//' -e 's/ *\\$$//' -e '/^$$/ d' -e 's/$$/ :/' < $(DEPSDIR)/$*.P >> $(DEPSDIR)/$*.d; -rm $(DEPSDIR)/$*.P -endef - #--------------------------------------------------------------------------------- %.a: #--------------------------------------------------------------------------------- @@ -30,26 +24,22 @@ endef #--------------------------------------------------------------------------------- %.o: %.cpp @echo $(notdir $<) - @$(CXX) -MMD -MF $(DEPSDIR)/$*.d $(CXXFLAGS) -c $< -o $@ - @$(adjustdepends) + @$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.d $(CXXFLAGS) -c $< -o $@ #--------------------------------------------------------------------------------- %.o: %.c @echo $(notdir $<) - @$(CC) -MMD -MF $(DEPSDIR)/$*.d $(CFLAGS) -c $< -o $@ - @$(adjustdepends) + @$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d $(CFLAGS) -c $< -o $@ #--------------------------------------------------------------------------------- %.o: %.s @echo $(notdir $<) - @$(CC) -MMD -MF $(DEPSDIR)/$*.d -x assembler-with-cpp $(ASFLAGS) -c $< -o $@ - @$(adjustdepends) + $(CC) -MMD -MP -MF $(DEPSDIR)/$*.d -x assembler-with-cpp $(ASFLAGS) -c $< -o $@ #--------------------------------------------------------------------------------- %.o: %.S @echo $(notdir $<) - @$(CC) -MMD -MF $(DEPSDIR)/$*.d -x assembler-with-cpp $(ASFLAGS) -c $< -o $@ - @$(adjustdepends) + @$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d -x assembler-with-cpp $(ASFLAGS) -c $< -o $@ #--------------------------------------------------------------------------------- # canned command sequence for binary data