WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 		  
Home Products Support Community News
 
   
 

xen-changelog

[Top] [All Lists]
<prev [Date] next>
[Advanced]
 <prev [Thread] next>

[Xen-changelog] [xen-unstable] tools: consistently use $({CFLAGS, LDLIBS

from [Xen patchbot-unstable] [Permanent Link][Original]
To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] tools: consistently use $({CFLAGS, LDLIBS}_libxenctrl) instead of open coding.
From: Xen patchbot-unstable <patchbot@xxxxxxx>
Date: Tue, 22 Mar 2011 17:00:12 +0000
Delivery-date: Tue, 22 Mar 2011 10:03:16 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx 
# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1300730749 0
# Node ID a3466b005017eb918c5f3e4edf790002fce4fbd2
# Parent  c89629e41231a26620ba9966db8f01da6e52d65b
tools: consistently use $({CFLAGS,LDLIBS}_libxenctrl) instead of open coding.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r c89629e41231 -r a3466b005017 tools/blktap2/control/Makefile
--- a/tools/blktap2/control/Makefile    Mon Mar 21 18:04:59 2011 +0000
+++ b/tools/blktap2/control/Makefile    Mon Mar 21 18:05:49 2011 +0000
@@ -12,7 +12,7 @@
 CFLAGS            += -Wno-unused
 CFLAGS            += -I../include -I../drivers
 CFLAGS            += $(CFLAGS_xeninclude)
-CFLAGS            += -I$(XEN_LIBXC)
+CFLAGS            += $(CFLAGS_libxenctrl)
 CFLAGS            += -D_GNU_SOURCE
 CFLAGS            += -DTAPCTL
 
diff -r c89629e41231 -r a3466b005017 tools/blktap2/drivers/Makefile
--- a/tools/blktap2/drivers/Makefile    Mon Mar 21 18:04:59 2011 +0000
+++ b/tools/blktap2/drivers/Makefile    Mon Mar 21 18:05:49 2011 +0000
@@ -42,7 +42,7 @@
 endif
 
 tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := 
$(LIBAIO_DIR)/libaio.a 
-tapdisk-client tapdisk-stream tapdisk-diff $(QCOW_UTIL): CFLAGS  += 
-I$(LIBAIO_DIR) -I$(XEN_LIBXC)
+tapdisk-client tapdisk-stream tapdisk-diff $(QCOW_UTIL): CFLAGS  += 
-I$(LIBAIO_DIR)
 
 ifeq ($(VHD_STATIC),y)
 td-util: CFLAGS += -static
diff -r c89629e41231 -r a3466b005017 tools/flask/libflask/Makefile
--- a/tools/flask/libflask/Makefile     Mon Mar 21 18:04:59 2011 +0000
+++ b/tools/flask/libflask/Makefile     Mon Mar 21 18:05:49 2011 +0000
@@ -4,14 +4,12 @@
 XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-XEN_LIBXC = $(XEN_ROOT)/tools/libxc
-
 SRCS       :=
 SRCS       += flask_op.c
 
 CFLAGS   += -Werror
 CFLAGS   += -fno-strict-aliasing
-CFLAGS   += -I./include -I$(XEN_LIBXC) $(CFLAGS_xeninclude)
+CFLAGS   += -I./include $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude)
 
 # Get gcc to generate the dependencies for us.
 CFLAGS   += -Wp,-MD,.$(@F).d
@@ -58,6 +56,6 @@
        ln -sf $< $@
 
 libflask.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) 
-Wl,libflask.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^
+       $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) 
-Wl,libflask.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxenctrl)
 
 -include $(DEPS)
diff -r c89629e41231 -r a3466b005017 tools/flask/utils/Makefile
--- a/tools/flask/utils/Makefile        Mon Mar 21 18:04:59 2011 +0000
+++ b/tools/flask/utils/Makefile        Mon Mar 21 18:05:49 2011 +0000
@@ -1,8 +1,6 @@
 XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
-XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 
-LIBXC_ROOT = $(XEN_ROOT)/tools/libxc
 LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask
 
 PROFILE=#-pg
@@ -12,7 +10,7 @@
 BASECFLAGS+= -I$(LIBFLASK_ROOT)/include
 
 CFLAGS  += $(BASECFLAGS)
-LDLIBS += $(PROFILE) -L$(XEN_LIBXC) -L$(LIBFLASK_ROOT)
+LDLIBS += $(PROFILE)
 TESTDIR  = testsuite/tmp
 TESTFLAGS= -DTESTING
 TESTENV  = XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR)
@@ -25,7 +23,7 @@
 all: $(CLIENTS)
 
 $(CLIENTS): flask-%: %.o
-       $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -lflask 
$(LDLIBS_libxenctrl) -o $@
+       $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L$(LIBFLASK_ROOT) 
-lflask $(LDLIBS_libxenctrl) -o $@
 
 .PHONY: clean
 clean: 
diff -r c89629e41231 -r a3466b005017 tools/libxc/Makefile
--- a/tools/libxc/Makefile      Mon Mar 21 18:04:59 2011 +0000
+++ b/tools/libxc/Makefile      Mon Mar 21 18:05:49 2011 +0000
@@ -193,10 +193,10 @@
 
 libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(call zlib-options,l)
 libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
-       $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) 
-Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) 
$(COMPRESSION_LIBS) -lz -L. -lxenctrl $(PTHREAD_LIBS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) 
-Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) 
$(COMPRESSION_LIBS) -lz $(LDLIBS_libxenctrl) $(PTHREAD_LIBS)
 
 xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so
-       $(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) 
-L. -lxenctrl
+       $(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) 
$(LDLIBS_libxenctrl)
 
 -include $(DEPS)
 
diff -r c89629e41231 -r a3466b005017 tools/libxl/Makefile
--- a/tools/libxl/Makefile      Mon Mar 21 18:04:59 2011 +0000
+++ b/tools/libxl/Makefile      Mon Mar 21 18:05:49 2011 +0000
@@ -87,7 +87,7 @@
        ln -sf $< $@
 
 libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS)
-       $(CC) $(CFLAGS) -Wl,-rpath-link -Wl,$(XEN_ROOT)/tools/libxc $(LDFLAGS) 
-Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ 
$(LIBXL_LIBS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) 
-Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS)
 
 libxenlight.a: $(LIBXL_OBJS)
        $(AR) rcs libxenlight.a $^
diff -r c89629e41231 -r a3466b005017 tools/misc/Makefile
--- a/tools/misc/Makefile       Mon Mar 21 18:04:59 2011 +0000
+++ b/tools/misc/Makefile       Mon Mar 21 18:05:49 2011 +0000
@@ -3,7 +3,7 @@
 
 CFLAGS += -Werror
 
-CFLAGS += -I $(XEN_LIBXC)
+CFLAGS += $(CFLAGS_libxenctrl)
 CFLAGS += $(CFLAGS_xeninclude)
 
 HDRS     = $(wildcard *.h)
diff -r c89629e41231 -r a3466b005017 tools/ocaml/common.make
--- a/tools/ocaml/common.make   Mon Mar 21 18:04:59 2011 +0000
+++ b/tools/ocaml/common.make   Mon Mar 21 18:05:49 2011 +0000
@@ -9,7 +9,7 @@
 OCAMLYACC ?= ocamlyacc
 
 CFLAGS += -fPIC -Werror
-CFLAGS += $(CFLAGS_xeninclude) -I$(TOPLEVEL)/../libxc 
-I$(TOPLEVEL)/../xenstore -I$(TOPLEVEL)/../libxl
+CFLAGS += $(CFLAGS_xeninclude) $(CFLAGS_libxenctrl) -I$(TOPLEVEL)/../xenstore 
-I$(TOPLEVEL)/../libxl
 CFLAGS-$(CONFIG_Linux) += -I/usr/lib64/ocaml -I/usr/lib/ocaml
 CFLAGS-$(CONFIG_NetBSD) += -I/usr/pkg/lib/ocaml -fPIC
 
diff -r c89629e41231 -r a3466b005017 tools/ocaml/libs/xc/Makefile
--- a/tools/ocaml/libs/xc/Makefile      Mon Mar 21 18:04:59 2011 +0000
+++ b/tools/ocaml/libs/xc/Makefile      Mon Mar 21 18:05:49 2011 +0000
@@ -2,14 +2,14 @@
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
-CFLAGS += -I../mmap -I$(XEN_ROOT)/tools/libxc
-OCAMLINCLUDE += -I ../mmap -I ../uuid -I $(XEN_ROOT)/tools/libxc
+CFLAGS += -I../mmap $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
+OCAMLINCLUDE += -I ../mmap -I ../uuid
 
 OBJS = xc
 INTF = xc.cmi
 LIBS = xc.cma xc.cmxa
 
-LIBS_xc = -L$(XEN_ROOT)/tools/libxc -lxenctrl -lxenguest
+LIBS_xc = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest)
 
 xc_OBJS = $(OBJS)
 xc_C_OBJS = xc_stubs
diff -r c89629e41231 -r a3466b005017 tools/tests/mce-test/tools/Makefile
--- a/tools/tests/mce-test/tools/Makefile       Mon Mar 21 18:04:59 2011 +0000
+++ b/tools/tests/mce-test/tools/Makefile       Mon Mar 21 18:05:49 2011 +0000
@@ -3,7 +3,7 @@
 
 CFLAGS += -Werror
 
-CFLAGS += -I $(XEN_LIBXC)
+CFLAGS += $(CFLAGS_libxenctrl)
 CFLAGS += $(CFLAGS_xeninclude) 
 
 HDRS     = $(wildcard *.h)
diff -r c89629e41231 -r a3466b005017 tools/tests/xen-access/Makefile
--- a/tools/tests/xen-access/Makefile   Mon Mar 21 18:04:59 2011 +0000
+++ b/tools/tests/xen-access/Makefile   Mon Mar 21 18:05:49 2011 +0000
@@ -3,7 +3,7 @@
 
 CFLAGS += -Werror
 
-CFLAGS += -I $(XEN_LIBXC)
+CFLAGS += $(CFLAGS_libxenctrl)
 CFLAGS += $(CFLAGS_xeninclude)
 
 TARGETS-y := 
diff -r c89629e41231 -r a3466b005017 tools/xenstat/libxenstat/Makefile
--- a/tools/xenstat/libxenstat/Makefile Mon Mar 21 18:04:59 2011 +0000
+++ b/tools/xenstat/libxenstat/Makefile Mon Mar 21 18:05:49 2011 +0000
@@ -36,9 +36,9 @@
 
 WARN_FLAGS=-Wall -Werror
 
-CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) $(CFLAGS_xeninclude)
-LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/
-LDLIBS-y = -lxenstore -lxenctrl
+CFLAGS+=-Isrc $(CFLAGS_libxenctrl) -I$(XEN_XENSTORE) $(CFLAGS_xeninclude)
+LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/
+LDLIBS-y = -lxenstore $(LDLIBS_libxenctrl)
 LDLIBS-$(CONFIG_SunOS) += -lkstat
 ARLIBS-y = $(XEN_XENSTORE)/libxenstore.so $(XEN_LIBXC)/libxenctrl.so
 ARLIBS-x86_64 = /usr/lib/amd64/libkstat.so

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
[More with this subject...]
<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] tools: consistently use $({CFLAGS, LDLIBS}_libxenctrl) instead of open coding., Xen patchbot-unstable <=
Previous by Date:  [Xen-changelog] [xen-unstable] tools: consistently use $(CFLAGS_xeninclude) instead of open coding., Xen patchbot-unstable
Next by Date:  [Xen-changelog] [xen-unstable] tools: remove unnecessary uses of -L., Xen patchbot-unstable
Previous by Thread:  [Xen-changelog] [xen-unstable] tools: consistently use $(CFLAGS_xeninclude) instead of open coding., Xen patchbot-unstable
Next by Thread:  [Xen-changelog] [xen-unstable] tools: remove unnecessary uses of -L., Xen patchbot-unstable
Indexes:  [Date] [Thread] [Top] [All Lists]
 
   

Copyright , Citrix Systems Inc. All rights reserved. Legal and Privacy