From 61d0fe74c6d60cd184afdf4f4566f421c90816ce Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 31 Mar 2011 19:32:18 +0100 Subject: [PATCH] tools: Remove $(CFLAGS) from links lines. The relevant variable in these circumstances is called $(LDFLAGS). Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/blktap/drivers/Makefile | 6 +++--- tools/blktap/lib/Makefile | 2 +- tools/blktap2/control/Makefile | 4 ++-- tools/blktap2/lvm/Makefile | 2 +- tools/blktap2/vhd/Makefile | 4 ++-- tools/blktap2/vhd/lib/Makefile | 2 +- tools/console/Makefile | 4 ++-- tools/debugger/kdd/Makefile | 2 +- tools/flask/libflask/Makefile | 2 +- tools/flask/utils/Makefile | 2 +- tools/libfsimage/Rules.mk | 2 +- tools/libfsimage/common/Makefile | 2 +- tools/libxc/Makefile | 6 +++--- tools/libxen/Makefile | 2 +- tools/libxen/Makefile.dist | 2 +- tools/libxl/Makefile | 4 ++-- tools/misc/Makefile | 4 ++-- tools/ocaml/Makefile.rules | 2 +- tools/tests/mce-test/tools/Makefile | 5 +---- tools/tests/xen-access/Makefile | 7 ++----- tools/vtpm_manager/manager/Makefile | 2 +- tools/vtpm_manager/migration/Makefile | 4 ++-- tools/xcutils/Makefile | 14 +++++--------- tools/xenbackendd/Makefile | 4 ++-- tools/xenmon/Makefile | 9 +++++---- tools/xenpaging/Makefile | 2 +- tools/xenpmd/Makefile | 9 +++++---- tools/xenstat/libxenstat/Makefile | 11 +---------- tools/xenstore/Makefile | 10 +++++----- tools/xentrace/Makefile | 12 ++++++------ 30 files changed, 63 insertions(+), 80 deletions(-) diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile index 7265c76bd4..2b91a2c71b 100644 --- a/tools/blktap/drivers/Makefile +++ b/tools/blktap/drivers/Makefile @@ -48,16 +48,16 @@ BLKTAB-OBJS-$(CONFIG_Linux) += blktapctrl_linux.o all: $(IBIN) qcow-util blktapctrl: $(BLKTAB-OBJS-y) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS_blktapctrl) + $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_blktapctrl) tapdisk: tapdisk.o $(BLK-OBJS-y) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS_img) + $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_img) .PHONY: qcow-util qcow-util: img2qcow qcow2raw qcow-create img2qcow qcow2raw qcow-create: %: %.o $(BLK-OBJS-y) - $(CC) $(CFLAGS) $(LDFLAGS) -o $* $^ $(LDLIBS_img) + $(CC) $(LDFLAGS) -o $* $^ $(LDLIBS_img) install: all $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(SBINDIR) diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile index 95eccac400..1944b1ec8d 100644 --- a/tools/blktap/lib/Makefile +++ b/tools/blktap/lib/Makefile @@ -42,7 +42,7 @@ clean: rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen TAGS libblktap.so.$(MAJOR).$(MINOR): $(OBJS_PIC) - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_LDFLAGS) \ + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_LDFLAGS) \ -o $@ $^ $(LDLIBS) ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR) ln -sf libblktap.so.$(MAJOR) libblktap.so diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile index 703bb8d8c5..86a433c3d7 100644 --- a/tools/blktap2/control/Makefile +++ b/tools/blktap2/control/Makefile @@ -52,13 +52,13 @@ $(LIBSONAME): $(LIB_SHARED) ln -sf $< $@ tap-ctl: tap-ctl.o $(LIBNAME).so - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + $(CC) $(LDFLAGS) -o $@ $^ $(LIB_STATIC): $(CTL_OBJS) $(AR) r $@ $^ $(LIB_SHARED): $(CTL_PICS) - $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -Wl,$(SONAME_LDFLAG) -Wl,$(LIBSONAME) $(SHLIB_LDFLAGS) -rdynamic $^ -o $@ + $(CC) $(LDFLAGS) -fPIC -Wl,$(SONAME_LDFLAG) -Wl,$(LIBSONAME) $(SHLIB_LDFLAGS) -rdynamic $^ -o $@ install: $(IBIN) $(LIB_STATIC) $(LIB_SHARED) $(INSTALL_DIR) -p $(DESTDIR)$(SBINDIR) diff --git a/tools/blktap2/lvm/Makefile b/tools/blktap2/lvm/Makefile index 56253277a0..75637918c6 100644 --- a/tools/blktap2/lvm/Makefile +++ b/tools/blktap2/lvm/Makefile @@ -24,7 +24,7 @@ build: $(TEST) $(LVM-OBJS) install: all lvm-util: lvm-util.o - $(CC) $(CFLAGS) -DLVM_UTIL $(LDFLAGS) -o lvm-util lvm-util.c + $(CC) -DLVM_UTIL $(LDFLAGS) -o lvm-util lvm-util.c clean: rm -rf *.o *~ $(DEPS) $(IBIN) diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile index 7c8bed7879..c5019de9a6 100644 --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -31,10 +31,10 @@ LIBS_DEPENDS := lib/libvhd.so lib/vhd.a $(LIBS_DEPENDS):subdirs-all vhd-util: vhd-util.o $(LIBS_DEPENDS) - $(CC) $(CFLAGS) $(LDFLAGS) -o vhd-util vhd-util.o $(LIBS) + $(CC) $(LDFLAGS) -o vhd-util vhd-util.o $(LIBS) vhd-update: vhd-update.o $(LIBS_DEPENDS) - $(CC) $(CFLAGS) $(LDFLAGS) -o vhd-update vhd-update.o $(LIBS) + $(CC) $(LDFLAGS) -o vhd-update vhd-update.o $(LIBS) install: all $(MAKE) subdirs-install diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile index 5d7724b3fa..97379c117e 100644 --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile @@ -52,7 +52,7 @@ all: build build: $(LIBVHD-BUILD) libvhd.a: $(LIB-OBJS) - $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_LDFLAGS) \ + $(CC) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_LDFLAGS) \ $(LDFLAGS) -o libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $^ $(LIBS) ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) libvhd.so.$(LIBVHD-MAJOR) ln -sf libvhd.so.$(LIBVHD-MAJOR) libvhd.so diff --git a/tools/console/Makefile b/tools/console/Makefile index 0203c4a417..2160987176 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -23,10 +23,10 @@ clean: $(RM) client/*.o daemon/*.o xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) - $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) $(LDLIBS_xenconsoled) + $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_xenconsoled) xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) - $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) $(LDLIBS_xenconsole) + $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_xenconsole) .PHONY: install install: $(BIN) diff --git a/tools/debugger/kdd/Makefile b/tools/debugger/kdd/Makefile index db162aa0fb..8b507665c3 100644 --- a/tools/debugger/kdd/Makefile +++ b/tools/debugger/kdd/Makefile @@ -10,7 +10,7 @@ OBJS := $(CFILES:.c=.o) all: kdd kdd: $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) + $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) .PHONY: clean clean: diff --git a/tools/flask/libflask/Makefile b/tools/flask/libflask/Makefile index 7b75a120d0..12c1c90770 100644 --- a/tools/flask/libflask/Makefile +++ b/tools/flask/libflask/Makefile @@ -53,6 +53,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 $@ $^ $(LDLIBS_libxenctrl) + $(CC) $(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 a88452b958..c7337a967b 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -19,7 +19,7 @@ CLIENTS_OBJS := $(patsubst flask-%,%.o,$(CLIENTS)) all: $(CLIENTS) $(CLIENTS): flask-%: %.o - $(CC) $(CFLAGS) $(LDFLAGS) $< $(LDLIBS) -L$(LIBFLASK_ROOT) -lflask $(LDLIBS_libxenctrl) -o $@ + $(CC) $(LDFLAGS) $< $(LDLIBS) -L$(LIBFLASK_ROOT) -lflask $(LDLIBS_libxenctrl) -o $@ .PHONY: clean clean: diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk index 0e29c25bb3..542bb3dd0b 100644 --- a/tools/libfsimage/Rules.mk +++ b/tools/libfsimage/Rules.mk @@ -24,7 +24,7 @@ fs-install: fs-all $(INSTALL_PROG) $(FSLIB) $(DESTDIR)$(FSDIR) $(FSLIB): $(PIC_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS) + $(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS) clean distclean: rm -f $(PIC_OBJS) $(FSLIB) $(DEPS) diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile index afb1e96e0d..11621e7297 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -37,7 +37,7 @@ libfsimage.so.$(MAJOR): libfsimage.so.$(MAJOR).$(MINOR) ln -sf $< $@ libfsimage.so.$(MAJOR).$(MINOR): $(PIC_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ -lpthread + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ -lpthread -include $(DEPS) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 6464818187..6b00abab50 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -156,7 +156,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_LDFLAGS) -o $@ $^ $(DLOPEN_LIBS) $(PTHREAD_LIBS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(DLOPEN_LIBS) $(PTHREAD_LIBS) # libxenguest @@ -192,10 +192,10 @@ xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D) 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 $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) + $(CC) $(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) $(LDLIBS_libxenctrl) + $(CC) -g $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) $(LDLIBS_libxenctrl) -include $(DEPS) diff --git a/tools/libxen/Makefile b/tools/libxen/Makefile index 1996b98142..27a6d2e763 100644 --- a/tools/libxen/Makefile +++ b/tools/libxen/Makefile @@ -44,7 +44,7 @@ libxenapi.so.$(MAJOR): libxenapi.so.$(MAJOR).$(MINOR) ln -sf $< $@ libxenapi.so.$(MAJOR).$(MINOR): $(LIBXENAPI_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenapi.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenapi.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ libxenapi.a: $(LIBXENAPI_OBJS) $(AR) rcs libxenapi.a $^ diff --git a/tools/libxen/Makefile.dist b/tools/libxen/Makefile.dist index 33ca44848c..70883629b8 100644 --- a/tools/libxen/Makefile.dist +++ b/tools/libxen/Makefile.dist @@ -54,7 +54,7 @@ libxenapi.so.$(MAJOR): libxenapi.so.$(MAJOR).$(MINOR) ln -sf $< $@ libxenapi.so.$(MAJOR).$(MINOR): $(LIBXENAPI_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenapi.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenapi.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ libxenapi.a: $(LIBXENAPI_OBJS) $(AR) rcs libxenapi.a $^ diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index b7c5bb318a..5fac906abc 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -85,7 +85,7 @@ libxenlight.so.$(MAJOR): libxenlight.so.$(MAJOR).$(MINOR) ln -sf $< $@ libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) libxenlight.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ @@ -97,7 +97,7 @@ libxlutil.so.$(XLUMAJOR): libxlutil.so.$(XLUMAJOR).$(XLUMINOR) ln -sf $< $@ libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXLU_LIBS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXLU_LIBS) libxlutil.a: $(LIBXLU_OBJS) $(AR) rcs libxlutil.a $^ diff --git a/tools/misc/Makefile b/tools/misc/Makefile index cbd74cd03e..3f2351bc2c 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -58,9 +58,9 @@ clean: $(CC) -c $(CFLAGS) -o $@ $< xen-hvmctx xen-hvmcrash xenperf xenpm gtracestat xenlockprof xen-hptool xenwatchdogd: %: %.o Makefile - $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS_$*) + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_$*) gtraceview: %: %.o Makefile - $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CURSES_LIBS) + $(CC) $(LDFLAGS) -o $@ $< $(CURSES_LIBS) -include $(DEPS) diff --git a/tools/ocaml/Makefile.rules b/tools/ocaml/Makefile.rules index b669764fe6..bbd22e881d 100644 --- a/tools/ocaml/Makefile.rules +++ b/tools/ocaml/Makefile.rules @@ -84,7 +84,7 @@ endef define C_PROGRAM_template $(1): $(foreach obj,$($(1)_OBJS),$(obj).o) - $(call quiet-command, $(CC) $(CFLAGS) -o $$@ $$+,BIN,$$@) + $(call quiet-command, $(CC) $(LDFLAGS) -o $$@ $$+,BIN,$$@) endef -include .ocamldep.make diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile index e8a98e0cd2..6df8385dc4 100644 --- a/tools/tests/mce-test/tools/Makefile +++ b/tools/tests/mce-test/tools/Makefile @@ -18,8 +18,5 @@ install: clean: $(RM) *.o xen-mceinj -%.o: %.c $(HDRS) Makefile - $(CC) -c $(CFLAGS) -o $@ $< - xen-mceinj: %: %.o Makefile - $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) + $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) diff --git a/tools/tests/xen-access/Makefile b/tools/tests/xen-access/Makefile index 63548ccb6a..b3555aba70 100644 --- a/tools/tests/xen-access/Makefile +++ b/tools/tests/xen-access/Makefile @@ -25,10 +25,7 @@ clean: $(RM) *.o $(TARGETS) *~ $(DEPS) set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done -%.o: %.c Makefile - $(CC) -c $(CFLAGS) -o $@ $< - xen-access: %: %.o Makefile - $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) -# $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) + $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) + -include $(DEPS) diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile index 8c572b78e0..149f01d2b9 100644 --- a/tools/vtpm_manager/manager/Makefile +++ b/tools/vtpm_manager/manager/Makefile @@ -29,7 +29,7 @@ mrproper: clean rm -f *~ $(BIN): $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@ + $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ # libraries LIBS += ../tcs/libTCS.a ../util/libTCGUtils.a ../crypto/libtcpaCrypto.a diff --git a/tools/vtpm_manager/migration/Makefile b/tools/vtpm_manager/migration/Makefile index 7f3f6bb0bb..38d6055f0f 100644 --- a/tools/vtpm_manager/migration/Makefile +++ b/tools/vtpm_manager/migration/Makefile @@ -33,10 +33,10 @@ mrproper: clean rm -f *~ $(BIND): $(OBJSD) - $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@ + $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ $(BINC): $(OBJSC) - $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@ + $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ # libraries LIBS += ../util/libTCGUtils.a diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index e16c6a334f..d5c64a8f14 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -11,15 +11,14 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk - PROGRAMS = xc_restore xc_save readnotes lsevtchn CFLAGS += -Werror -CFLAGS_xc_restore := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) -CFLAGS_xc_save := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) -CFLAGS_readnotes := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) -CFLAGS_lsevtchn := $(CFLAGS_libxenctrl) +CFLAGS_xc_restore.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) +CFLAGS_xc_save.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) +CFLAGS_readnotes.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) +CFLAGS_lsevtchn.o := $(CFLAGS_libxenctrl) LDLIBS_xc_restore := $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) LDLIBS_xc_save := $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) @@ -32,11 +31,8 @@ all: build .PHONY: build build: $(PROGRAMS) -%.o: %.c - $(CC) $(CFLAGS) $(CFLAGS_$*) -c $^ -o $@ - $(PROGRAMS): %: %.o - $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_$*) -o $@ + $(CC) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_$*) -o $@ .PHONY: install install: build diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile index 4950134d7d..eaf0313fba 100644 --- a/tools/xenbackendd/Makefile +++ b/tools/xenbackendd/Makefile @@ -35,7 +35,7 @@ clean: rm -f $(SBIN) $(DEPS) -%: %.c Makefile - $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LDLIBS) +%: %.o Makefile + $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) -include $(DEPS) diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index c130a3f89a..b3b54243a1 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -40,9 +40,10 @@ clean: rm -f $(BIN) $(DEPS) -%: %.c Makefile - $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LDLIBS) -xentrace_%: %.c Makefile - $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LDLIBS) +%: %.o Makefile + $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) + +xentrace_%: %.o Makefile + $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) -include $(DEPS) diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile index 5ba4686d85..553bf3fe4a 100644 --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile @@ -19,7 +19,7 @@ IBINS = xenpaging all: $(IBINS) xenpaging: $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) + $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) install: all $(INSTALL_DIR) $(DESTDIR)/var/lib/xen/xenpaging diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile index 2a9249cb96..0743c8c04d 100644 --- a/tools/xenpmd/Makefile +++ b/tools/xenpmd/Makefile @@ -1,8 +1,9 @@ XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Werror -CFLAGS += $(CFLAGS_libxenstore) +CFLAGS += -Werror +CFLAGS += $(CFLAGS_libxenstore) + LDLIBS += $(LDLIBS_libxenstore) BIN = xenpmd @@ -19,7 +20,7 @@ install: all clean: $(RM) -f $(BIN) $(DEPS) -%: %.c Makefile - $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LDLIBS) +%: %.o Makefile + $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) -include $(DEPS) diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index b670ced094..02e800b0c6 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/xenstat/libxenstat/Makefile @@ -50,18 +50,9 @@ $(LIB): $(OBJECTS-y) $(RANLIB) $@ $(SHLIB): $(OBJECTS-y) - $(CC) $(CFLAGS) $(LDFLAGS) $(SONAME_FLAGS) $(SHLIB_LDFLAGS) -o $@ \ + $(CC) $(LDFLAGS) $(SONAME_FLAGS) $(SHLIB_LDFLAGS) -o $@ \ $(OBJECTS-y) $(LDLIBS-y) -src/xenstat.o: src/xenstat.c src/xenstat.h src/xenstat_priv.h - $(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@ $< - -src/xenstat_linux.o: src/xenstat_linux.c src/xenstat_priv.h - $(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@ $< - -src/xenstat_solaris.o: src/xenstat_solaris.c src/xenstat_priv.h - $(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@ $< - src/libxenstat.so.$(MAJOR): $(SHLIB) $(MAKE_LINK) $(