diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-02-12 15:03:07 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-02-12 15:03:07 +0000 |
| commit | 6e30359431245bde61c200b0e88ac256e6f7978e (patch) | |
| tree | fdea0807b90b53f41e2958201d1cc287ec4ece5a /tools/libxc/Makefile | |
| parent | 03dc7c2febb658da3fb7bf0b814e69c098d56bce (diff) | |
| download | xen-6e30359431245bde61c200b0e88ac256e6f7978e.tar.gz xen-6e30359431245bde61c200b0e88ac256e6f7978e.tar.bz2 xen-6e30359431245bde61c200b0e88ac256e6f7978e.zip | |
Make stubdom/Makefile override XEN_OS to MiniOS, and add
config/MiniOS.mk. Add PTHREAD_LIBS to configs (usually holding
-lpthread).
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
Diffstat (limited to 'tools/libxc/Makefile')
| -rw-r--r-- | tools/libxc/Makefile | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 41dcbab808..b73bbfe55b 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -25,13 +25,11 @@ ifneq ($(stubdom),y) CTRL_SRCS-y += xc_resume.c endif CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c -ifneq ($(stubdom),y) CTRL_SRCS-$(CONFIG_Linux) += xc_linux.c CTRL_SRCS-$(CONFIG_SunOS) += xc_solaris.c CTRL_SRCS-$(CONFIG_X86_Linux) += xc_ptrace.c xc_ptrace_core.c CTRL_SRCS-$(CONFIG_NetBSD) += xc_netbsd.c -endif -CTRL_SRCS-$(stubdom) += xc_minios.c +CTRL_SRCS-$(CONFIG_MiniOS) += xc_minios.c GUEST_SRCS-y := GUEST_SRCS-y += xg_private.c @@ -75,10 +73,6 @@ CFLAGS += -Wp,-MD,.$(@F).d LDFLAGS += -L. DEPS = .*.d -ifneq ($(stubdom),y) -LDLIBS = -lpthread -endif - CTRL_LIB_OBJS := $(patsubst %.c,%.o,$(CTRL_SRCS-y)) CTRL_PIC_OBJS := $(patsubst %.c,%.opic,$(CTRL_SRCS-y)) @@ -152,7 +146,7 @@ libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR) ln -sf $< $@ libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ $(LDLIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ $(PTHREAD_LIBS) # libxenguest @@ -165,7 +159,7 @@ libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR) ln -sf $< $@ libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(LDLIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) -include $(DEPS) |