Commit d924a240 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov

make: Drop redundand dependency on parasite.h

There is no such file at all and it forced build
process to re-build every make command passed.
Reported-by: 's avatarPavel Emelyanov <xemul@parallels.com>
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
parent f0b8a3a6
...@@ -73,7 +73,6 @@ OBJS-BLOB += parasite.o ...@@ -73,7 +73,6 @@ OBJS-BLOB += parasite.o
DEPS-BLOB += $(patsubst %.o,%.d,$(OBJS-BLOB)) DEPS-BLOB += $(patsubst %.o,%.d,$(OBJS-BLOB))
SRCS-BLOB += $(patsubst %.o,%.c,$(OBJS-BLOB)) SRCS-BLOB += $(patsubst %.o,%.c,$(OBJS-BLOB))
HEAD-BLOB := $(patsubst %.o,%.h,$(OBJS-BLOB))
HEAD-BLOB-GEN := $(patsubst %.o,%-blob.h,$(OBJS-BLOB)) HEAD-BLOB-GEN := $(patsubst %.o,%-blob.h,$(OBJS-BLOB))
HEAD-BIN := $(patsubst %.o,%.bin,$(OBJS-BLOB)) HEAD-BIN := $(patsubst %.o,%.bin,$(OBJS-BLOB))
HEAD-LDS := $(patsubst %.o,%.lds.S,$(OBJS-BLOB)) HEAD-LDS := $(patsubst %.o,%.lds.S,$(OBJS-BLOB))
...@@ -85,23 +84,20 @@ $(OBJS-BLOB): $(SRCS-BLOB) ...@@ -85,23 +84,20 @@ $(OBJS-BLOB): $(SRCS-BLOB)
$(Q) $(CC) -c $(CFLAGS) -fpic $< -o $@ $(Q) $(CC) -c $(CFLAGS) -fpic $< -o $@
$(HEAD-BIN): $(OBJS-BLOB) $(HEAD-LDS) $(HEAD-BIN): $(OBJS-BLOB) $(HEAD-LDS)
%.bin: %.o
$(E) " GEN " $@ $(E) " GEN " $@
$(Q) $(LD) -T $(patsubst %.bin,%.lds.S,$@) $< -o $@ $(Q) $(LD) -T $(patsubst %.bin,%.lds.S,$@) $< -o $@
$(HEAD-BLOB-GEN): $(HEAD-BIN) $(DEPS-BLOB) $(HEAD-BLOB-GEN): $(HEAD-BIN) $(DEPS-BLOB)
$(HEAD-BLOB): $(DEPS-BLOB) $(HEAD-BIN)
%.h: %.bin
$(E) " GEN " $@ $(E) " GEN " $@
$(Q) $(SH) gen-offsets.sh \ $(Q) $(SH) gen-offsets.sh \
$(subst -,_,$(patsubst %.h,%,$@))_h__ \ parasite_h__ \
$(subst -,_,$(patsubst %.h,%,$@))_blob_offset__ \ parasite_blob_offset__ \
$(subst -,_,$(patsubst %.h,%,$@))_blob \ parasite_blob \
$(patsubst %.h,%.o,$@) \ $(OBJS-BLOB) \
$(patsubst %.h,%.bin,$@) > $(patsubst %.h,%-blob.h,$@) $(HEAD-BIN) > parasite-blob.h
$(Q) sync $(Q) sync
$(OBJS): $(HEAD-BLOB) $(DEPS) $(HEAD-BLOB-GEN) $(OBJS): $(DEPS) $(HEAD-BLOB-GEN)
%.o: %.c %.o: %.c
$(E) " CC " $@ $(E) " CC " $@
$(Q) $(CC) -c $(CFLAGS) $< -o $@ $(Q) $(CC) -c $(CFLAGS) $< -o $@
...@@ -110,7 +106,7 @@ $(PROGRAM): $(OBJS) ...@@ -110,7 +106,7 @@ $(PROGRAM): $(OBJS)
$(E) " LINK " $@ $(E) " LINK " $@
$(Q) $(CC) $(CFLAGS) $(OBJS) $(LIBS) -o $@ $(Q) $(CC) $(CFLAGS) $(OBJS) $(LIBS) -o $@
$(DEPS): $(HEAD-BLOB) $(DEPS): $(HEAD-BLOB-GEN)
%.d: %.c %.d: %.c
$(Q) $(CC) -M -MT $(patsubst %.d,%.o,$@) $(CFLAGS) $< -o $@ $(Q) $(CC) -M -MT $(patsubst %.d,%.o,$@) $(CFLAGS) $< -o $@
...@@ -138,7 +134,6 @@ clean: ...@@ -138,7 +134,6 @@ clean:
$(Q) $(RM) -f ./tags $(Q) $(RM) -f ./tags
$(Q) $(RM) -f ./cscope* $(Q) $(RM) -f ./cscope*
$(Q) $(RM) -f ./$(PROGRAM) $(Q) $(RM) -f ./$(PROGRAM)
$(Q) $(RM) -f ./$(HEAD-BLOB)
$(Q) $(RM) -f ./$(HEAD-BLOB-GEN) $(Q) $(RM) -f ./$(HEAD-BLOB-GEN)
$(Q) $(MAKE) -C test clean $(Q) $(MAKE) -C test clean
.PHONY: clean .PHONY: clean
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "image.h" #include "image.h"
#include "parasite.h"
#include "parasite-syscall.h" #include "parasite-syscall.h"
#include "parasite-blob.h" #include "parasite-blob.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment