mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
tools: xenstat: install and use shared library
Remove .so files from the .a file. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
This commit is contained in:
Ian Campbell committed
1 parent
1ab2732dd0
commit
88b247616f
3 files changed
+16
-22
No files matched your search
@@ -29,6 +29,10 @@ CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_xeninclude)
|
||||
LDLIBS_libxenstore = -L$(XEN_XENSTORE) -lxenstore
|
||||
SHLIB_libxenstore = -Wl,-rpath-link=$(XEN_XENSTORE)
|
||||
|
||||
CFLAGS_libxenstat = -I$(XEN_LIBXENSTAT)
|
||||
LDLIBS_libxenstat = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBXENSTAT) -lxenstat
|
||||
SHLIB_libxenstat = -Wl,-rpath-link=$(XEN_LIBXENSTAT)
|
||||
|
||||
ifeq ($(CONFIG_Linux),y)
|
||||
LIBXL_BLKTAP = y
|
||||
else
|
||||
|
||||
@@ -37,19 +37,15 @@ SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
|
||||
WARN_FLAGS=-Wall -Werror
|
||||
|
||||
CFLAGS+=-Isrc $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(CFLAGS_xeninclude)
|
||||
LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/
|
||||
|
||||
LDLIBS-y = $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl)
|
||||
LDLIBS-$(CONFIG_SunOS) += -lkstat
|
||||
ARLIBS-y = $(XEN_XENSTORE)/libxenstore.so $(XEN_LIBXC)/libxenctrl.so
|
||||
ARLIBS-x86_64 = /usr/lib/amd64/libkstat.so
|
||||
ARLIBS-x86_32 = /usr/lib/libkstat.so
|
||||
ARLIBS-$(CONFIG_SunOS) += $(ARLIBS-$(XEN_TARGET_ARCH))
|
||||
|
||||
.PHONY: all
|
||||
all: $(LIB)
|
||||
all: $(LIB) $(SHLIB) $(SHLIB_LINKS)
|
||||
|
||||
$(LIB): $(OBJECTS-y)
|
||||
$(AR) rc $@ $^ $(ARLIBS-y)
|
||||
$(AR) rc $@ $^
|
||||
$(RANLIB) $@
|
||||
|
||||
$(SHLIB): $(OBJECTS-y)
|
||||
@@ -65,7 +61,7 @@ src/xenstat_linux.o: src/xenstat_linux.c src/xenstat_priv.h
|
||||
src/xenstat_solaris.o: src/xenstat_solaris.c src/xenstat_priv.h
|
||||
$(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@ $<
|
||||
|
||||
src/libxenstat.so.$(MAJOR): $(LIB)
|
||||
src/libxenstat.so.$(MAJOR): $(SHLIB)
|
||||
$(MAKE_LINK) $(<F) $@
|
||||
|
||||
src/libxenstat.so: src/libxenstat.so.$(MAJOR)
|
||||
@@ -73,16 +69,11 @@ src/libxenstat.so: src/libxenstat.so.$(MAJOR)
|
||||
|
||||
.PHONY: install
|
||||
install: all
|
||||
#install: all
|
||||
# $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(includedir)/xenstat.h
|
||||
# $(INSTALL_PROG) $(LIB) $(DESTDIR)$(libdir)/libxenstat.a
|
||||
# $(INSTALL_PROG) $(SHLIB) \
|
||||
# $(DESTDIR)$(libdir)/libxenstat.so.$(MAJOR).$(MINOR)
|
||||
# $(MAKE_LINK) libxenstat.so.$(MAJOR).$(MINOR) \
|
||||
# $(DESTDIR)$(libdir)/libxenstat.so.$(MAJOR)
|
||||
# $(MAKE_LINK) libxenstat.so.$(MAJOR) \
|
||||
# $(DESTDIR)$(libdir)/libxenstat.so
|
||||
# -$(LDCONFIG)
|
||||
$(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(INCLUDEDIR)
|
||||
$(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a
|
||||
$(INSTALL_PROG) src/libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
|
||||
ln -sf libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstat.so.$(MAJOR)
|
||||
ln -sf libxenstat.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstat.so
|
||||
|
||||
PYLIB=bindings/swig/python/_xenstat.so
|
||||
PYMOD=bindings/swig/python/xenstat.py
|
||||
@@ -156,7 +147,7 @@ endif
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f $(LIB) $(SHLIB) $(SHLIB_LINKS) $(OBJECTS-y) \
|
||||
rm -f $(SHLIB) $(SHLIB_LINKS) $(OBJECTS-y) \
|
||||
$(BINDINGS) $(BINDINGSRC) $(DEPS)
|
||||
|
||||
-include $(DEPS)
|
||||
@@ -18,9 +18,8 @@ ifneq ($(XENSTAT_XENTOP),y)
|
||||
all install xentop:
|
||||
else
|
||||
|
||||
CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
|
||||
LDFLAGS += -L$(XEN_LIBXENSTAT)
|
||||
LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
|
||||
CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat)
|
||||
LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS)
|
||||
CFLAGS += -DHOST_$(XEN_OS)
|
||||
|
||||
.PHONY: all
|
||||
|
||||