Skip to content

Commit

Permalink
switch over build-for-packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
yseto committed Dec 15, 2022
1 parent c1e0cfd commit b65802c
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ build:
$(MAKE) $(BINDIR)/$$i; \
done

.PHONY: build-for-packaging
build-for-packaging:
for i in `cat packaging/plugin-lists`; do \
$(MAKE) $(BINDIR)/$$i; \
done

build/mackerel-plugin: $(patsubst %,depends_on,$(GOOS)$(GOARCH))
mkdir -p build
go build -ldflags="-s -w -X main.gitcommit=$(CURRENT_REVISION)" \
Expand Down Expand Up @@ -54,11 +60,11 @@ rpm: rpm-v1 rpm-v2

.PHONY: rpm-v1
rpm-v1:
$(MAKE) build GOOS=linux GOARCH=386
$(MAKE) build-for-packaging GOOS=linux GOARCH=386
rpmbuild --define "_sourcedir `pwd`" --define "_bindir build/linux/386" \
--define "_version ${VERSION}" --define "buildarch noarch" \
--target noarch -bb packaging/rpm/mackerel-agent-plugins.spec
$(MAKE) build GOOS=linux GOARCH=amd64
$(MAKE) build-for-packaging GOOS=linux GOARCH=amd64
rpmbuild --define "_sourcedir `pwd`" --define "_bindir build/linux/amd64" \
--define "_version ${VERSION}" --define "buildarch x86_64" \
--target x86_64 -bb packaging/rpm/mackerel-agent-plugins.spec
Expand Down Expand Up @@ -91,7 +97,7 @@ deb: deb-v1 deb-v2

.PHONY: deb-v1
deb-v1:
$(MAKE) build GOOS=linux GOARCH=386
$(MAKE) build-for-packaging GOOS=linux GOARCH=386
for i in `cat packaging/deb/debian/source/include-binaries`; do \
cp build/linux/386/`basename $$i` packaging/deb/debian/; \
done
Expand Down

0 comments on commit b65802c

Please sign in to comment.