Recursively expanded vars used as target deps are expanded early when make is constructing the dep graph. Thus, $(TAR_DEPS) will be empty when evaluated. For now use the $(DIST) as a quick fix.
We need to cleanup all the deps as we pretty much ignore this in favor of targets that will always be ran.
Signed-off-by: Spencer Shimko sshimko@tresys.com --- rhel6/src/Makefile | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/rhel6/src/Makefile b/rhel6/src/Makefile index 27d86af..9d75999 100644 --- a/rhel6/src/Makefile +++ b/rhel6/src/Makefile @@ -23,8 +23,6 @@ SRPM_OUTPUT_DIR ?= $(OUTPUT_DIR) # This file will be created by tar'ing up $(OUT)/ TARBALL = $(SRPM_OUTPUT_DIR)/$(DIST).tar.gz
-# exhaustive list of deps for the RPM, used to determine if RPM needs to be rebuilt -TAR_DEPS = $(wildcard $(DIST)/*) RPM_DEPS := $(TARBALL) $(RPM_SPEC) Makefile
RPM_TMPDIR ?= $(ROOT_DIR)/tmp @@ -126,8 +124,8 @@ dist: content guide tables
tarball: $(TARBALL)
-$(TARBALL): dist $(TAR_DEPS) - tar -czf $@ $(TAR_DEPS) +$(TARBALL): dist $(DIST) + tar -czf $@ $(DIST)
srpm: $(SRPM_OUTPUT_DIR)/$(DIST)-$(RELEASE).src.rpm
On 4/24/12 8:52 AM, Spencer Shimko wrote:
Recursively expanded vars used as target deps are expanded early when make is constructing the dep graph. Thus, $(TAR_DEPS) will be empty when evaluated. For now use the $(DIST) as a quick fix.
We need to cleanup all the deps as we pretty much ignore this in favor of targets that will always be ran.
Applied to my tree & built without errors. Please push.
Ack.
On 4/24/12 10:03 AM, "Shawn Wells" shawn@redhat.com wrote:
On 4/24/12 8:52 AM, Spencer Shimko wrote:
Recursively expanded vars used as target deps are expanded early when make is constructing the dep graph. Thus, $(TAR_DEPS) will be empty when evaluated. For now use the $(DIST) as a quick fix.
We need to cleanup all the deps as we pretty much ignore this in favor of targets that will always be ran.
Applied to my tree & built without errors. Please push.
Ack.
Pushed thanks Shawn.
--Spencer
scap-security-guide mailing list scap-security-guide@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/scap-security-guide
scap-security-guide@lists.fedorahosted.org
-
Shawn Wells -
Spencer R. Shimko