From 1b17768e249cf910d242be5b53a6f2dea18eeb2c Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Tue, 15 Mar 2011 09:40:07 -0700 Subject: Fix a build dependency regression. Fix the automatic header dependency generation to handle the .pic.o suffix. This regression was due to: Build both PIC and no PIC static libraries af5d6987f829ccd6e14dd1f57586cfb072a533c7 --- jemalloc/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jemalloc/Makefile.in b/jemalloc/Makefile.in index 6dfaf5b..7a13f21 100644 --- a/jemalloc/Makefile.in +++ b/jemalloc/Makefile.in @@ -94,6 +94,7 @@ doc: $(DOCS) # Include generated dependency files. # -include $(CSRCS:@srcroot@%.c=@objroot@%.d) +-include $(CSRCS:@srcroot@%.c=@objroot@%.pic.d) @objroot@src/%.o: @srcroot@src/%.c @mkdir -p $(@D) @@ -103,7 +104,7 @@ doc: $(DOCS) @objroot@src/%.pic.o: @srcroot@src/%.c @mkdir -p $(@D) $(CC) $(CFLAGS) -fPIC -DPIC -c $(CPPFLAGS) -o $@ $< - @$(SHELL) -ec "$(CC) -MM $(CPPFLAGS) $< | sed \"s/\($(subst /,\/,$(notdir $(basename $@)))\)\.o\([ :]*\)/$(subst /,\/,$(strip $(dir $@)))\1.o \2/g\" > $(@:%.o=%.d)" + @$(SHELL) -ec "$(CC) -MM $(CPPFLAGS) $< | sed \"s/\($(subst /,\/,$(notdir $(basename $(basename $@))))\)\.o\([ :]*\)/$(subst /,\/,$(strip $(dir $@)))\1.pic.o \2/g\" > $(@:%.o=%.d)" %.$(SO) : %.$(SO).$(REV) @mkdir -p $(@D) -- cgit v0.12