diff options
| author | Roger Leigh <rleigh@debian.org> | 2013-05-04 15:59:03 +0100 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2013-05-04 17:17:18 +0100 |
| commit | 35ee257e0dd8ffff918ef749d333e08d3563f173 (patch) | |
| tree | 8cfaf366179a5fe41d124c2e55dcd3c057343aa1 | |
| parent | 257af8af0398c0e60fc5aea40834912fe73b1f9b (diff) | |
| download | schroot-35ee257e0dd8ffff918ef749d333e08d3563f173.tar.gz | |
build: Install headers into correct subdirectories
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | lib/sbuild/Makefile.am | 69 |
2 files changed, 46 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index 71275da9..d86d44b8 100644 --- a/configure.ac +++ b/configure.ac @@ -238,8 +238,8 @@ AC_PROG_CXX AC_LANG([C++]) ACX_PTHREAD([], [AC_MSG_ERROR([POSIX thread support is required for correct std::tr1::shared_ptr operation])]) AC_CANONICAL_HOST -AC_DISABLE_SHARED -AC_ENABLE_STATIC +AC_ENABLE_SHARED +AC_DISABLE_STATIC AC_PROG_LIBTOOL AM_GNU_GETTEXT_VERSION([0.16]) AM_GNU_GETTEXT([external]) diff --git a/lib/sbuild/Makefile.am b/lib/sbuild/Makefile.am index aa4926de..e4fa3c1d 100644 --- a/lib/sbuild/Makefile.am +++ b/lib/sbuild/Makefile.am @@ -19,27 +19,6 @@ lib_LTLIBRARIES = lib/sbuild/libsbuild.la lib_sbuild_public_h_sources = \ - lib/sbuild/auth/auth.h \ - lib/sbuild/auth/deny.h \ - lib/sbuild/chroot/chroot.h \ - lib/sbuild/chroot/facet/custom.h \ - lib/sbuild/chroot/facet/directory.h \ - lib/sbuild/chroot/facet/directory-base.h \ - lib/sbuild/chroot/facet/facet.h \ - lib/sbuild/chroot/facet/factory.h \ - lib/sbuild/chroot/facet/file.h \ - lib/sbuild/chroot/facet/mountable.h \ - lib/sbuild/chroot/facet/personality.h \ - lib/sbuild/chroot/facet/plain.h \ - lib/sbuild/chroot/facet/session.h \ - lib/sbuild/chroot/facet/session-clonable.h \ - lib/sbuild/chroot/facet/session-setup.h \ - lib/sbuild/chroot/facet/source.h \ - lib/sbuild/chroot/facet/source-clonable.h \ - lib/sbuild/chroot/facet/source-setup.h \ - lib/sbuild/chroot/facet/storage.h \ - lib/sbuild/chroot/facet/userdata.h \ - lib/sbuild/chroot/config.h \ lib/sbuild/ctty.h \ lib/sbuild/custom-error.h \ lib/sbuild/environment.h \ @@ -65,6 +44,33 @@ lib_sbuild_public_h_sources = \ lib/sbuild/types.h \ lib/sbuild/util.h +lib_sbuild_auth_public_h_sources = \ + lib/sbuild/auth/auth.h \ + lib/sbuild/auth/deny.h + +lib_sbuild_chroot_public_h_sources = \ + lib/sbuild/chroot/chroot.h \ + lib/sbuild/chroot/config.h + +lib_sbuild_chroot_facet_public_h_sources = \ + lib/sbuild/chroot/facet/custom.h \ + lib/sbuild/chroot/facet/directory.h \ + lib/sbuild/chroot/facet/directory-base.h \ + lib/sbuild/chroot/facet/facet.h \ + lib/sbuild/chroot/facet/factory.h \ + lib/sbuild/chroot/facet/file.h \ + lib/sbuild/chroot/facet/mountable.h \ + lib/sbuild/chroot/facet/personality.h \ + lib/sbuild/chroot/facet/plain.h \ + lib/sbuild/chroot/facet/session.h \ + lib/sbuild/chroot/facet/session-clonable.h \ + lib/sbuild/chroot/facet/session-setup.h \ + lib/sbuild/chroot/facet/source.h \ + lib/sbuild/chroot/facet/source-clonable.h \ + lib/sbuild/chroot/facet/source-setup.h \ + lib/sbuild/chroot/facet/storage.h \ + lib/sbuild/chroot/facet/userdata.h + if BUILD_PAM lib_sbuild_public_auth_pam_h_sources = \ lib/sbuild/auth/pam-conv.h \ @@ -190,9 +196,22 @@ lib_sbuild_public_unshare_cc_sources = \ endif pkgincludedir = $(includedir)/sbuild +pkgincludeauthdir = $(includedir)/sbuild/auth +pkgincludechrootdir = $(includedir)/sbuild/chroot +pkgincludefacetdir = $(includedir)/sbuild/chroot/facet pkginclude_HEADERS = \ - $(lib_sbuild_public_h_sources) \ + $(lib_sbuild_public_h_sources) + +pkgincludeauth_HEADERS = \ + $(lib_sbuild_auth_public_h_sources) \ + $(lib_sbuild_public_auth_pam_h_sources) + +pkgincludechroot_HEADERS = \ + $(lib_sbuild_chroot_public_h_sources) + +pkgincludefacet_HEADERS = \ + $(lib_sbuild_chroot_facet_public_h_sources) \ $(lib_sbuild_public_blockdev_base_h_sources) \ $(lib_sbuild_public_blockdev_h_sources) \ $(lib_sbuild_public_lvmsnap_h_sources) \ @@ -231,8 +250,8 @@ pkgconfigdatadir = $(libdir)/pkgconfig pkgconfigdata_DATA = lib/sbuild/sbuild.pc # Uncommment to build an unversioned library (version in soname) -#lib_sbuild_libsbuild_version = -release $(SBUILD_VERSION) +lib_sbuild_libsbuild_version = -release $(VERSION) # Uncomment to build a versioned library -lib_sbuild_libsbuild_version = -version-info $(SBUILD_CURRENT_INTERFACE):$(SBUILD_INTERFACE_AGE):$(SBUILD_BINARY_AGE) -lib_sbuild_libsbuild_la_LDFLAGS = $(libsbuild_version) \ +#lib_sbuild_libsbuild_version = -version-info $(SBUILD_CURRENT_INTERFACE):$(SBUILD_INTERFACE_AGE):$(SBUILD_BINARY_AGE) +lib_sbuild_libsbuild_la_LDFLAGS = $(lib_sbuild_libsbuild_version) \ -rpath $(libdir) -no-undefined |