diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-23 15:18:46 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-03-23 15:18:46 +0000 |
| commit | 88b247616f8db23fcf1edcdc441c19adf40eac05 (patch) | |
| tree | 0b103a0e66483850995631b7f11866d8604ad164 /tools/xenstat | |
| parent | 1ab2732dd07007b64250ad42794f1c79cf02d8a7 (diff) | |
| download | xen-88b247616f8db23fcf1edcdc441c19adf40eac05.tar.gz xen-88b247616f8db23fcf1edcdc441c19adf40eac05.tar.bz2 xen-88b247616f8db23fcf1edcdc441c19adf40eac05.zip | |
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>
Diffstat (limited to 'tools/xenstat')
| -rw-r--r-- | tools/xenstat/libxenstat/Makefile | 29 | ||||
| -rw-r--r-- | tools/xenstat/xentop/Makefile | 5 |
2 files changed, 12 insertions, 22 deletions
diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index 8ef5b110a7..4213b59aed 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/xenstat/libxenstat/Makefile @@ -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) diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index d31ba06066..fb025d4106 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -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 |