X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=f089cb8caa1371b2fea72f720973418fee8502d6;hb=8e4c22db236f08f836a8ab94c8bb025d727684b5;hp=fb1a0840e511988adf9d095b0f99e0547de14c2a;hpb=a44ec081b6ea10036ca0734197a47b1dfa035a1a;p=libguestfs.git

diff --git a/Makefile.am b/Makefile.am
index fb1a084..f089cb8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,7 +95,6 @@ EXTRA_DIST = \
 	libtool-kill-dependency_libs.sh \
 	autogen.sh \
 	bugs-in-changelog.sh \
-	relink-static.sh \
 	update-bugs.sh
 
 # Recipes web page.
@@ -186,9 +185,6 @@ CLEANFILES = \
 	pod2htm?.tmp \
 	html/*.html
 
-clean-local:
-	rm -rf initramfs
-
 # If you don't want to run all of the tests ('make check') then this
 # will just run libguestfs-test-tool for a quick check.  Note this
 # is NOT a substitute for proper testing!
@@ -196,14 +192,7 @@ clean-local:
 quickcheck:
 	test-tool/run-test-tool-locally
 
-# Mostly static binary distribution.
-#
-# Some binaries are relinked partially statically.  You can make these
-# binaries "more static" by making sure that as many foo-static
-# packages are installed as possible.
-#
-# We remove the supermin appliance and adjust some directories to make
-# them non-Fedora-specific.
+# Make binary distribution.
 
 BINTMPDIR = /tmp/libguestfs-bin
 bindist:
@@ -211,26 +200,6 @@ bindist:
 	mkdir $(BINTMPDIR)
 	$(MAKE)
 	$(MAKE) DESTDIR=$(BINTMPDIR) install
-	rm -r $(BINTMPDIR)$(libdir)/guestfs/supermin.d
-	rm $(BINTMPDIR)$(libdir)/guestfs/kmod.whitelist
-	mv $(BINTMPDIR)$(prefix)/lib64/* $(BINTMPDIR)$(libdir)
-	mv $(BINTMPDIR)/usr/lib64/* $(BINTMPDIR)$(libdir)
 	-find $(BINTMPDIR) -type d -exec rmdir --ignore-fail-on-non-empty {} \;
-	$(MAKE) -C fish guestfish.static
-	cp fish/guestfish.static $(BINTMPDIR)$(bindir)/guestfish
-	$(MAKE) -C fuse guestmount.static
-	cp fuse/guestmount.static $(BINTMPDIR)$(bindir)/guestmount
-	$(MAKE) -C test-tool libguestfs-test-tool.static
-	cp test-tool/libguestfs-test-tool.static $(BINTMPDIR)$(bindir)/libguestfs-test-tool
-	$(MAKE) -C cat virt-cat.static virt-filesystems.static virt-ls.static
-	cp cat/virt-cat.static $(BINTMPDIR)$(bindir)/virt-cat
-	cp cat/virt-filesystems.static $(BINTMPDIR)$(bindir)/virt-filesystems
-	cp cat/virt-ls.static $(BINTMPDIR)$(bindir)/virt-ls
-	$(MAKE) -C df virt-df.static
-	cp df/virt-df.static $(BINTMPDIR)$(bindir)/virt-df
-	$(MAKE) -C inspector virt-inspector.static
-	cp inspector/virt-inspector.static $(BINTMPDIR)$(bindir)/virt-inspector
-	$(MAKE) -C rescue virt-rescue.static
-	cp rescue/virt-rescue.static $(BINTMPDIR)$(bindir)/virt-rescue
 	(cd $(BINTMPDIR) && tar cf - .) | \
-	  gzip -c -9 > libguestfs-$(VERSION)-$(host_cpu).tar.gz
+	  gzip -c -9 > libguestfs-$(VERSION)-$(DISTRO)-$(host_cpu).tar.gz