Bastian Blank
2008-Mar-07 10:58 UTC
[Xen-devel] [PATCH 2/3] tools/xenstore - Cleanup makefile
# HG changeset patch # User Bastian Blank <waldi@debian.org> # Date 1204886808 -3600 # Node ID 968faff41008504641c5cb700c4e83c6aaa3c009 # Parent 34d86b8cde0dadfab00b66a0616baede3e6597c9 Cleanup xenstore Makefile. Signed-off-by: Bastian Blank <waldi@debian.org> diff -r 34d86b8cde0d -r 968faff41008 tools/xenstore/Makefile --- a/tools/xenstore/Makefile Fri Mar 07 11:46:48 2008 +0100 +++ b/tools/xenstore/Makefile Fri Mar 07 11:46:48 2008 +0100 @@ -1,21 +1,16 @@ XEN_ROOT=../.. XEN_ROOT=../.. include $(XEN_ROOT)/tools/Rules.mk -XEN_LIBXC = $(XEN_ROOT)/tools/libxc MAJOR = 3.0 MINOR = 0 -PROFILE=#-pg -BASECFLAGS=-Werror +CFLAGS += -Werror +CFLAGS += -I. +CFLAGS += $(CFLAGS_libxenctrl) + # Make gcc generate dependencies. -BASECFLAGS += -Wp,-MD,.$(@F).d -PROG_DEP = .*.d -BASECFLAGS+= $(PROFILE) -BASECFLAGS+= $(CFLAGS_libxenctrl) -BASECFLAGS+= -I. - -CFLAGS += $(BASECFLAGS) -LDFLAGS += $(PROFILE) +CFLAGS += -Wp,-MD,.$(@F).d +DEP = .*.d CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod CLIENTS += xenstore-write @@ -45,22 +40,22 @@ endif endif xenstored: $(XENSTORED_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) $(LDFLAGS_libxenctrl) $(SOCKET_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDFLAGS_libxenctrl) $(SOCKET_LIBS) -o $@ $(CLIENTS): xenstore-%: xenstore_%.o libxenstore.so - $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@ $(CLIENTS_OBJS): xenstore_%.o: xenstore_client.c $(COMPILE.c) -DCLIENT_$(*F) -o $@ $< xenstore-control: xenstore_control.o libxenstore.so - $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@ xenstore-ls: xsls.o libxenstore.so - $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@ xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o - $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ libxenstore.so: libxenstore.so.$(MAJOR) ln -sf $< $@ @@ -71,7 +66,7 @@ libxenstore.so.$(MAJOR).$(MINOR): xs.opi $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenstore.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ $(SOCKET_LIBS) -lpthread libxenstore.a: xs.o xs_lib.o - $(AR) rcs libxenstore.a $^ + $(AR) rcs $@ $^ .PHONY: clean clean: @@ -79,7 +74,7 @@ clean: rm -f xenstored xs_random xs_stress xs_crashme rm -f xs_tdb_dump xenstore-control xenstore-ls rm -f $(CLIENTS) - $(RM) $(PROG_DEP) + $(RM) $(DEP) .PHONY: TAGS TAGS: @@ -108,7 +103,7 @@ install: all $(INSTALL_DATA) xs.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) xs_lib.h $(DESTDIR)$(INCLUDEDIR) --include $(PROG_DEP) +-include $(DEP) # never delete any intermediate files. .SECONDARY: -- Women professionals do tend to over-compensate. -- Dr. Elizabeth Dehaver, "Where No Man Has Gone Before", stardate 1312.9. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel