From 877161aa10968e2498fd37cb035bdf8fe38d7284 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Tue, 11 Nov 2014 17:38:42 -0200 Subject: [PATCH] Makefile: remove unecessary code --- Makefile | 57 ++++++++++----------------------------------------------- 1 file changed, 10 insertions(+), 47 deletions(-) diff --git a/Makefile b/Makefile index db537c1..f752b90 100644 --- a/Makefile +++ b/Makefile @@ -1,54 +1,17 @@ PROJECT = softwarepublico -VERSION = 2014.07 -COMPONENTS = solr -ARCH = $(shell uname -i) +VERSION ?= $(shell date +%Y.%m.%d) -TARBALL_FORMAT = tar.gz -TARBALLS = $(patsubst %,build/$(PROJECT)-%-$(VERSION).$(TARBALL_FORMAT),$(COMPONENTS)) -RPMS = $(patsubst %.$(TARBALL_FORMAT),%-1.$(ARCH).rpm, $(TARBALLS)) -GENERATED += $(TARBALLS) $(RPMS) +TARBALL = dist/$(PROJECT)-$(VERSION).tar.gz +all: -ifeq ("$(V)", "1") - Q := - RPMBUILD_FLAGS := - qecho := @true -else - Q := @ - RPMBUILD_FLAGS := --quiet --short-circuit - qecho := @echo -endif +sdist: $(TARBALL) -.PHONY: $(COMPONENTS) - -all: rpm - -sdist: $(TARBALLS) - -rpm: $(RPMS) - -$(TARBALLS): build/$(PROJECT)-%-$(VERSION).$(TARBALL_FORMAT): % - $(qecho) "TAR\t$@" - $(Q)cp -r $< $(PROJECT)-$<-$(VERSION) - $(Q)mkdir -p build - $(Q)tar vczf $@ $(PROJECT)-$<-$(VERSION) - $(Q)rm -rf $(PROJECT)-$<-$(VERSION) - -$(RPMS): build/$(PROJECT)-%-$(VERSION)-1.$(ARCH).rpm: build/$(PROJECT)-%-$(VERSION).$(TARBALL_FORMAT) - -$(RPMS): build/$(PROJECT)-%-$(VERSION)-1.$(ARCH).rpm: rpm/%.spec - $(qecho) "RPM\t$@" - $(Q)mkdir -p ~/rpmbuild/SOURCES - $(Q)component=$$(basename $< .spec) && \ - ln -f build/$(PROJECT)-$$component-$(VERSION).$(TARBALL_FORMAT) ~/rpmbuild/SOURCES/ && \ - rpmbuild -ba $(RPMBUILD_FLAGS) $< && \ - ln -f ~/rpmbuild/RPMS/$(ARCH)/$(PROJECT)-$$component-$(VERSION)-1.el6.$(ARCH).rpm $@ - -%.spec: %.spec.in - $(qecho) "SPEC\t$@" - $(Q)(sed -e 's/@@version@@/$(VERSION)/g' $^ > $@) || ($(RM) $@; false) -GENERATED += $(patsubst %.in,%,$(wildcard rpm/*.spec.in)) +$(TARBALL): $(shell git ls-files) + mkdir -p $$(dirname $@) + (git archive --prefix=$(PROJECT)-$(VERSION)/ HEAD | gzip -) > $@ clean: - $(qecho) Cleaning - $(Q)$(RM) $(GENERATED) + +distclean: clean + $(RM) -r dist -- libgit2 0.21.2