Define CFLAGS and LDFLAGS for libxenctrl.

Signed-off-by: Bastian Blank <waldi@debian.org>

tools/Rules.mk

@@ -11,6 +11,11 @@ XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 XEN_XENSTORE       = $(XEN_ROOT)/tools/xenstore
 XEN_LIBXENSTAT     = $(XEN_ROOT)/tools/xenstat/libxenstat/src
 
+CFLAGS_include = -I$(XEN_INCLUDE)
+
+CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_include)
+LDFLAGS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl
+
 X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
 
 CFLAGS += -D__XEN_TOOLS__

tools/blktap/drivers/Makefile

@@ -9,7 +9,7 @@ LIBAIO_DIR   = ../../libaio/src
 
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
-CFLAGS   += -I $(XEN_LIBXC) -I $(LIBAIO_DIR)
+CFLAGS   += $(CFLAGS_libxenctrl) -I $(LIBAIO_DIR)
 CFLAGS   += $(INCLUDES) -I. -I../../xenstore 
 CFLAGS   += -D_GNU_SOURCE
 
@@ -18,7 +18,6 @@ CFLAGS   += -Wp,-MD,.$(@F).d
 DEPS      = .*.d
 
 LIBS      := -L. -L.. -L../lib
-LIBS      += -L$(XEN_LIBXC)
 LIBS      += -Wl,-rpath-link,$(XEN_XENSTORE)
 
 LIBS_IMG  := $(LIBAIO_DIR)/libaio.a -lcrypto -lpthread -lz
@@ -35,7 +34,7 @@ BLK-OBJS-$(CONFIG_Linux) += blk_linux.c
 all: $(IBIN) qcow-util
 
 blktapctrl: blktapctrl.c
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lblktap -lxenctrl
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lblktap $(LDFLAGS_libxenctrl)
 
 tapdisk: tapdisk.c $(BLK-OBJS-y) tapdisk.c
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_IMG)

tools/console/Makefile

@@ -4,9 +4,9 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror
 
-CFLAGS  += -I $(XEN_LIBXC)
+CFLAGS  += $(CFLAGS_libxenctrl)
 CFLAGS  += -I $(XEN_XENSTORE)
-CFLAGS  += -I $(XEN_INCLUDE)
+LDFLAGS += $(LDFLAGS_libxenctrl)
 
 BIN      = xenconsoled xenconsole
 
@@ -19,12 +19,12 @@ clean:
 	$(RM) client/*.o daemon/*.o
 
 xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
-	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
-              $(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore
+	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_XENSTORE) \
+              $(UTIL_LIBS) $(SOCKET_LIBS) -lxenstore
 
 xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
-	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
-	      $(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore
+	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_XENSTORE) \
+	      $(UTIL_LIBS) $(SOCKET_LIBS) -lxenstore
 
 .PHONY: install
 install: $(BIN)

tools/debugger/xenitp/Makefile

@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 #CFLAGS  += -Werror -g -O0
 
-CFLAGS  += -I $(XEN_LIBXC)
+CFLAGS  += $(CFLAGS_libxenctrl)
 
 HDRS     = $(wildcard *.h)
 OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))
@@ -40,8 +40,8 @@ clean:
 	$(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)
 
 %: %.c $(HDRS) Makefile
-	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
+	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS_libxenctrl)
 
 XENITP_OBJS=xenitp.o ia64-dis.o ia64-opc.o cpu-ia64-opc.o
 xenitp: $(XENITP_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(XENITP_OBJS) -L$(XEN_LIBXC) -lxenctrl
+	$(CC) $(CFLAGS) -o $@ $(XENITP_OBJS) $(LDFLAGS_libxenctrl)

tools/flask/loadpolicy/Makefile

@@ -12,10 +12,9 @@ BASECFLAGS += -Wp,-MD,.$(@F).d
 PROG_DEP = .*.d
 BASECFLAGS+= $(PROFILE)
 #BASECFLAGS+= -I$(XEN_ROOT)/tools
-BASECFLAGS+= -I$(LIBXC_ROOT)
+BASECFLAGS+= $(CFLAGS_libxenctrl)
 BASECFLAGS+= -I$(LIBFLASK_ROOT)/include
 BASECFLAGS+= -I.
-BASECFLAGS+= -I$(XEN_INCLUDE)
 
 CFLAGS  += $(BASECFLAGS)
 LDFLAGS += $(PROFILE) -L$(XEN_LIBXC) -L$(LIBFLASK_ROOT)
@@ -31,7 +30,7 @@ CLIENTS_OBJS := $(patsubst flask-%,%.o,$(CLIENTS))
 all: $(CLIENTS)
 
 $(CLIENTS): flask-%: %.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lflask -lxenctrl -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lflask $(LDFLAGS_libxenctrl) -o $@
 
 $(CLIENTS_OBJS): $(CLIENTS_SRCS)
 	$(COMPILE.c) -o $@ $<

tools/fs-back/Makefile

@@ -8,7 +8,7 @@ IBIN         = fs-backend
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
 CFLAGS   += -fno-strict-aliasing
-CFLAGS   += -I $(XEN_LIBXC)
+CFLAGS   += $(CFLAGS_libxenctrl)
 CFLAGS   += $(INCLUDES) -I. -I../xenstore 
 CFLAGS   += -D_GNU_SOURCE
 
@@ -17,8 +17,8 @@ CFLAGS   += -Wp,-MD,.$(@F).d
 DEPS      = .*.d
 
 LIBS      := -L. -L.. -L../lib
-LIBS      += -L$(XEN_LIBXC)
-LIBS      += -lxenctrl -lpthread -lrt 
+LIBS      += $(LDFLAGS_libxenctrl)
+LIBS      += -lpthread -lrt 
 LIBS      += -L$(XEN_XENSTORE) -lxenstore
 
 OBJS	  := fs-xenbus.o fs-ops.o

tools/misc/Makefile

@@ -45,4 +45,4 @@ clean:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 xenperf: %: %.o Makefile
-	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
+	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl)

tools/security/Makefile

@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -Werror
 CFLAGS   += -fno-strict-aliasing
-CFLAGS   += -I. -I $(XEN_LIBXC)
+CFLAGS   += -I. $(CFLAGS_libxenctrl)
 
 CPPFLAGS += -MMD -MF .$*.d
 PROG_DEPS = .*.d
@@ -82,7 +82,7 @@ build: $(ACM_INST_TOOLS) $(ACM_NOINST_TOOLS)
 	chmod 700 $(ACM_SCRIPTS)
 
 xensec_tool: $(OBJS_TOOL)
-	$(CC) -g $(CFLAGS) $(LDFLAGS) -O0 -o $@ $^ -L$(XEN_LIBXC) -lxenctrl
+	$(CC) -g $(CFLAGS) $(LDFLAGS) -O0 -o $@ $^ $(LDFLAGS_libxenctrl)
 
 xensec_gen: xensec_gen.py
 	cp -f $^ $@

tools/xcutils/Makefile

@@ -11,7 +11,7 @@
 XEN_ROOT	= ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE) -I$(XEN_INCLUDE)
+INCLUDES += $(CFLAGS_libxenctrl) -I $(XEN_XENSTORE) -I$(XEN_INCLUDE)
 
 CFLAGS += -Werror
 CFLAGS += $(INCLUDES)
@@ -22,7 +22,7 @@ PROG_DEP = .*.d
 
 PROGRAMS = xc_restore xc_save readnotes
 
-LDLIBS   = -L$(XEN_LIBXC) -L$(XEN_XENSTORE) -lxenguest -lxenctrl -lxenstore
+LDLIBS   = $(LDFLAGS_libxenctrl) -L$(XEN_XENSTORE) -lxenguest -lxenstore
 
 .PHONY: all
 all: build

tools/xenmon/Makefile

@@ -15,9 +15,8 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror
 CFLAGS  += -I $(XEN_XC)
-CFLAGS  += -I $(XEN_LIBXC)
-CFLAGS  += -I $(XEN_INCLUDE)
-LDFLAGS += -L $(XEN_LIBXC)
+CFLAGS  += $(CFLAGS_libxenctrl)
+LDFLAGS += $(LDFLAGS_libxenctrl)
 
 BIN = xentrace_setmask xenbaked
 SCRIPTS = xenmon.py
@@ -41,6 +40,6 @@ clean:
 
 
 %: %.c Makefile
-	$(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $<
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 xentrace_%: %.c Makefile
-	$(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $<
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<

tools/xenstore/Makefile

@@ -11,12 +11,11 @@ BASECFLAGS=-Werror
 BASECFLAGS += -Wp,-MD,.$(@F).d
 PROG_DEP = .*.d
 BASECFLAGS+= $(PROFILE)
-BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc
+BASECFLAGS+= $(CFLAGS_libxenctrl)
 BASECFLAGS+= -I.
-BASECFLAGS+= -I$(XEN_INCLUDE)
 
 CFLAGS  += $(BASECFLAGS)
-LDFLAGS += $(PROFILE) -L$(XEN_LIBXC)
+LDFLAGS += $(PROFILE)
 
 CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod
 CLIENTS += xenstore-write
@@ -34,7 +33,7 @@ XENSTORED_OBJS += $(XENSTORED_OBJS_y)
 all: libxenstore.so libxenstore.a xenstored $(CLIENTS) xs_tdb_dump xenstore-control xenstore-ls
 
 xenstored: $(XENSTORED_OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -lxenctrl $(SOCKET_LIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) $(LDFLAGS_libxenctrl) $(SOCKET_LIBS) -o $@
 
 $(CLIENTS): xenstore-%: xenstore_%.o libxenstore.so
 	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@

tools/xentrace/Makefile

@@ -3,9 +3,8 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror
 
-CFLAGS  += -I $(XEN_XC)
-CFLAGS  += -I $(XEN_LIBXC)
-CFLAGS  += -I $(XEN_INCLUDE)
+CFLAGS  += $(CFLAGS_libxenctrl)
+LDFLAGS += $(LDFLAGS_libxenctrl)
 
 HDRS     = $(wildcard *.h)
 OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))
@@ -50,6 +49,6 @@ clean:
 	$(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)
 
 %: %.c $(HDRS) Makefile
-	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl
+	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
 xentrace_%: %.c $(HDRS) Makefile
-	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl
+	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)