X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=17adf1ca09acd03656d59771f9572e127d6067f5;hp=c035977de46c712b0dfbb2e751f7240da8abcb84;hb=a1e8cdf2a254c5eddaf525cd7c34e4c937690204;hpb=7b309445d4e9f93088ca052469338c8e3ce8dcbf

diff --git a/Makefile.am b/Makefile.am
index c035977..17adf1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon fish examples images
+SUBDIRS = src daemon appliance fish po examples images
 
 if HAVE_OCAML
 SUBDIRS += ocaml
@@ -42,7 +42,7 @@ SUBDIRS += inspector
 endif
 
 EXTRA_DIST = \
-	make-initramfs.sh update-initramfs.sh \
+	config.rpath \
 	guestfs.pod guestfs-actions.pod guestfs-structs.pod \
 	guestfish.pod guestfish-actions.pod \
 	html/pod.css \
@@ -59,57 +59,28 @@ EXTRA_DIST = \
 	make-recipes.sh \
 	test-cleanup.sh \
 	contrib/README \
-	contrib/centos5.3-libguestfs.spec \
-	contrib/fedora-libguestfs.spec \
 	contrib/febootstrap/install.title \
 	contrib/febootstrap/install.html \
-	contrib/febootstrap/install.sh
-
-# Build the root filesystem.
-# Currently this is arch-dependent, so it seems like putting it in
-# $(libdir) is best.  When we build cross-architecture filesystems we
-# should probably move them to $(datadir).
-
-fsdir = $(libdir)/guestfs
-
-INITRAMFSIMG = initramfs.$(REPO).$(host_cpu).img
-VMLINUZ = vmlinuz.$(REPO).$(host_cpu)
-
-fs_DATA =  $(INITRAMFSIMG) $(VMLINUZ)
-
-$(INITRAMFSIMG) $(VMLINUZ): initramfs/fakeroot.log
-
-initramfs/fakeroot.log: make-initramfs.sh.in
-	-mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
-	-mv $(VMLINUZ) $(VMLINUZ).bak
-	if ! bash $(top_builddir)/make-initramfs.sh; then rm -f $@; exit 1; fi
-
-$(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
-	rm -f $@
-	bash $(top_builddir)/update-initramfs.sh
-	touch $@
-
-make-initramfs.sh: make-initramfs.sh.in
-	./config.status $@
+	contrib/febootstrap/install.sh \
+	test-bootbootboot.sh
 
 # Tests.  These are auto-generated from the test descriptions
 # in the generator.
 
 check_PROGRAMS = tests test-command
 
-tests_SOURCES = tests.c test-bootbootboot.sh
+tests_SOURCES = tests.c
 tests_CFLAGS = \
 	-I$(top_builddir)/src -Wall
 tests_LDADD = $(top_builddir)/src/libguestfs.la
 
-TESTS = tests
+TESTS = tests test-bootbootboot.sh
 TESTS_ENVIRONMENT = \
 	SKIP_TEST_COMMAND=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
-	SKIP_ZEROFREE=$(shell test -x initramfs/usr/sbin/zerofree || echo 1) \
+	SKIP_TEST_COMMAND_LINES=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
+	SKIP_TEST_ZEROFREE=$(shell test -x initramfs/usr/sbin/zerofree || echo 1) \
 	$(VG)
 
-$(TESTS): $(INITRAMFS) $(VMLINUZ)
-
 # Run the tests under valgrind.
 
 valgrind:
@@ -179,11 +150,18 @@ html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar
 	sh make-recipes.sh recipes/*.sh > $@-t
 	mv $@-t $@
 
-website: html/guestfs.3.html html/guestfish.1.html \
+HTMLFILES = html/guestfs.3.html html/guestfish.1.html \
 	html/virt-inspector.1.html \
-	html/recipes.html
-	cp $^ html/pod.css html/recipes.css \
-	  $(HOME)/d/redhat/et-website/libguestfs/
+	html/recipes.html \
+	html/pod.css html/recipes.css
+
+TEXTFILES = README TODO HACKING
+
+WEBSITEDIR = $(HOME)/d/redhat/et-website/libguestfs
+
+website: $(HTMLFILES) $(TEXTFILES)
+	cp $(HTMLFILES) $(WEBSITEDIR)
+	for f in $(TEXTFILES); do cp $$f $(WEBSITEDIR)/$$f.txt; done
 
 # Generate the ChangeLog automatically from the gitlog.
 
@@ -196,34 +174,6 @@ dist-hook:
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libguestfs.pc
 
-# Test-boot the image.
-
-test-boot: emptydisk
-	qemu-system-$(host_cpu) \
-	  -m 384 \
-	  -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
-	  -hda emptydisk
-
-emptydisk:
-	rm -f emptydisk
-	dd if=/dev/zero of=emptydisk bs=1024 count=1440
-	echo 0, | sfdisk -q -C 80 -H 2 -S 18 emptydisk > /dev/null
-
-# This is a more realistic test boot command line which better
-# reflects what the library does.
-
-test-boot-realistic: emptydisk
-	qemu-system-$(host_cpu) \
-	  -m 384 \
-	  -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
-	  -hda emptydisk \
-	  -append "console=ttyS0 guestfs=10.0.2.4:6666" \
-	  -nographic \
-	  -serial stdio \
-	  -net channel,6666:unix:/tmp/sock,server,nowait \
-	  -net user,vlan=0 \
-	  -net nic,model=virtio,vlan=0
-
 # Make clean.
 
 CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp