diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-19 15:13:09 +0100 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-19 15:13:09 +0100 |
| commit | 5dfa416d52684566fd01ed8ab5dd7b3b0c4856e3 (patch) | |
| tree | 173175f5f60af3b0894336cdcfde26085e649719 /tools/xenstore/Makefile | |
| parent | 0722652dbfda7418cc5be36e293867c7e6af97f6 (diff) | |
| download | xen-5dfa416d52684566fd01ed8ab5dd7b3b0c4856e3.tar.gz xen-5dfa416d52684566fd01ed8ab5dd7b3b0c4856e3.tar.bz2 xen-5dfa416d52684566fd01ed8ab5dd7b3b0c4856e3.zip | |
Don't use $(LINK.o), as it doesn't pick up -m32/-m64 from $(CFLAGS).
Signed-off-by: John Levon <john.levon@sun.com>
Diffstat (limited to 'tools/xenstore/Makefile')
| -rw-r--r-- | tools/xenstore/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index bb96026746..d4d35c7c8c 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -36,31 +36,31 @@ XENSTORED_OBJS += $(XENSTORED_OBJS_y) all: libxenstore.so libxenstore.a xenstored $(CLIENTS) xs_tdb_dump xenstore-control xenstore-ls test_interleaved_transactions: test_interleaved_transactions.o - $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -L. -lxenstore -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -L. -lxenstore -o $@ .PHONY: testcode testcode: xs_test xenstored_test xs_random xenstored: $(XENSTORED_OBJS) - $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -lxenctrl $(SOCKET_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -lxenctrl $(SOCKET_LIBS) -o $@ $(CLIENTS): xenstore-%: xenstore_%.o libxenstore.so - $(LINK.o) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@ $(CLIENTS_OBJS): xenstore_%.o: xenstore_client.c $(COMPILE.c) -DCLIENT_$(*F) -o $@ $< xenstore-control: xenstore_control.o libxenstore.so - $(LINK.o) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@ xenstore-ls: xsls.o libxenstore.so - $(LINK.o) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@ xenstored_test: xenstored_core_test.o xenstored_watch_test.o xenstored_domain_test.o xenstored_transaction_test.o xs_lib.o talloc_test.o fake_libxc.o utils.o tdb.o - $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o - $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ xs_test xs_random xs_stress xs_crashme: LDFLAGS+=-lpthread xs_test: xs_test.o xs_lib.o utils.o |