about summary refs log tree commit diff
path: root/src/boost/format
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-02-01T15·41+0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-02-01T15·41+0100
commit2f9bb5c7e744ddca3fbe5576e520a3e80c106c55 (patch)
tree7a3d5d57a460aa87a8f8b58d46102ca339e97770 /src/boost/format
parentc5ba08133370f98de722c978bda3b446721985de (diff)
parent6dca72006aa9b1cf2f226bb5b538e744fcab976f (diff)
Merge branch 'make'
Diffstat (limited to 'src/boost/format')
-rw-r--r--src/boost/format/Makefile.am12
-rw-r--r--src/boost/format/local.mk7
2 files changed, 7 insertions, 12 deletions
diff --git a/src/boost/format/Makefile.am b/src/boost/format/Makefile.am
deleted file mode 100644
index 13e23d315da8..000000000000
--- a/src/boost/format/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-pkglib_LTLIBRARIES = libformat.la
-
-libformat_la_SOURCES = format_implementation.cc free_funcs.cc \
- 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/boost/format/local.mk b/src/boost/format/local.mk
new file mode 100644
index 000000000000..3776eff382fe
--- /dev/null
+++ b/src/boost/format/local.mk
@@ -0,0 +1,7 @@
+libraries += libformat
+
+libformat_NAME = libnixformat
+
+libformat_DIR := $(d)
+
+libformat_SOURCES := $(wildcard $(d)/*.cc)