ia64/xen-unstable

changeset 16912:a59e0510780b

Define CFLAGS and LDFLAGS for libxenstore.

Signed-off-by: Bastian Blank <waldi@debian.org>
author Keir Fraser <keir.fraser@citrix.com>
date Sun Jan 27 12:58:15 2008 +0000 (2008-01-27)
parents 4bac220563b1
children 240d78e0bb0b
files tools/Rules.mk tools/blktap/lib/Makefile tools/console/Makefile tools/fs-back/Makefile tools/xcutils/Makefile
line diff
     1.1 --- a/tools/Rules.mk	Sun Jan 27 12:58:02 2008 +0000
     1.2 +++ b/tools/Rules.mk	Sun Jan 27 12:58:15 2008 +0000
     1.3 @@ -19,6 +19,9 @@ LDFLAGS_libxenctrl = -L$(XEN_LIBXC) -lxe
     1.4  CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_include)
     1.5  LDFLAGS_libxenguest = -L$(XEN_LIBXC) -lxenguest
     1.6  
     1.7 +CFLAGS_libxenstore = -I$(XEN_XENSTORE)
     1.8 +LDFLAGS_libxenstore = -L$(XEN_XENSTORE) -lxenstore
     1.9 +
    1.10  X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
    1.11  
    1.12  CFLAGS += -D__XEN_TOOLS__
     2.1 --- a/tools/blktap/lib/Makefile	Sun Jan 27 12:58:02 2008 +0000
     2.2 +++ b/tools/blktap/lib/Makefile	Sun Jan 27 12:58:15 2008 +0000
     2.3 @@ -5,9 +5,9 @@ MAJOR    = 3.0
     2.4  MINOR    = 0
     2.5  SONAME   = libblktap.so.$(MAJOR)
     2.6  
     2.7 -INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE) -I$(XEN_INCLUDE)
     2.8 +INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I$(XEN_INCLUDE) $(CFLAGS_libxenstore)
     2.9  
    2.10 -LIBS     := -lxenstore
    2.11 +LDFLAGS  += $(LDFLAGS_libxenstore)
    2.12  
    2.13  SRCS     :=
    2.14  SRCS     += xenbus.c blkif.c xs_api.c
     3.1 --- a/tools/console/Makefile	Sun Jan 27 12:58:02 2008 +0000
     3.2 +++ b/tools/console/Makefile	Sun Jan 27 12:58:15 2008 +0000
     3.3 @@ -5,8 +5,9 @@ include $(XEN_ROOT)/tools/Rules.mk
     3.4  CFLAGS  += -Werror
     3.5  
     3.6  CFLAGS  += $(CFLAGS_libxenctrl)
     3.7 -CFLAGS  += -I $(XEN_XENSTORE)
     3.8 +CFLAGS  += $(CFLAGS_libxenstore)
     3.9  LDFLAGS += $(LDFLAGS_libxenctrl)
    3.10 +LDFLAGS += $(LDFLAGS_libxenstore)
    3.11  
    3.12  BIN      = xenconsoled xenconsole
    3.13  
    3.14 @@ -19,12 +20,12 @@ clean:
    3.15  	$(RM) client/*.o daemon/*.o
    3.16  
    3.17  xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
    3.18 -	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_XENSTORE) \
    3.19 -              $(UTIL_LIBS) $(SOCKET_LIBS) -lxenstore
    3.20 +	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) \
    3.21 +              $(UTIL_LIBS) $(SOCKET_LIBS)
    3.22  
    3.23  xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
    3.24 -	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_XENSTORE) \
    3.25 -	      $(UTIL_LIBS) $(SOCKET_LIBS) -lxenstore
    3.26 +	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) \
    3.27 +	      $(UTIL_LIBS) $(SOCKET_LIBS)
    3.28  
    3.29  .PHONY: install
    3.30  install: $(BIN)
     4.1 --- a/tools/fs-back/Makefile	Sun Jan 27 12:58:02 2008 +0000
     4.2 +++ b/tools/fs-back/Makefile	Sun Jan 27 12:58:15 2008 +0000
     4.3 @@ -9,7 +9,8 @@ CFLAGS   += -Werror
     4.4  CFLAGS   += -Wno-unused
     4.5  CFLAGS   += -fno-strict-aliasing
     4.6  CFLAGS   += $(CFLAGS_libxenctrl)
     4.7 -CFLAGS   += $(INCLUDES) -I. -I../xenstore 
     4.8 +CFLAGS   += $(CFLAGS_libxenstore)
     4.9 +CFLAGS   += $(INCLUDES) -I.
    4.10  CFLAGS   += -D_GNU_SOURCE
    4.11  
    4.12  # Get gcc to generate the dependencies for us.
    4.13 @@ -18,8 +19,8 @@ DEPS      = .*.d
    4.14  
    4.15  LIBS      := -L. -L.. -L../lib
    4.16  LIBS      += $(LDFLAGS_libxenctrl)
    4.17 +LIBS      += $(LDFLAGS_libxenstore)
    4.18  LIBS      += -lpthread -lrt 
    4.19 -LIBS      += -L$(XEN_XENSTORE) -lxenstore
    4.20  
    4.21  OBJS	  := fs-xenbus.o fs-ops.o
    4.22  
     5.1 --- a/tools/xcutils/Makefile	Sun Jan 27 12:58:02 2008 +0000
     5.2 +++ b/tools/xcutils/Makefile	Sun Jan 27 12:58:15 2008 +0000
     5.3 @@ -12,7 +12,7 @@ XEN_ROOT	= ../..
     5.4  include $(XEN_ROOT)/tools/Rules.mk
     5.5  
     5.6  CFLAGS += -Werror
     5.7 -CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) -I$(XEN_XENSTORE)
     5.8 +CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
     5.9  
    5.10  # Make gcc generate dependencies.
    5.11  CFLAGS += -Wp,-MD,.$(@F).d
    5.12 @@ -20,7 +20,7 @@ PROG_DEP = .*.d
    5.13  
    5.14  PROGRAMS = xc_restore xc_save readnotes
    5.15  
    5.16 -LDLIBS   = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) -L$(XEN_XENSTORE) -lxenstore
    5.17 +LDLIBS   = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore)
    5.18  
    5.19  .PHONY: all
    5.20  all: build