diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-21 18:05:49 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-03-21 18:05:49 +0000 |
| commit | ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4 (patch) | |
| tree | 0ab1f5bd7b6d51a2ff3b6ad80b3ccf15b8e74181 /tools/flask | |
| parent | 3531dea6fd314a8734b08eac0bf9a7bb7ee7b37c (diff) | |
| download | xen-ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4.tar.gz xen-ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4.tar.bz2 xen-ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4.zip | |
tools: consistently use $({CFLAGS,LDLIBS}_libxenctrl) instead of open coding.
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/flask')
| -rw-r--r-- | tools/flask/libflask/Makefile | 6 | ||||
| -rw-r--r-- | tools/flask/utils/Makefile | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/tools/flask/libflask/Makefile b/tools/flask/libflask/Makefile index 92e836a537..dcb5592807 100644 --- a/tools/flask/libflask/Makefile +++ b/tools/flask/libflask/Makefile @@ -4,14 +4,12 @@ MINOR = 0 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 @@ libflask.so.$(MAJOR): libflask.so.$(MAJOR).$(MINOR) 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 --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index 86c04294f0..ff3799a00e 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -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+= $(CFLAGS_libxenctrl) 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 @@ CLIENTS_OBJS := $(patsubst flask-%,%.o,$(CLIENTS)) 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: |