about summary refs log tree commit diff
path: root/src/libutil
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-11-22T16·45+0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-11-22T16·45+0000
commit754c05ed6c3b88f8180ae8686e030b5b02b23d43 (patch)
treec7f8238ee141c0564823122c52fed070ea8f2c0b /src/libutil
parent9a14d5e2f3a0b6ab626b9d22256df8bcc1c585a3 (diff)
Rename $(here) to $(d) for brevity, and remove trailing slash
Diffstat (limited to 'src/libutil')
-rw-r--r--src/libutil/Makefile.new9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile.new
index b90c1c0cab4d..88d43f0aeb62 100644
--- a/src/libutil/Makefile.new
+++ b/src/libutil/Makefile.new
@@ -1,10 +1,11 @@
 LIBS += libutil
 
-libutil_DIR := $(here)
+libutil_DIR := $(d)
 
-libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc \
-  md5.c sha1.c sha256.c
+libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc
 
-# FIXME: md5.c et al. should only be built when we don't have OpenSSL.
+ifneq ($(HAVE_OPENSSL), 1)
+libutil_SOURCES += md5.c sha1.c sha256.c
+endif
 
 libutil_LIBS = src/boost/format/libformat