aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@shadowen.org>2008-07-26 13:21:56 +0100
committerAndy Whitcroft <apw@shadowen.org>2008-08-27 14:44:41 +0100
commit98c847a3b4f569b86501552a0ec23fdaf1d70edb (patch)
tree14f9611f84c569b33c36f59a4bfacd92183129b0 /Makefile
parentacd01cdb9f6aa6f58c1b8bd41a5459db9d5b8617 (diff)
downloadlibhugetlbfs-98c847a3b4f569b86501552a0ec23fdaf1d70edb.tar.gz
hugectl: add support for requesting which library to use
Add support for requesting a specific library set for preload. This adds the --library-path option. If this option points to a directory containing a libhugetlbfs library it is used, else it is assumed to be a library prefix and both the 32 bit and 64 bit library directories are added (where available). By default the specific libraries installed with the version of hugectl are used. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Acked-by: Eric B Munson <ebmunson@us.ibm.com> Acked-by: Mel Gorman <mel@csn.ul.ie>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index aed22e6..7e09d4e 100644
--- a/Makefile
+++ b/Makefile
@@ -109,6 +109,13 @@ BINDIR = $(PREFIX)/share/libhugetlbfs
EXEDIR = $(PREFIX)/bin
DOCDIR = $(PREFIX)/share/doc/libhugetlbfs
+ifdef LIB32
+LIBPATHS += -DLIB32='"$(LIB32)"' -DLIBDIR32='"$(LIBDIR32)"'
+endif
+ifdef LIB64
+LIBPATHS += -DLIB64='"$(LIB64)"' -DLIBDIR64='"$(LIBDIR64)"'
+endif
+
EXTRA_DIST = \
README \
HOWTO \
@@ -237,7 +244,7 @@ obj64/%.s: %.c
$(INSTALL_BIN:%=$(BIN_OBJ_DIR)/%): $(BIN_OBJ_DIR)/%: %.c
@$(VECHO) CC $@
mkdir -p $(BIN_OBJ_DIR)
- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^
clean:
@$(VECHO) CLEAN