X-Git-Url: https://git.proxmox.com/?p=qemu-server.git;a=blobdiff_plain;f=Makefile;h=6e8fc78ac855e14556d46d62276680091f04111d;hp=54c66ab7fcb396af686b2c3b4f0aed9e82b03562;hb=HEAD;hpb=f4c1d8e29a18febf3bad95c2e805ae9fc3a1c7d0

diff --git a/Makefile b/Makefile
index 54c66ab..133468d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,121 +1,119 @@
-VERSION=4.0
-PACKAGE=qemu-server
-PKGREL=103
+include /usr/share/dpkg/default.mk
 
-CFLAGS= -O2 -Werror -Wall -Wtype-limits -Wl,-z,relro 
+PACKAGE=qemu-server
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
 DESTDIR=
 PREFIX=/usr
-BINDIR=${PREFIX}/bin
-SBINDIR=${PREFIX}/sbin
-BINDIR=${PREFIX}/bin
-LIBDIR=${PREFIX}/lib/${PACKAGE}
-VARLIBDIR=/var/lib/${PACKAGE}
-MANDIR=${PREFIX}/share/man
-DOCDIR=${PREFIX}/share/doc
-MAN1DIR=${MANDIR}/man1/
-MAN5DIR=${MANDIR}/man5/
-BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/
-export PERLDIR=${PREFIX}/share/perl5
-PERLINCDIR=${PERLDIR}/asm-x86_64
-
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
-
-DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
-
-# this requires package pve-doc-generator
-export NOVIEW=1
-include /usr/share/pve-doc-generator/pve-doc-generator.mk
-
-all: ${DEB}
+SBINDIR=$(PREFIX)/sbin
+LIBDIR=$(PREFIX)/lib/$(PACKAGE)
+MANDIR=$(PREFIX)/share/man
+DOCDIR=$(PREFIX)/share/doc
+MAN1DIR=$(MANDIR)/man1/
+MAN5DIR=$(MANDIR)/man5/
+BASHCOMPLDIR=$(PREFIX)/share/bash-completion/completions/
+ZSHCOMPLDIR=$(PREFIX)/share/zsh/vendor-completions/
+export PERLDIR=$(PREFIX)/share/perl5
+PERLINCDIR=$(PERLDIR)/asm-x86_64
 
-.PHONY: dinstall
-dinstall: deb
-	dpkg -i ${DEB}
+GITVERSION:=$(shell git rev-parse HEAD)
 
-control: control.in
-	sed -e s/@@VERSION@@/${VERSION}/ -e s/@@PKGRELEASE@@/${PKGREL}/ -e s/@@ARCH@@/${ARCH}/<$< >$@
+DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
+DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
+DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
 
-vzsyscalls.ph: vzsyscalls.h
-	 h2ph -d . vzsyscalls.h
+DEBS=$(DEB) $(DBG_DEB)
 
-vmtar: vmtar.c utils.c
-	gcc ${CFLAGS} -o vmtar vmtar.c
+-include /usr/share/pve-doc-generator/pve-doc-generator.mk
 
-sparsecp: sparsecp.c utils.c
-	gcc ${CFLAGS} -o sparsecp sparsecp.c
+all:
+
+.PHONY: dinstall
+dinstall: deb
+	dpkg -i $(DEB)
 
 qm.bash-completion:
-	perl -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_bash_completions();" >$@.tmp
+	PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_bash_completions();" >$@.tmp
 	mv $@.tmp $@
 
 qmrestore.bash-completion:
-	perl -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_bash_completions();" >$@.tmp
+	PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_bash_completions();" >$@.tmp
+	mv $@.tmp $@
+
+qm.zsh-completion:
+	PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_zsh_completions();" >$@.tmp
+	mv $@.tmp $@
+
+qmrestore.zsh-completion:
+	PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_zsh_completions();" >$@.tmp
 	mv $@.tmp $@
 
-PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract sparsecp vmtar control qm.conf.5 qm.bash-completion qmrestore.bash-completion
+PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract qm.conf.5 qm.bash-completion qmrestore.bash-completion \
+	    qm.zsh-completion qmrestore.zsh-completion cpu-models.conf.5
 
 .PHONY: install
-install: ${PKGSOURCES}
-	install -d ${DESTDIR}/${SBINDIR}
-	install -d ${DESTDIR}${LIBDIR}
-	install -d ${DESTDIR}${VARLIBDIR}
-	install -d ${DESTDIR}/${MAN1DIR}
-	install -d ${DESTDIR}/${MAN5DIR}
-	install -d ${DESTDIR}/usr/share/man/man5
-	install -d ${DESTDIR}/usr/share/${PACKAGE}
-	install -m 0644 pve-usb.cfg ${DESTDIR}/usr/share/${PACKAGE}
-	install -m 0644 pve-q35.cfg ${DESTDIR}/usr/share/${PACKAGE}
-	install -m 0644 -D qm.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/qm
-	install -m 0644 -D qmrestore.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/qmrestore
-	install -m 0644 -D bootsplash.jpg ${DESTDIR}/usr/share/${PACKAGE}
-	make -C PVE install
-	install -m 0755 qm ${DESTDIR}${SBINDIR}
-	install -m 0755 qmrestore ${DESTDIR}${SBINDIR}
-	install -m 0755 pve-bridge ${DESTDIR}${VARLIBDIR}/pve-bridge
-	install -m 0755 pve-bridge-hotplug ${DESTDIR}${VARLIBDIR}/pve-bridge-hotplug
-	install -m 0755 pve-bridgedown ${DESTDIR}${VARLIBDIR}/pve-bridgedown
-	install -s -m 0755 vmtar ${DESTDIR}${LIBDIR}
-	install -s -m 0755 sparsecp ${DESTDIR}${LIBDIR}
-	install -D -m 0644 modules-load.conf ${DESTDIR}/etc/modules-load.d/qemu-server.conf
-	install -m 0755 qmextract ${DESTDIR}${LIBDIR}
-	install -m 0644 qm.1 ${DESTDIR}/${MAN1DIR}
-	gzip -9 ${DESTDIR}/${MAN1DIR}/qm.1
-	install -m 0644 qmrestore.1 ${DESTDIR}/${MAN1DIR}
-	gzip -9 ${DESTDIR}/${MAN1DIR}/qmrestore.1
-	install -m 0644 qm.conf.5 ${DESTDIR}/${MAN5DIR}
-	gzip -9 ${DESTDIR}/${MAN5DIR}/qm.conf.5
-	cd ${DESTDIR}/${MAN5DIR}; ln -s qm.conf.5.gz vm.conf.5.gz
+install: $(PKGSOURCES)
+	install -d $(DESTDIR)/$(SBINDIR)
+	install -d $(DESTDIR)$(LIBDIR)
+	install -d $(DESTDIR)/$(MAN1DIR)
+	install -d $(DESTDIR)/$(MAN5DIR)
+	install -d $(DESTDIR)/usr/share/$(PACKAGE)
+	install -m 0644 -D qm.bash-completion $(DESTDIR)/$(BASHCOMPLDIR)/qm
+	install -m 0644 -D qmrestore.bash-completion $(DESTDIR)/$(BASHCOMPLDIR)/qmrestore
+	install -m 0644 -D qm.zsh-completion $(DESTDIR)/$(ZSHCOMPLDIR)/_qm
+	install -m 0644 -D qmrestore.zsh-completion $(DESTDIR)/$(ZSHCOMPLDIR)/_qmrestore
+	install -m 0644 -D bootsplash.jpg $(DESTDIR)/usr/share/$(PACKAGE)
+	$(MAKE) -C PVE install
+	$(MAKE) -C qmeventd install
+	$(MAKE) -C qemu-configs install
+	$(MAKE) -C vm-network-scripts install
+	install -m 0755 qm $(DESTDIR)$(SBINDIR)
+	install -m 0755 qmrestore $(DESTDIR)$(SBINDIR)
+	install -D -m 0644 modules-load.conf $(DESTDIR)/etc/modules-load.d/qemu-server.conf
+	install -m 0755 qmextract $(DESTDIR)$(LIBDIR)
+	install -m 0644 qm.1 $(DESTDIR)/$(MAN1DIR)
+	install -m 0644 qmrestore.1 $(DESTDIR)/$(MAN1DIR)
+	install -m 0644 cpu-models.conf.5 $(DESTDIR)/$(MAN5DIR)
+	install -m 0644 qm.conf.5 $(DESTDIR)/$(MAN5DIR)
+	cd $(DESTDIR)/$(MAN5DIR); ln -s -f qm.conf.5.gz vm.conf.5.gz
+
+$(BUILDDIR):
+	rm -rf $(BUILDDIR) $(BUILDDIR).tmp
+	rsync -a * $(BUILDDIR).tmp
+	echo "git clone git://git.proxmox.com/git/qemu-server.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR).tmp/debian/SOURCE
+	mv $(BUILDDIR).tmp $(BUILDDIR)
 
 .PHONY: deb
-deb ${DEB}: ${PKGSOURCES}
-	rm -f *.deb
-	rm -rf build
-	mkdir build
-	make DESTDIR=${CURDIR}/build install
-	perl -I. ./qm verifyapi
-	install -d -m 0755 build/DEBIAN
-	install -m 0644 control build/DEBIAN
-	install -m 0644 triggers build/DEBIAN
-	echo "/etc/modules-load.d/qemu-server.conf" >>build/DEBIAN/conffiles
-	install -D -m 0644 copyright build/${DOCDIR}/${PACKAGE}/copyright
-	install -m 0644 changelog.Debian build/${DOCDIR}/${PACKAGE}/
-	gzip -9 build/${DOCDIR}/${PACKAGE}/changelog.Debian
-	echo "git clone git://git.proxmox.com/git/qemu-server.git\\ngit checkout ${GITVERSION}" > build/${DOCDIR}/${PACKAGE}/SOURCE
-	dpkg-deb --build build	
-	mv build.deb ${DEB}
-	lintian ${DEB}
+deb: $(DEBS)
+$(DBG_DEB): $(DEB)
+$(DEB): $(BUILDDIR)
+	cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
+	lintian $(DEBS)
+
+.PHONY: dsc
+dsc: $(DSC)
+$(DSC): $(BUILDDIR)
+	cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
+	lintian $(DSC)
+
+sbuild: $(DSC)
+	sbuild $(DSC)
+
+.PHONY: test
+test:
+	PVE_GENERATING_DOCS=1 perl -I. ./qm verifyapi
+	$(MAKE) -C test
 
 .PHONY: upload
-upload: ${DEB}
-	tar cf - ${DEB} | ssh repoman@repo.proxmox.com upload
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
+upload: $(DEB)
+	tar cf - $(DEBS) | ssh -X repoman@repo.proxmox.com upload --product pve --dist $(UPLOAD_DIST)
 
 .PHONY: clean
-clean: 	
-	make cleanup-docgen
-	rm -rf build *.deb control vzsyscalls.ph _h2ph_pre.ph ${PACKAGE}-*.tar.gz dist *.1 *.5 *.pod vmtar sparsecp *.tmp *.bash-completion
-	find . -name '*~' -exec rm {} ';'
+clean:
+	$(MAKE) -C test $@
+	rm -rf $(PACKAGE)-*/ *.deb *.build *.buildinfo *.changes *.dsc $(PACKAGE)_*.tar.?z
+	rm -f *.xml.tmp *.1 *.5 *.8 *{synopsis,opts}.adoc docinfo.xml
 
 
 .PHONY: distclean