[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen staging] tools: Use config.h from autoconf instead of "buildmakevars2header"
commit 021cd1c4b4dfd23a5feb92fecc8db8a7228c80a5 Author: Anthony PERARD <anthony.perard@xxxxxxxxxx> AuthorDate: Mon Dec 6 17:02:01 2021 +0000 Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools: Use config.h from autoconf instead of "buildmakevars2header" This avoid the need to generate the _paths.h header when the information is from autoconf anyway. They are no more users of the "buildmakevars2header" macro, so it can be removed from "Config.mk". Also removed the extra "-f" flag where "$(RM)" is used (xl/Makefile). Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx> Reviewed-by: Juergen Gross <jgross@xxxxxxxx> --- .gitignore | 6 ----- Config.mk | 9 -------- configure | 45 ++++++++++++++++++++++++++++++++++++ docs/configure | 45 ++++++++++++++++++++++++++++++++++++ m4/paths.m4 | 9 ++++++++ tools/config.h.in | 27 ++++++++++++++++++++++ tools/configure | 45 ++++++++++++++++++++++++++++++++++++ tools/console/Makefile | 12 ++-------- tools/console/client/main.c | 1 - tools/console/daemon/main.c | 1 - tools/helpers/Makefile | 8 ++----- tools/helpers/init-xenstore-domain.c | 1 - tools/libs/guest/Makefile | 5 ---- tools/libs/guest/xg_dom_core.c | 1 - tools/libs/guest/xg_suspend.c | 1 - tools/libs/libs.mk | 1 - tools/libs/light/Makefile | 8 ++----- tools/libs/light/libxl_dom.c | 2 -- tools/libs/light/libxl_internal.h | 1 - tools/libs/light/libxl_utils.c | 1 - tools/libs/stat/Makefile | 7 +----- tools/libs/stat/xenstat_qmp.c | 1 - tools/xl/Makefile | 7 +----- tools/xl/xl.h | 1 - 24 files changed, 179 insertions(+), 66 deletions(-) diff --git a/.gitignore b/.gitignore index 958c60bb5f..3f9d55ba87 100644 --- a/.gitignore +++ b/.gitignore @@ -123,7 +123,6 @@ tools/libs/foreignmemory/headers.chk tools/libs/foreignmemory/xenforeignmemory.pc tools/libs/devicemodel/headers.chk tools/libs/devicemodel/xendevicemodel.pc -tools/libs/guest/_*.[ch] tools/libs/guest/libxenguest.map tools/libs/guest/xenguest.pc tools/libs/guest/xc_bitops.h @@ -146,7 +145,6 @@ tools/libs/light/test_timedereg tools/libs/light/test_fdderegrace tools/libs/light/tmp.* tools/libs/light/xenlight.pc -tools/libs/stat/_paths.h tools/libs/stat/headers.chk tools/libs/stat/libxenstat.map tools/libs/stat/xenstat.pc @@ -163,8 +161,6 @@ tools/libs/vchan/libxenvchan.map tools/libs/vchan/xenvchan.pc tools/console/xenconsole tools/console/xenconsoled -tools/console/client/_paths.h -tools/console/daemon/_paths.h tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/* tools/debugger/gdb/gdb-6.2.1/* tools/debugger/gdb/gdb-6.2.1.tar.bz2 @@ -207,7 +203,6 @@ tools/fuzz/x86_instruction_emulator/afl-harness-cov tools/fuzz/x86_instruction_emulator/wrappers.c tools/fuzz/x86_instruction_emulator/x86_emulate tools/fuzz/x86_instruction_emulator/x86-emulate.[ch] -tools/helpers/_paths.h tools/helpers/init-xenstore-domain tools/helpers/xen-init-dom0 tools/hotplug/common/hotplugpath.sh @@ -421,7 +416,6 @@ tools/firmware/etherboot/ipxe.tar.gz tools/firmware/etherboot/ipxe/ tools/python/xen/lowlevel/xl/_pyxl_types.c tools/python/xen/lowlevel/xl/_pyxl_types.h -tools/xl/_paths.h tools/xl/xl docs/txt/misc/*.txt diff --git a/Config.mk b/Config.mk index 6587c7d626..1c1998a5a8 100644 --- a/Config.mk +++ b/Config.mk @@ -167,15 +167,6 @@ define buildmakevars2file-closure $(call move-if-changed,$(1).tmp,$(1)) endef -buildmakevars2header = $(eval $(call buildmakevars2header-closure,$(1))) -define buildmakevars2header-closure - $(1): .phony - rm -f $(1).tmp; \ - $(foreach var, $(BUILD_MAKE_VARS), \ - echo "#define $(var) \"$($(var))\"" >>$(1).tmp;) \ - $(call move-if-changed,$(1).tmp,$(1)) -endef - CFLAGS += -fno-strict-aliasing CFLAGS += -std=gnu99 diff --git a/configure b/configure index 502273b263..bb7f27ddad 100755 --- a/configure +++ b/configure @@ -1946,6 +1946,11 @@ CONFIG_DIR=$sysconfdir XEN_CONFIG_DIR=$CONFIG_DIR/xen +cat >>confdefs.h <<_ACEOF +#define XEN_CONFIG_DIR "$XEN_CONFIG_DIR" +_ACEOF + + # Check whether --with-initddir was given. if test "${with_initddir+set}" = set; then : @@ -1998,6 +2003,11 @@ fi XEN_SCRIPT_DIR=$xen_scriptdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_SCRIPT_DIR "$XEN_SCRIPT_DIR" +_ACEOF + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : @@ -2038,6 +2048,11 @@ LIBEXEC=`eval echo $libexecdir/$libexec_subdir` LIBEXEC_BIN=${LIBEXEC}/bin + +cat >>confdefs.h <<_ACEOF +#define LIBEXEC_BIN "$LIBEXEC_BIN" +_ACEOF + LIBEXEC_LIB=${LIBEXEC}/lib LIBEXEC_INC=${LIBEXEC}/include @@ -2045,12 +2060,27 @@ LIBEXEC_INC=${LIBEXEC}/include XENFIRMWAREDIR=${LIBEXEC}/boot +cat >>confdefs.h <<_ACEOF +#define XENFIRMWAREDIR "$XENFIRMWAREDIR" +_ACEOF + + XEN_RUN_DIR=$rundir_path/xen +cat >>confdefs.h <<_ACEOF +#define XEN_RUN_DIR "$XEN_RUN_DIR" +_ACEOF + + XEN_LOG_DIR=$localstatedir/log/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LOG_DIR "$XEN_LOG_DIR" +_ACEOF + + XEN_LIB_STORED=$localstatedir/lib/xenstored @@ -2060,6 +2090,11 @@ XEN_RUN_STORED=$rundir_path/xenstored XEN_LIB_DIR=$localstatedir/lib/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LIB_DIR "$XEN_LIB_DIR" +_ACEOF + + SHAREDIR=$prefix/share @@ -2073,12 +2108,22 @@ case "$host_os" in esac +cat >>confdefs.h <<_ACEOF +#define XEN_LOCK_DIR "$XEN_LOCK_DIR" +_ACEOF + + XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging XEN_DUMP_DIR=$xen_dumpdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_DUMP_DIR "$XEN_DUMP_DIR" +_ACEOF + + DEBUG_DIR=$debugdir_path diff --git a/docs/configure b/docs/configure index f93d086e9a..d4fced9858 100755 --- a/docs/configure +++ b/docs/configure @@ -1849,6 +1849,11 @@ CONFIG_DIR=$sysconfdir XEN_CONFIG_DIR=$CONFIG_DIR/xen +cat >>confdefs.h <<_ACEOF +#define XEN_CONFIG_DIR "$XEN_CONFIG_DIR" +_ACEOF + + # Check whether --with-initddir was given. if test "${with_initddir+set}" = set; then : @@ -1901,6 +1906,11 @@ fi XEN_SCRIPT_DIR=$xen_scriptdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_SCRIPT_DIR "$XEN_SCRIPT_DIR" +_ACEOF + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : @@ -1941,6 +1951,11 @@ LIBEXEC=`eval echo $libexecdir/$libexec_subdir` LIBEXEC_BIN=${LIBEXEC}/bin + +cat >>confdefs.h <<_ACEOF +#define LIBEXEC_BIN "$LIBEXEC_BIN" +_ACEOF + LIBEXEC_LIB=${LIBEXEC}/lib LIBEXEC_INC=${LIBEXEC}/include @@ -1948,12 +1963,27 @@ LIBEXEC_INC=${LIBEXEC}/include XENFIRMWAREDIR=${LIBEXEC}/boot +cat >>confdefs.h <<_ACEOF +#define XENFIRMWAREDIR "$XENFIRMWAREDIR" +_ACEOF + + XEN_RUN_DIR=$rundir_path/xen +cat >>confdefs.h <<_ACEOF +#define XEN_RUN_DIR "$XEN_RUN_DIR" +_ACEOF + + XEN_LOG_DIR=$localstatedir/log/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LOG_DIR "$XEN_LOG_DIR" +_ACEOF + + XEN_LIB_STORED=$localstatedir/lib/xenstored @@ -1963,6 +1993,11 @@ XEN_RUN_STORED=$rundir_path/xenstored XEN_LIB_DIR=$localstatedir/lib/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LIB_DIR "$XEN_LIB_DIR" +_ACEOF + + SHAREDIR=$prefix/share @@ -1976,12 +2011,22 @@ case "$host_os" in esac +cat >>confdefs.h <<_ACEOF +#define XEN_LOCK_DIR "$XEN_LOCK_DIR" +_ACEOF + + XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging XEN_DUMP_DIR=$xen_dumpdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_DUMP_DIR "$XEN_DUMP_DIR" +_ACEOF + + DEBUG_DIR=$debugdir_path diff --git a/m4/paths.m4 b/m4/paths.m4 index 7be314a3e2..826faada45 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -39,6 +39,7 @@ AC_SUBST(CONFIG_DIR) XEN_CONFIG_DIR=$CONFIG_DIR/xen AC_SUBST(XEN_CONFIG_DIR) +AC_DEFINE_UNQUOTED([XEN_CONFIG_DIR], ["$XEN_CONFIG_DIR"], [Xen's config dir]) AC_ARG_WITH([initddir], AS_HELP_STRING([--with-initddir=DIR], @@ -83,6 +84,7 @@ AC_ARG_WITH([xen-scriptdir], [xen_scriptdir_path=$XEN_CONFIG_DIR/scripts]) XEN_SCRIPT_DIR=$xen_scriptdir_path AC_SUBST(XEN_SCRIPT_DIR) +AC_DEFINE_UNQUOTED([XEN_SCRIPT_DIR], ["$XEN_SCRIPT_DIR"], [Xen's script dir]) AC_ARG_WITH([xen-dumpdir], AS_HELP_STRING([--with-xen-dumpdir=DIR], @@ -117,18 +119,22 @@ AC_SUBST(LIBEXEC) dnl These variables will be substituted in various .in files LIBEXEC_BIN=${LIBEXEC}/bin AC_SUBST(LIBEXEC_BIN) +AC_DEFINE_UNQUOTED([LIBEXEC_BIN], ["$LIBEXEC_BIN"], [Xen's libexec path]) LIBEXEC_LIB=${LIBEXEC}/lib AC_SUBST(LIBEXEC_LIB) LIBEXEC_INC=${LIBEXEC}/include AC_SUBST(LIBEXEC_INC) XENFIRMWAREDIR=${LIBEXEC}/boot AC_SUBST(XENFIRMWAREDIR) +AC_DEFINE_UNQUOTED([XENFIRMWAREDIR], ["$XENFIRMWAREDIR"], [Xen's firmware dir]) XEN_RUN_DIR=$rundir_path/xen AC_SUBST(XEN_RUN_DIR) +AC_DEFINE_UNQUOTED([XEN_RUN_DIR], ["$XEN_RUN_DIR"], [Xen's runstate path]) XEN_LOG_DIR=$localstatedir/log/xen AC_SUBST(XEN_LOG_DIR) +AC_DEFINE_UNQUOTED([XEN_LOG_DIR], ["$XEN_LOG_DIR"], [Xen's log dir]) XEN_LIB_STORED=$localstatedir/lib/xenstored AC_SUBST(XEN_LIB_STORED) @@ -138,6 +144,7 @@ AC_SUBST(XEN_RUN_STORED) XEN_LIB_DIR=$localstatedir/lib/xen AC_SUBST(XEN_LIB_DIR) +AC_DEFINE_UNQUOTED([XEN_LIB_DIR], ["$XEN_LIB_DIR"], [Xen's lib dir]) SHAREDIR=$prefix/share AC_SUBST(SHAREDIR) @@ -151,12 +158,14 @@ case "$host_os" in *) XEN_LOCK_DIR=$localstatedir/lock ;; esac AC_SUBST(XEN_LOCK_DIR) +AC_DEFINE_UNQUOTED([XEN_LOCK_DIR], ["$XEN_LOCK_DIR"], [Xen's lock dir]) XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging AC_SUBST(XEN_PAGING_DIR) XEN_DUMP_DIR=$xen_dumpdir_path AC_SUBST(XEN_DUMP_DIR) +AC_DEFINE_UNQUOTED([XEN_DUMP_DIR], ["$XEN_DUMP_DIR"], [Xen's dump directory]) DEBUG_DIR=$debugdir_path AC_SUBST(DEBUG_DIR) diff --git a/tools/config.h.in b/tools/config.h.in index 52e01b2c84..9563d3acb6 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -96,6 +96,9 @@ /* IPXE path */ #undef IPXE_PATH +/* Xen's libexec path */ +#undef LIBEXEC_BIN + /* OVMF path */ #undef OVMF_PATH @@ -129,6 +132,30 @@ /* QMP proxy path */ #undef STUBDOM_QMP_PROXY_PATH +/* Xen's firmware dir */ +#undef XENFIRMWAREDIR + +/* Xen's config dir */ +#undef XEN_CONFIG_DIR + +/* Xen's dump directory */ +#undef XEN_DUMP_DIR + +/* Xen's lib dir */ +#undef XEN_LIB_DIR + +/* Xen's lock dir */ +#undef XEN_LOCK_DIR + +/* Xen's log dir */ +#undef XEN_LOG_DIR + +/* Xen's runstate path */ +#undef XEN_RUN_DIR + +/* Xen's script dir */ +#undef XEN_SCRIPT_DIR + /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 diff --git a/tools/configure b/tools/configure index 8e4a59c2cb..829753b5dd 100755 --- a/tools/configure +++ b/tools/configure @@ -3926,6 +3926,11 @@ CONFIG_DIR=$sysconfdir XEN_CONFIG_DIR=$CONFIG_DIR/xen +cat >>confdefs.h <<_ACEOF +#define XEN_CONFIG_DIR "$XEN_CONFIG_DIR" +_ACEOF + + # Check whether --with-initddir was given. if test "${with_initddir+set}" = set; then : @@ -3978,6 +3983,11 @@ fi XEN_SCRIPT_DIR=$xen_scriptdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_SCRIPT_DIR "$XEN_SCRIPT_DIR" +_ACEOF + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : @@ -4018,6 +4028,11 @@ LIBEXEC=`eval echo $libexecdir/$libexec_subdir` LIBEXEC_BIN=${LIBEXEC}/bin + +cat >>confdefs.h <<_ACEOF +#define LIBEXEC_BIN "$LIBEXEC_BIN" +_ACEOF + LIBEXEC_LIB=${LIBEXEC}/lib LIBEXEC_INC=${LIBEXEC}/include @@ -4025,12 +4040,27 @@ LIBEXEC_INC=${LIBEXEC}/include XENFIRMWAREDIR=${LIBEXEC}/boot +cat >>confdefs.h <<_ACEOF +#define XENFIRMWAREDIR "$XENFIRMWAREDIR" +_ACEOF + + XEN_RUN_DIR=$rundir_path/xen +cat >>confdefs.h <<_ACEOF +#define XEN_RUN_DIR "$XEN_RUN_DIR" +_ACEOF + + XEN_LOG_DIR=$localstatedir/log/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LOG_DIR "$XEN_LOG_DIR" +_ACEOF + + XEN_LIB_STORED=$localstatedir/lib/xenstored @@ -4040,6 +4070,11 @@ XEN_RUN_STORED=$rundir_path/xenstored XEN_LIB_DIR=$localstatedir/lib/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LIB_DIR "$XEN_LIB_DIR" +_ACEOF + + SHAREDIR=$prefix/share @@ -4053,12 +4088,22 @@ case "$host_os" in esac +cat >>confdefs.h <<_ACEOF +#define XEN_LOCK_DIR "$XEN_LOCK_DIR" +_ACEOF + + XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging XEN_DUMP_DIR=$xen_dumpdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_DUMP_DIR "$XEN_DUMP_DIR" +_ACEOF + + DEBUG_DIR=$debugdir_path diff --git a/tools/console/Makefile b/tools/console/Makefile index 3f4cddab03..207c04c9cd 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -22,27 +22,19 @@ all: $(BIN) clean: $(RM) *.a *.so *.o *.rpm $(BIN) $(DEPS_RM) $(RM) client/*.o daemon/*.o - $(RM) client/_paths.h - $(RM) daemon/_paths.h .PHONY: distclean distclean: clean -daemon/main.o: daemon/_paths.h +daemon/main.o: CFLAGS += -include $(XEN_ROOT)/tools/config.h daemon/io.o: CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab) $(CFLAGS_libxenforeignmemory) $(CONSOLE_CFLAGS-y) xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxenforeignmemory) $(LDLIBS_xenconsoled) $(APPEND_LDFLAGS) -client/main.o: client/_paths.h +client/main.o: CFLAGS += -include $(XEN_ROOT)/tools/config.h xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_xenconsole) $(APPEND_LDFLAGS) -genpath-target = $(call buildmakevars2header,client/_paths.h) -$(eval $(genpath-target)) - -genpath-target = $(call buildmakevars2header,daemon/_paths.h) -$(eval $(genpath-target)) - .PHONY: install install: $(BIN) $(INSTALL_DIR) $(DESTDIR)/$(sbindir) diff --git a/tools/console/client/main.c b/tools/console/client/main.c index 80157be421..ada6728caa 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -41,7 +41,6 @@ #include <xenstore.h> #include "xenctrl.h" -#include "_paths.h" #define ESCAPE_CHARACTER 0x1d diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 30124a1c19..aac7233a48 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -31,7 +31,6 @@ #include "utils.h" #include "io.h" -#include "_paths.h" int log_reload = 0; int log_guest = 0; diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile index 1bcc97ea8a..7f6c422440 100644 --- a/tools/helpers/Makefile +++ b/tools/helpers/Makefile @@ -24,6 +24,7 @@ $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenguest) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenstore) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenlight) +$(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h .PHONY: all all: $(PROGS) @@ -31,8 +32,6 @@ all: $(PROGS) xen-init-dom0: $(XEN_INIT_DOM0_OBJS) $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(APPEND_LDFLAGS) -$(INIT_XENSTORE_DOMAIN_OBJS): _paths.h - init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS) $(CC) $(LDFLAGS) -o $@ $(INIT_XENSTORE_DOMAIN_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenlight) $(APPEND_LDFLAGS) @@ -47,9 +46,6 @@ uninstall: .PHONY: clean clean: - $(RM) -f *.o $(PROGS) $(DEPS_RM) _paths.h + $(RM) -f *.o $(PROGS) $(DEPS_RM) distclean: clean - -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c index 9457d0251b..b4f3c65a8a 100644 --- a/tools/helpers/init-xenstore-domain.c +++ b/tools/helpers/init-xenstore-domain.c @@ -16,7 +16,6 @@ #include <xen/io/xenbus.h> #include "init-dom-json.h" -#include "_paths.h" #define LAPIC_BASE_ADDRESS 0xfee00000UL #define MB(x) ((uint64_t)x << 20) diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index c6d882e239..8f5f3acd21 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -106,11 +106,6 @@ include $(XEN_ROOT)/tools/libs/libs.mk libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(filter -l%,$(zlib-options)) libxenguest.so.$(MAJOR).$(MINOR): APPEND_LDFLAGS += $(COMPRESSION_LIBS) -lz -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -$(LIB_OBJS) $(PIC_OBJS): _paths.h - -include $(DEPS_INCLUDE) .PHONY: cleanlocal diff --git a/tools/libs/guest/xg_dom_core.c b/tools/libs/guest/xg_dom_core.c index 2e4c1330ea..c17cf9f712 100644 --- a/tools/libs/guest/xg_dom_core.c +++ b/tools/libs/guest/xg_dom_core.c @@ -33,7 +33,6 @@ #define XG_NEED_UNALIGNED #include "xg_private.h" -#include "_paths.h" /* ------------------------------------------------------------------------ */ /* debugging */ diff --git a/tools/libs/guest/xg_suspend.c b/tools/libs/guest/xg_suspend.c index 128353029c..0ce6364963 100644 --- a/tools/libs/guest/xg_suspend.c +++ b/tools/libs/guest/xg_suspend.c @@ -19,7 +19,6 @@ #include <xenevtchn.h> #include "xc_private.h" -#include "_paths.h" #include "xenguest.h" #define SUSPEND_LOCK_FILE XEN_RUN_DIR "/suspend-evtchn-%d.lock" diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index b21e0bf083..2fdec06c69 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -135,7 +135,6 @@ clean: rm -f lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) lib$(LIB_FILE_NAME).so.$(MAJOR) rm -f headers.chk headers.lst rm -f $(PKG_CONFIG) - rm -f _paths.h .PHONY: distclean distclean: clean diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index bfd58226ce..fb5a9ca87e 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -153,7 +153,7 @@ LIBXL_TEST_OBJS += $(foreach t, $(LIBXL_TESTS_INSIDE),libxl_test_$t.opic) TEST_PROG_OBJS += $(foreach t, $(LIBXL_TESTS_PROGS),test_$t.o) test_common.o TEST_PROGS += $(foreach t, $(LIBXL_TESTS_PROGS),test_$t) -AUTOINCS = $(XEN_INCLUDE)/_libxl_list.h _paths.h _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h +AUTOINCS = $(XEN_INCLUDE)/_libxl_list.h _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h AUTOSRCS = _libxl_save_msgs_callout.c _libxl_save_msgs_helper.c CLIENTS = testidl libxl-save-helper @@ -191,9 +191,6 @@ build: $(CLIENTS) $(TEST_PROGS) $(AUTOSRCS) $(AUTOINCS) $(LIB_OBJS) $(PIC_OBJS) $(SAVE_HELPER_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): $(AUTOINCS) libxl.api-ok -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - libxl.api-ok: check-libxl-api-rules _libxl.api-for-check $(PERL) $^ touch $@ @@ -216,9 +213,8 @@ _libxl_save_msgs_helper.h _libxl_save_msgs_callout.h: \ $(XEN_INCLUDE)/libxl.h: $(XEN_INCLUDE)/_libxl_types.h $(XEN_INCLUDE)/_libxl_list.h $(XEN_INCLUDE)/libxl_json.h: $(XEN_INCLUDE)/_libxl_types_json.h -libxl_internal.h: _libxl_types_internal.h _libxl_types_private.h _libxl_types_internal_private.h _paths.h +libxl_internal.h: _libxl_types_internal.h _libxl_types_private.h _libxl_types_internal_private.h libxl_internal_json.h: _libxl_types_internal_json.h -xl.h: _paths.h $(LIB_OBJS) $(PIC_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): $(XEN_INCLUDE)/libxl.h $(LIB_OBJS) $(PIC_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index 03841243ab..2abaab439c 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -24,8 +24,6 @@ #include <xen/hvm/hvm_xs_strings.h> #include <xen/hvm/e820.h> -#include "_paths.h" - //#define DEBUG 1 libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid) diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h index 0b4671318c..37d5c27756 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -73,7 +73,6 @@ #endif #include "libxl.h" -#include "_paths.h" #include "_libxl_save_msgs_callout.h" #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) diff --git a/tools/libs/light/libxl_utils.c b/tools/libs/light/libxl_utils.c index 4699c4a0a3..b91c2cafa2 100644 --- a/tools/libs/light/libxl_utils.c +++ b/tools/libs/light/libxl_utils.c @@ -18,7 +18,6 @@ #include <ctype.h> #include "libxl_internal.h" -#include "_paths.h" #ifndef LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE const diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index 911a2de8ec..01417b5334 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -30,8 +30,6 @@ APPEND_LDFLAGS += $(LDLIBS-y) include $(XEN_ROOT)/tools/libs/libs.mk -$(LIB_OBJS) $(PIC_OBJS): _paths.h - PYLIB=bindings/swig/python/_xenstat.so PYMOD=bindings/swig/python/xenstat.py PYSRC=bindings/swig/python/_xenstat.c @@ -121,10 +119,7 @@ clean: cleanlocal .PHONY: cleanlocal cleanlocal: - rm -f $(BINDINGS) $(BINDINGSRC) $(DEPS_RM) _paths.h + rm -f $(BINDINGS) $(BINDINGSRC) $(DEPS_RM) rm -f libxenstat.map -include $(DEPS_INCLUDE) - -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) diff --git a/tools/libs/stat/xenstat_qmp.c b/tools/libs/stat/xenstat_qmp.c index 2205a04131..9909b9727e 100644 --- a/tools/libs/stat/xenstat_qmp.c +++ b/tools/libs/stat/xenstat_qmp.c @@ -23,7 +23,6 @@ #include <xenctrl.h> #include "xenstat_priv.h" -#include "_paths.h" #ifdef HAVE_YAJL_YAJL_VERSION_H # include <yajl/yajl_version.h> diff --git a/tools/xl/Makefile b/tools/xl/Makefile index 2e129f00e1..b7f439121a 100644 --- a/tools/xl/Makefile +++ b/tools/xl/Makefile @@ -29,11 +29,6 @@ $(XL_OBJS): CFLAGS += $(CFLAGS_libxentoollog) $(XL_OBJS): CFLAGS += $(CFLAGS_XL) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -$(XL_OBJS): _paths.h - .PHONY: all all: xl @@ -54,7 +49,7 @@ uninstall: .PHONY: clean clean: - $(RM) -f *.o xl _paths.h $(DEPS_RM) + $(RM) *.o xl $(DEPS_RM) distclean: clean diff --git a/tools/xl/xl.h b/tools/xl/xl.h index cf12c79a9b..c5c4bedbdd 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -17,7 +17,6 @@ #include <assert.h> -#include "_paths.h" #include <xentoollog.h> struct cmd_spec { -- generated by git-patchbot for /home/xen/git/xen.git#staging
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |