From e5a6c09b12a9a68ba604d4e95adf28482ae8fc8d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Sep 2006 22:41:36 +0000 Subject: [PATCH] * Install header files in /nix/include/nix. --- src/boost/Makefile.am | 4 +++- src/boost/format/Makefile.am | 6 +++++- src/libexpr/Makefile.am | 5 ++++- src/libstore/Makefile.am | 14 ++++++++------ src/libutil/Makefile.am | 10 +++++----- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/boost/Makefile.am b/src/boost/Makefile.am index 9fc27cc7e..c149c13f7 100644 --- a/src/boost/Makefile.am +++ b/src/boost/Makefile.am @@ -1,6 +1,8 @@ SUBDIRS = format -EXTRA_DIST = assert.hpp checked_delete.hpp format.hpp \ +pkginclude_HEADERS = assert.hpp checked_delete.hpp format.hpp \ shared_ptr.hpp weak_ptr.hpp throw_exception.hpp \ enable_shared_from_this.hpp \ detail/shared_count.hpp detail/workaround.hpp + +pkgincludedir = ${includedir}/nix/boost diff --git a/src/boost/format/Makefile.am b/src/boost/format/Makefile.am index 39bc6fe07..13e23d315 100644 --- a/src/boost/format/Makefile.am +++ b/src/boost/format/Makefile.am @@ -1,8 +1,12 @@ pkglib_LTLIBRARIES = libformat.la libformat_la_SOURCES = format_implementation.cc free_funcs.cc \ - parsing.cc exceptions.hpp feed_args.hpp format_class.hpp \ + parsing.cc + +pkginclude_HEADERS = exceptions.hpp feed_args.hpp format_class.hpp \ format_fwd.hpp group.hpp internals.hpp internals_fwd.hpp \ macros_default.hpp +pkgincludedir = ${includedir}/nix/boost/format + AM_CXXFLAGS = -Wall -I$(srcdir)/../.. diff --git a/src/libexpr/Makefile.am b/src/libexpr/Makefile.am index e80adaf02..01a2a2f12 100644 --- a/src/libexpr/Makefile.am +++ b/src/libexpr/Makefile.am @@ -5,7 +5,10 @@ libexpr_la_SOURCES = nixexpr.cc nixexpr.hh \ lexer-tab.cc lexer-tab.hh parser-tab.cc parser-tab.hh \ get-drvs.cc get-drvs.hh \ attr-path.cc attr-path.hh \ - expr-to-xml.cc expr-to-xml.hh + expr-to-xml.cc expr-to-xml.hh + +libexpr_la_LIBADD = ../libutil/libutil.la ../libstore/libstore.la \ + ../boost/format/libformat.la BUILT_SOURCES = nixexpr-ast.cc nixexpr-ast.hh \ parser-tab.hh lexer-tab.hh parser-tab.cc lexer-tab.cc diff --git a/src/libstore/Makefile.am b/src/libstore/Makefile.am index 3730ae5b2..515311efa 100644 --- a/src/libstore/Makefile.am +++ b/src/libstore/Makefile.am @@ -1,12 +1,14 @@ pkglib_LTLIBRARIES = libstore.la libstore_la_SOURCES = \ - store.cc store.hh derivations.cc derivations.hh \ - build.cc build.hh \ - misc.cc misc.hh \ - globals.cc globals.hh db.cc db.hh \ - references.cc references.hh pathlocks.cc pathlocks.hh \ - gc.cc gc.hh + store.cc derivations.cc build.cc misc.cc globals.cc db.cc \ + references.cc pathlocks.cc gc.cc + +pkginclude_HEADERS = \ + store.hh derivations.hh build.hh misc.hh globals.hh db.hh \ + references.hh pathlocks.hh gc.hh + +libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la BUILT_SOURCES = derivations-ast.cc derivations-ast.hh diff --git a/src/libutil/Makefile.am b/src/libutil/Makefile.am index dc514d55f..cf75be8a8 100644 --- a/src/libutil/Makefile.am +++ b/src/libutil/Makefile.am @@ -1,10 +1,10 @@ pkglib_LTLIBRARIES = libutil.la -libutil_la_SOURCES = util.cc util.hh hash.cc hash.hh \ - archive.cc archive.hh aterm.cc aterm.hh \ - aterm-map.cc aterm-map.hh \ - xml-writer.cc xml-writer.hh \ - types.hh +libutil_la_SOURCES = util.cc hash.cc archive.cc aterm.cc aterm-map.cc xml-writer.cc + +libutil_la_LIBADD = ../boost/format/libformat.la + +pkginclude_HEADERS = util.hh hash.hh archive.hh aterm.hh aterm-map.hh xml-writer.hh types.hh if !HAVE_OPENSSL libutil_la_SOURCES += \