From 43be6155b467d6ba1170c0740cbf5eda88c1ab40 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sun, 31 Mar 2019 15:24:42 +0200 Subject: [PATCH] cleanup makefiles, set target dirs per makefile be more consistent with the buildsystems of our other packages. compared old to new with diffoscope, no real changes (besides different SOURCE file, as base check commits differ) Signed-off-by: Thomas Lamprecht --- Makefile | 35 ++++++++++++--------------------- src/Makefile | 36 ++++++++++++++++------------------ src/PVE/API2/Firewall/Makefile | 8 ++++++-- src/PVE/API2/Makefile | 7 +++++-- src/PVE/Makefile | 7 +++++-- src/PVE/Service/Makefile | 8 ++++++-- 6 files changed, 51 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index d1ab5ca..f35f1a9 100644 --- a/Makefile +++ b/Makefile @@ -3,13 +3,7 @@ PKGREL=18 PACKAGE=pve-firewall -PREFIX=/usr -BINDIR=${PREFIX}/bin -SBINDIR=${PREFIX}/sbin -MANDIR=${PREFIX}/share/man -DOCDIR=${PREFIX}/share/doc -MAN1DIR=${MANDIR}/man1/ -PERLDIR=${PREFIX}/share/perl5 +BUILDDIR ?= ${PACKAGE}-${VERSION} ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) GITVERSION:=$(shell git rev-parse HEAD) @@ -24,33 +18,28 @@ all: $(DEBS) dinstall: deb dpkg -i $(DEBS) +${BUILDDIR}: + rm -rf ${BUILDDIR} + rsync -a src/ debian ${BUILDDIR} + echo "git clone git://git.proxmox.com/git/pve-firewall.git\\ngit checkout ${GITVERSION}" > ${BUILDDIR}/debian/SOURCE .PHONY: deb deb: $(DEBS) $(DEB2): $(DEB) -$(DEB): src test debian - make check - rm -rf build - rsync -a src/ build - rsync -a debian/ build/debian - echo "git clone git://git.proxmox.com/git/pve-firewall.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE - # install - cd build; dpkg-buildpackage -b -us -uc +$(DEB): ${BUILDDIR} check + cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc lintian ${DEBS} .PHONY: check -check: +check: make -C test check -.PHONY: clean -clean: +.PHONY: clean distclean +distclean: clean +clean: make -C src clean make -C test clean - rm -rf *~ debian/*~ example/*~ *.deb *.changes *.buildinfo build ${PACKAGE}-*.tar.gz - -.PHONY: distclean -distclean: clean - + rm -rf *~ debian/*~ example/*~ *.deb *.changes *.buildinfo ${BUILDDIR} ${PACKAGE}-*.tar.gz .PHONY: upload upload: $(DEBS) diff --git a/src/Makefile b/src/Makefile index 2280abd..7cea6b5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,14 +1,13 @@ - -export PREFIX=/usr -export BINDIR=${PREFIX}/bin -export SBINDIR=${PREFIX}/sbin -export MANDIR=${PREFIX}/share/man -export DOCDIR=${PREFIX}/share/doc/pve-firewall -export MAN1DIR=${MANDIR}/man1/ -export MAN8DIR=${MANDIR}/man8/ -export PERLDIR=${PREFIX}/share/perl5 -export BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions -export ZSHCOMPLDIR=${PREFIX}/share/zsh/vendor-completions +DESTDIR= +PREFIX= /usr +BINDIR=${DESTDIR}/${PREFIX}/bin +SBINDIR=${DESTDIR}/${PREFIX}/sbin +MANDIR=${DESTDIR}/${PREFIX}/share/man +DOCDIR=${DESTDIR}/${PREFIX}/share/doc/pve-firewall +MAN1DIR=${MANDIR}/man1/ +MAN8DIR=${MANDIR}/man8/ +BASHCOMPLDIR=${DESTDIR}/${PREFIX}/share/bash-completion/completions +ZSHCOMPLDIR=${DESTDIR}/${PREFIX}/share/zsh/vendor-completions export NOVIEW=1 include /usr/share/pve-doc-generator/pve-doc-generator.mk @@ -35,13 +34,13 @@ pvefw-logger: pvefw-logger.c .PHONY: install install: pve-firewall pve-firewall.8 pve-firewall.bash-completion pve-firewall.zsh-completion pvefw-logger make -C PVE install - install -d -m 0755 ${DESTDIR}/${SBINDIR} - install -m 0755 pve-firewall ${DESTDIR}/${SBINDIR} - install -m 0755 pvefw-logger ${DESTDIR}/${SBINDIR} - install -d ${DESTDIR}/${MAN8DIR} - install -m 0644 pve-firewall.8 ${DESTDIR}/${MAN8DIR} - install -m 0644 -D pve-firewall.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/pve-firewall - install -m 0644 -D pve-firewall.zsh-completion ${DESTDIR}/${ZSHCOMPLDIR}/_pve-firewall + install -d -m 0755 ${SBINDIR} + install -m 0755 pve-firewall ${SBINDIR} + install -m 0755 pvefw-logger ${SBINDIR} + install -d ${MAN8DIR} + install -m 0644 pve-firewall.8 ${MAN8DIR} + install -m 0644 -D pve-firewall.bash-completion ${BASHCOMPLDIR}/pve-firewall + install -m 0644 -D pve-firewall.zsh-completion ${ZSHCOMPLDIR}/_pve-firewall install -d -m 0755 ${DESTDIR}/usr/lib/sysctl.d/ install -m 0644 pve-firewall-sysctl.conf ${DESTDIR}/usr/lib/sysctl.d/pve-firewall.conf @@ -55,4 +54,3 @@ clean: .PHONY: distclean distclean: clean - diff --git a/src/PVE/API2/Firewall/Makefile b/src/PVE/API2/Firewall/Makefile index 7c5988b..7b2c345 100644 --- a/src/PVE/API2/Firewall/Makefile +++ b/src/PVE/API2/Firewall/Makefile @@ -1,3 +1,7 @@ +DESTDIR= +PREFIX=/usr +PERLDIR=${DESTDIR}/${PREFIX}/share/perl5 + LIB_SOURCES= \ Aliases.pm \ IPSet.pm \ @@ -11,8 +15,8 @@ all: .PHONY: install install: - install -d -m 0755 ${DESTDIR}${PERLDIR}/PVE/API2/Firewall - for i in ${LIB_SOURCES}; do install -D -m 0644 $$i ${DESTDIR}${PERLDIR}/PVE/API2/Firewall/$$i; done + install -d -m 0755 ${PERLDIR}/PVE/API2/Firewall + for i in ${LIB_SOURCES}; do install -D -m 0644 $$i ${PERLDIR}/PVE/API2/Firewall/$$i; done .PHONY: clean diff --git a/src/PVE/API2/Makefile b/src/PVE/API2/Makefile index a9ea452..3c8f956 100644 --- a/src/PVE/API2/Makefile +++ b/src/PVE/API2/Makefile @@ -1,12 +1,15 @@ +DESTDIR= +PREFIX=/usr +PERLDIR=${DESTDIR}/${PREFIX}/share/perl5 all: .PHONY: install install: - install -d -m 0755 ${DESTDIR}${PERLDIR}/PVE/API2 + install -d -m 0755 ${PERLDIR}/PVE/API2 make -C Firewall install .PHONY: clean clean: rm -rf *~ - make -C Firewall clean \ No newline at end of file + make -C Firewall clean diff --git a/src/PVE/Makefile b/src/PVE/Makefile index 2c006c5..9fdfd9b 100644 --- a/src/PVE/Makefile +++ b/src/PVE/Makefile @@ -1,3 +1,6 @@ +DESTDIR= +PREFIX= /usr +PERLDIR=${DESTDIR}/${PREFIX}/share/perl5 LIB_SOURCES= \ FirewallSimulator.pm \ @@ -7,8 +10,8 @@ all: .PHONY: install install: - install -d -m 0755 ${DESTDIR}${PERLDIR}/PVE - for i in ${LIB_SOURCES}; do install -D -m 0644 $$i ${DESTDIR}${PERLDIR}/PVE/$$i; done + install -d -m 0755 ${PERLDIR}/PVE + for i in ${LIB_SOURCES}; do install -D -m 0644 $$i ${PERLDIR}/PVE/$$i; done make -C API2 install make -C Service install diff --git a/src/PVE/Service/Makefile b/src/PVE/Service/Makefile index 22ece05..423f322 100644 --- a/src/PVE/Service/Makefile +++ b/src/PVE/Service/Makefile @@ -1,8 +1,12 @@ +DESTDIR= +PREFIX=/usr +PERLDIR=${DESTDIR}/${PREFIX}/share/perl5 + SOURCES=pve_firewall.pm .PHONY: install install: ${SOURCES} - install -d -m 0755 ${DESTDIR}${PERLDIR}/PVE/Service - for i in ${SOURCES}; do install -D -m 0644 $$i ${DESTDIR}${PERLDIR}/PVE/Service/$$i; done + install -d -m 0755 ${PERLDIR}/PVE/Service + for i in ${SOURCES}; do install -D -m 0644 $$i ${PERLDIR}/PVE/Service/$$i; done clean: -- 2.39.2