[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] tools/xenstore: introduce Makefile.common to be used by stubdom
commit ce4dfcb6ffc2bef1e53dba119e4fcba3cc4c6eea Author: Anthony PERARD <anthony.perard@xxxxxxxxxx> AuthorDate: Fri Feb 25 15:13:18 2022 +0000 Commit: Julien Grall <jgrall@xxxxxxxxxx> CommitDate: Thu Jun 16 16:58:50 2022 +0100 tools/xenstore: introduce Makefile.common to be used by stubdom Also change stubdom to depends on Makefile.common. Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx> Reviewed-by: Juergen Gross <jgross@xxxxxxxx> --- stubdom/Makefile | 4 ++-- tools/xenstore/Makefile | 33 +++------------------------------ tools/xenstore/Makefile.common | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 32 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index fbc63a5063..6b804824ba 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -371,10 +371,10 @@ endef $(foreach lib,$(STUB_LIBS),$(eval $(call BUILD_lib,$(lib)))) -xenstore/stamp: $(XEN_ROOT)/tools/xenstore/Makefile +xenstore/stamp: $(XEN_ROOT)/tools/xenstore/Makefile.common $(do_links) -xenstorepvh/stamp: $(XEN_ROOT)/tools/xenstore/Makefile +xenstorepvh/stamp: $(XEN_ROOT)/tools/xenstore/Makefile.common $(do_links) LINK_DIRS := xenstore xenstorepvh $(foreach dir,$(STUB_LIBS),libs-$(XEN_TARGET_ARCH)/$(dir)) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 830052c65f..1b66190cc5 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -1,31 +1,7 @@ XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Werror -# Include configure output (config.h) -CFLAGS += -include $(XEN_ROOT)/tools/config.h -CFLAGS += -I./include -CFLAGS += $(CFLAGS_libxenevtchn) -CFLAGS += $(CFLAGS_libxenctrl) -CFLAGS += $(CFLAGS_libxenguest) -CFLAGS += $(CFLAGS_libxentoolcore) -CFLAGS += -DXEN_LIB_STORED="\"$(XEN_LIB_STORED)\"" -CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\"" - -ifdef CONFIG_STUBDOM -CFLAGS += -DNO_SOCKETS=1 -endif - -XENSTORED_OBJS-y := xenstored_core.o xenstored_watch.o xenstored_domain.o -XENSTORED_OBJS-y += xenstored_transaction.o xenstored_control.o -XENSTORED_OBJS-y += xs_lib.o talloc.o utils.o tdb.o hashtable.o - -XENSTORED_OBJS-$(CONFIG_Linux) += xenstored_posix.o -XENSTORED_OBJS-$(CONFIG_NetBSD) += xenstored_posix.o -XENSTORED_OBJS-$(CONFIG_FreeBSD) += xenstored_posix.o -XENSTORED_OBJS-$(CONFIG_MiniOS) += xenstored_minios.o - -$(XENSTORED_OBJS-y): CFLAGS += $(CFLAGS_libxengnttab) +include Makefile.common xenstored: LDLIBS += $(LDLIBS_libxenevtchn) xenstored: LDLIBS += $(LDLIBS_libxengnttab) @@ -65,9 +41,6 @@ clients: xenstore $(CLIENTS) xenstore-control xenstored: $(XENSTORED_OBJS-y) $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ $(APPEND_LDFLAGS) -xenstored.a: $(XENSTORED_OBJS-y) - $(AR) cr $@ $^ - $(CLIENTS): xenstore ln -f xenstore $@ @@ -81,8 +54,8 @@ xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o $(CC) $(LDFLAGS) $^ -o $@ $(APPEND_LDFLAGS) .PHONY: clean -clean: - $(RM) *.a *.o $(TARGETS) $(DEPS_RM) +clean:: + $(RM) $(TARGETS) $(DEPS_RM) .PHONY: distclean distclean: clean diff --git a/tools/xenstore/Makefile.common b/tools/xenstore/Makefile.common new file mode 100644 index 0000000000..21b78b0538 --- /dev/null +++ b/tools/xenstore/Makefile.common @@ -0,0 +1,33 @@ +# Makefile shared with stubdom + +XENSTORED_OBJS-y := xenstored_core.o xenstored_watch.o xenstored_domain.o +XENSTORED_OBJS-y += xenstored_transaction.o xenstored_control.o +XENSTORED_OBJS-y += xs_lib.o talloc.o utils.o tdb.o hashtable.o + +XENSTORED_OBJS-$(CONFIG_Linux) += xenstored_posix.o +XENSTORED_OBJS-$(CONFIG_NetBSD) += xenstored_posix.o +XENSTORED_OBJS-$(CONFIG_FreeBSD) += xenstored_posix.o +XENSTORED_OBJS-$(CONFIG_MiniOS) += xenstored_minios.o + +CFLAGS += -Werror +# Include configure output (config.h) +CFLAGS += -include $(XEN_ROOT)/tools/config.h +CFLAGS += -I./include +CFLAGS += $(CFLAGS_libxenevtchn) +CFLAGS += $(CFLAGS_libxenctrl) +CFLAGS += $(CFLAGS_libxenguest) +CFLAGS += $(CFLAGS_libxentoolcore) +CFLAGS += -DXEN_LIB_STORED="\"$(XEN_LIB_STORED)\"" +CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\"" + +ifdef CONFIG_STUBDOM +CFLAGS += -DNO_SOCKETS=1 +endif + +$(XENSTORED_OBJS-y): CFLAGS += $(CFLAGS_libxengnttab) + +xenstored.a: $(XENSTORED_OBJS-y) + $(AR) cr $@ $^ + +clean:: + $(RM) *.a *.o -- generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |