diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-04-30 15:03:24 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-05-01 14:51:18 +0100 |
| commit | 9f69251f7192ea24c9561235844bf1632a14576d (patch) | |
| tree | ba0df3b72a1c55016278438c7c40015edc711301 | |
| parent | 8dbc5f201f1da8df8cceed3cae2e735f1e11ae12 (diff) | |
| download | libguestfs-9f69251f7192ea24c9561235844bf1632a14576d.tar.gz libguestfs-9f69251f7192ea24c9561235844bf1632a14576d.tar.xz libguestfs-9f69251f7192ea24c9561235844bf1632a14576d.zip | |
Move 'libguestfs.pc' (pkgconfig file) to src/ directory.
Since it describes the C library, it's better in the src/ directory.
(cherry picked from commit bb73cf0941ba9d34eb2ecf82d10ecb5fc5d2362d)
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/libguestfs.pc.in (renamed from libguestfs.pc.in) | 0 |
5 files changed, 8 insertions, 8 deletions
@@ -181,7 +181,6 @@ java/doc-stamp java/examples/guestfs-java.3 java/examples/stamp-guestfs-java.pod *.la -libguestfs.pc libguestfs.spec libguestfs-*.tar.gz .libs @@ -332,6 +331,7 @@ src/guestfs_protocol.c src/guestfs_protocol.h src/guestfs_protocol.x src/guestfs-structs.pod +src/libguestfs.pc src/libguestfs.syms src/.libs/libguestfs.so src/stamp-guestfs.pod diff --git a/Makefile.am b/Makefile.am index c8475635..6aad8b77 100644 --- a/Makefile.am +++ b/Makefile.am @@ -166,7 +166,6 @@ EXTRA_DIST = \ debian/shlibs.local \ debian/watch \ html/pod.css \ - libguestfs.pc libguestfs.pc.in \ libtool-kill-dependency_libs.sh \ logo/fish.svg logo/fish.png \ m4/.gitignore \ @@ -259,11 +258,6 @@ all-local: LC_ALL=C sort | \ sed 's,^\./,,' > po/POTFILES.in -# Pkgconfig. - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libguestfs.pc - # Make clean. CLEANFILES = \ diff --git a/configure.ac b/configure.ac index 97beedd1..d1c6a896 100644 --- a/configure.ac +++ b/configure.ac @@ -1160,7 +1160,6 @@ AC_CONFIG_FILES([Makefile inspector/Makefile java/Makefile java/examples/Makefile - libguestfs.pc ocaml/META ocaml/Makefile ocaml/examples/Makefile @@ -1181,6 +1180,7 @@ AC_CONFIG_FILES([Makefile ruby/examples/Makefile sparsify/Makefile src/Makefile + src/libguestfs.pc test-tool/Makefile tests/c-api/Makefile tests/data/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index b91ffc1c..9ab0e67c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,6 +43,7 @@ EXTRA_DIST = \ $(BUILT_SOURCES) \ MAX_PROC_NR \ libguestfs.3 \ + libguestfs.pc libguestfs.pc.in \ guestfs.pod \ api-support/added \ api-support/README \ @@ -183,6 +184,11 @@ guestfs_protocol.h: guestfs_protocol.x mv $@-t $@ endif +# Pkgconfig. + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libguestfs.pc + # Manual page. man_MANS = guestfs.3 libguestfs.3 diff --git a/libguestfs.pc.in b/src/libguestfs.pc.in index 679ed7eb..679ed7eb 100644 --- a/libguestfs.pc.in +++ b/src/libguestfs.pc.in |