diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
| commit | 2f9bb5c7e744ddca3fbe5576e520a3e80c106c55 (patch) | |
| tree | 7a3d5d57a460aa87a8f8b58d46102ca339e97770 /src/libutil | |
| parent | c5ba08133370f98de722c978bda3b446721985de (diff) | |
| parent | 6dca72006aa9b1cf2f226bb5b538e744fcab976f (diff) | |
Merge branch 'make'
Diffstat (limited to 'src/libutil')
| -rw-r--r-- | src/libutil/Makefile.am | 18 | ||||
| -rw-r--r-- | src/libutil/local.mk | 15 |
2 files changed, 15 insertions, 18 deletions
diff --git a/src/libutil/Makefile.am b/src/libutil/Makefile.am deleted file mode 100644 index 0c4073e66eab..000000000000 --- a/src/libutil/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -pkglib_LTLIBRARIES = libutil.la - -libutil_la_SOURCES = util.cc hash.cc serialise.cc \ - archive.cc xml-writer.cc affinity.cc - -libutil_la_LIBADD = ../boost/format/libformat.la - -pkginclude_HEADERS = util.hh hash.hh serialise.hh \ - archive.hh xml-writer.hh types.hh affinity.hh - -if !HAVE_OPENSSL -libutil_la_SOURCES += \ - md5.c md5.h sha1.c sha1.h sha256.c sha256.h md32_common.h -else -libutil_la_LIBADD += @OPENSSL_LIBS@ -endif - -AM_CXXFLAGS = -Wall -I$(srcdir)/.. diff --git a/src/libutil/local.mk b/src/libutil/local.mk new file mode 100644 index 000000000000..8af2e78d9ce4 --- /dev/null +++ b/src/libutil/local.mk @@ -0,0 +1,15 @@ +libraries += libutil + +libutil_NAME = libnixutil + +libutil_DIR := $(d) + +libutil_SOURCES := $(wildcard $(d)/*.cc) + +ifeq ($(HAVE_OPENSSL), 1) + libutil_LDFLAGS = $(OPENSSL_LIBS) +else + libutil_SOURCES += $(d)/md5.c $(d)/sha1.c $(d)/sha256.c +endif + +libutil_LIBS = libformat |