X-Git-Url: http://git.annexia.org/?p=virt-what.git;a=blobdiff_plain;f=Makefile.am;h=3c0d5ba0ba5c00080f51cee324d28a6f801549c4;hp=08336d7f7845d5adce01c14dc9594c0da8c87a15;hb=HEAD;hpb=a463d724532e16307b7b12413037fe8e5d304721

diff --git a/Makefile.am b/Makefile.am
index 08336d7..b68540f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,80 +15,57 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-EXTRA_DIST = \
-	virt-what.in \
-	virt-what.pod \
-	tests/baremetal/proc/cpuinfo \
-	tests/baremetal/proc/self/status \
-	tests/baremetal/sbin/dmidecode \
-	tests/baremetal/sbin/id \
-	tests/baremetal/sbin/virt-what-cpuid-helper \
-	tests/esx4.1/proc/cpuinfo \
-	tests/esx4.1/proc/self/status \
-	tests/esx4.1/sbin/dmidecode \
-	tests/esx4.1/sbin/id \
-	tests/esx4.1/sbin/virt-what-cpuid-helper \
-	tests/kvm/proc/cpuinfo \
-	tests/kvm/proc/self/status \
-	tests/kvm/sbin/dmidecode \
-	tests/kvm/sbin/id \
-	tests/kvm/sbin/virt-what-cpuid-helper \
-	tests/linux-vserver/proc/cpuinfo \
-	tests/linux-vserver/proc/self/status \
-	tests/linux-vserver/sbin/dmidecode \
-	tests/linux-vserver/sbin/id \
-	tests/linux-vserver/sbin/virt-what-cpuid-helper \
-	tests/qemu/proc/cpuinfo \
-	tests/qemu/proc/self/status \
-	tests/qemu/sbin/dmidecode \
-	tests/qemu/sbin/id \
-	tests/qemu/sbin/virt-what-cpuid-helper \
-	tests/rhel5-xen-dom0/proc/cpuinfo \
-	tests/rhel5-xen-dom0/proc/self/status \
-	tests/rhel5-xen-dom0/sbin/dmidecode \
-	tests/rhel5-xen-dom0/sbin/id \
-	tests/rhel5-xen-dom0/sbin/virt-what-cpuid-helper \
-	tests/rhel5-xen-domU-hvm/proc/cpuinfo \
-	tests/rhel5-xen-domU-hvm/proc/self/status \
-	tests/rhel5-xen-domU-hvm/sbin/dmidecode \
-	tests/rhel5-xen-domU-hvm/sbin/id \
-	tests/rhel5-xen-domU-hvm/sbin/virt-what-cpuid-helper \
-	tests/rhel5-xen-domU-pv/proc/cpuinfo \
-	tests/rhel5-xen-domU-pv/proc/self/status \
-	tests/rhel5-xen-domU-pv/sbin/dmidecode \
-	tests/rhel5-xen-domU-pv/sbin/id \
-	tests/rhel5-xen-domU-pv/sbin/virt-what-cpuid-helper \
-	tests/test-baremetal.sh \
-	tests/test-esx4.1.sh \
-	tests/test-kvm.sh \
-	tests/test-linux-vserver.sh \
-	tests/test-qemu.sh \
-	tests/test-rhel5-xen-dom0.sh \
-	tests/test-rhel5-xen-domU-hvm.sh \
-	tests/test-rhel5-xen-domU-pv.sh
+AM_CPPFLAGS = -Wall
 
-CLEANFILES = virt-what.1 virt-what.txt
+CLEANFILES = virt-what *~
 
-AM_CPPFLAGS = -Wall
+EXTRA_DIST = .gitignore virt-what.in virt-what.pod
+
+SUBDIRS = . tests
 
 sbin_SCRIPTS = virt-what
+sbin_PROGRAMS = virt-what-cvm
 libexec_PROGRAMS = virt-what-cpuid-helper
+if HOST_CPU_IA64
+libexec_PROGRAMS += virt-what-ia64-xen-rdtsc-test
+endif
+
+if HAVE_POD2MAN
 
-man_MANS = virt-what.1
+CLEANFILES += virt-what.1 virt-what-cvm.1 virt-what.txt virt-what-cvm.txt
+man_MANS = virt-what.1 virt-what-cvm.1
 
-virt-what.1: virt-what.pod
+%.1: %.pod
 	pod2man -c "Virtualization Support" --release "$(PACKAGE)-$(VERSION)" \
-	  $< > $@
+	  $? > $@
+%.txt: %.pod
+	pod2text $? > $@
+
+endif
+
+#----------------------------------------------------------------------
+# Maintainers only!
+
+# Check no files are missing from EXTRA_DIST rules, and that all
+# generated files have been included in the tarball.  (Note you must
+# have done 'make dist')
+maintainer-check-extra-dist:
+	@zcat $(PACKAGE_NAME)-$(VERSION).tar.gz | tar tf - | sort | \
+	  sed 's,^$(PACKAGE_NAME)-$(VERSION)/,,' > tarfiles
+	@git ls-files | \
+	  sort > gitfiles
+	@comm -13 tarfiles gitfiles > comm-out
+	@echo Checking for differences between EXTRA_DIST and git ...
+	@cat comm-out
+	@[ ! -s comm-out ]
+	@rm tarfiles gitfiles comm-out
+	@echo PASS: EXTRA_DIST tests
 
-virt-what.txt: virt-what.pod
-	pod2text $< > $@
+# Commit everything in the current directory and set the commit
+# message to the current version number.
+maintainer-commit:
+	git commit -a -m "Version $(VERSION)."
 
-TESTS = \
-	tests/test-baremetal.sh \
-	tests/test-esx4.1.sh \
-	tests/test-kvm.sh \
-	tests/test-linux-vserver.sh \
-	tests/test-qemu.sh \
-	tests/test-rhel5-xen-dom0.sh \
-	tests/test-rhel5-xen-domU-hvm.sh \
-	tests/test-rhel5-xen-domU-pv.sh
+# Tag HEAD with the current version.
+maintainer-tag:
+	git tag -a v$(VERSION) -m "Version $(VERSION)." -f