mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

static: Use correct libraries for static binaries.

Browse Source 
Also add virt-cat.static target.
This commit is contained in:
Richard W.M. Jones
2010-11-13 08:13:18 +00:00
parent 74cc619d94
commit 92444940f3
6 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -33,6 +33,7 @@ capitests/tests.c
capitests/test*.tmp
cat/virt-cat
cat/virt-cat.1
cat/virt-cat.static
ChangeLog
*.class
*.cma

2
Makefile.am
View File

@@ -253,5 +253,7 @@ bindist:
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
cp cat/virt-cat.static $(BINTMPDIR)$(bindir)/virt-cat
(cd $(BINTMPDIR) && tar cf - .) | \
gzip -c -9 > libguestfs-$(VERSION)-$(host_cpu).tar.gz

6
cat/Makefile.am
View File

@@ -76,3 +76,9 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance
TESTS = test-virt-cat.sh
# Build a partly-static library (for the binary distribution).
virt-cat.static$(EXEEXT): $(virt_cat_OBJECTS) $(virt_cat_DEPENDENCIES)
$(top_srcdir)/relink-static.sh \
$(virt_cat_LINK) $(virt_cat_OBJECTS) -static $(virt_cat_LDADD) $(virt_cat_LIBS) $(LIBVIRT_LIBS) $(LIBXML2_LIBS) -lpcre -lhivex -lmagic -lz -lm

2
fish/Makefile.am
View File

@@ -130,7 +130,7 @@ endif
guestfish.static$(EXEEXT): $(guestfish_OBJECTS) $(guestfish_DEPENDENCIES)
$(top_srcdir)/relink-static.sh \
$(guestfish_LINK) $(guestfish_OBJECTS) -static $(guestfish_LDADD) $(guestfish_LIBS) -ltinfo -lpcre -lhivex -lmagic -lz -lm
$(guestfish_LINK) $(guestfish_OBJECTS) -static $(guestfish_LDADD) $(guestfish_LIBS) $(LIBVIRT_LIBS) $(LIBXML2_LIBS) -ltinfo -lpcre -lhivex -lmagic -lz -lm
# Manual page.
# guestfish-actions.pod and guestfish-commands.pod are autogenerated.

2
fuse/Makefile.am
View File

@@ -57,7 +57,7 @@ guestmount_LDADD = \
guestmount.static$(EXEEXT): $(guestmount_OBJECTS) $(guestmount_DEPENDENCIES)
$(top_srcdir)/relink-static.sh \
$(guestmount_LINK) $(guestmount_OBJECTS) -static $(guestmount_LDADD) $(guestmount_LIBS) -lpcre -lhivex -lmagic -lz -lm
$(guestmount_LINK) $(guestmount_OBJECTS) -static $(guestmount_LDADD) $(guestmount_LIBS) $(LIBVIRT_LIBS) $(LIBXML2_LIBS) -lpcre -lhivex -lmagic -lz -lm
# Documentation.

2
test-tool/Makefile.am
View File

@@ -43,7 +43,7 @@ libguestfs_test_tool_helper_LDFLAGS = -all-static
libguestfs-test-tool.static$(EXEEXT): $(libguestfs_test_tool_OBJECTS) $(libguestfs_test_tool_DEPENDENCIES)
$(top_srcdir)/relink-static.sh \
$(libguestfs_test_tool_LINK) $(libguestfs_test_tool_OBJECTS) -static $(libguestfs_test_tool_LDADD) $(libguestfs_test_tool_LIBS) -lpcre -lhivex -lmagic -lz
$(libguestfs_test_tool_LINK) $(libguestfs_test_tool_OBJECTS) -static $(libguestfs_test_tool_LDADD) $(libguestfs_test_tool_LIBS) $(LIBVIRT_LIBS) $(LIBXML2_LIBS) -lpcre -lhivex -lmagic -lz -lm
libguestfs-test-tool.1: libguestfs-test-tool.pod
$(POD2MAN) \