diff --git a/.gitignore b/.gitignore index eaff53114..757b6f92d 100644 --- a/.gitignore +++ b/.gitignore @@ -199,7 +199,6 @@ pod2htm?.tmp /java/doc-stamp /java/examples/guestfs-java.3 /java/examples/stamp-guestfs-java.pod -/libguestfs.pc /libguestfs.spec /libguestfs-*.tar.gz /libtool @@ -358,6 +357,7 @@ pod2htm?.tmp /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 ae0ea3ff6..b3df5b354 100644 --- a/Makefile.am +++ b/Makefile.am @@ -136,7 +136,6 @@ EXTRA_DIST = \ contrib/visualize-alignment/README \ contrib/visualize-alignment/tracetops.ml \ html/pod.css \ - libguestfs.pc libguestfs.pc.in \ libtool-kill-dependency_libs.sh \ logo/fish.svg logo/fish.png \ m4/.gitignore \ @@ -232,11 +231,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 177545598..9e17b4e25 100644 --- a/configure.ac +++ b/configure.ac @@ -1206,7 +1206,6 @@ AC_CONFIG_FILES([Makefile inspector/Makefile java/Makefile java/examples/Makefile - libguestfs.pc ocaml/META ocaml/Makefile ocaml/examples/Makefile @@ -1227,6 +1226,7 @@ AC_CONFIG_FILES([Makefile ruby/examples/Makefile sparsify/Makefile src/Makefile + src/libguestfs.pc sysprep/Makefile test-tool/Makefile tests/btrfs/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index a7fcbac61..d29a38ee8 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 \ @@ -190,6 +191,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 similarity index 100% rename from libguestfs.pc.in rename to src/libguestfs.pc.in