xen-project/xen
1
0 Fork 1
mirror of https://github.com/xen-project/xen.git synced 2026-10-29 18:50:05 +01:00
Code Issues Activity

tools: Use config.h from autoconf instead of "buildmakevars2header"

Browse Source 
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@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
This commit is contained in:
Anthony PERARD authored and Andrew Cooper committed 2021-12-16 20:27:12 +00:00
1 parent e7fe314870
commit 021cd1c4b4
24 files changed
+179 -66
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tools/config.h.in
+27
View File
@@ -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
tools/configure
Vendored
+45
View File
@@ -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
tools/console/Makefile
+2 -10
View File
@@ -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)
tools/console/client/main.c
-1
View File
@@ -41,7 +41,6 @@
#include <xenstore.h>
#include "xenctrl.h"
#include "_paths.h"
#define ESCAPE_CHARACTER 0x1d
tools/console/daemon/main.c
-1
View File
@@ -31,7 +31,6 @@
#include "utils.h"
#include "io.h"
#include "_paths.h"
int log_reload = 0;
int log_guest = 0;
tools/helpers/Makefile
+2 -6
View File
@@ -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))
tools/helpers/init-xenstore-domain.c
-1
View File
@@ -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)
tools/libs/guest/Makefile
-5
View File
@@ -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
tools/libs/guest/xg_dom_core.c
-1
View File
@@ -33,7 +33,6 @@
#define XG_NEED_UNALIGNED
#include "xg_private.h"
#include "_paths.h"
/* ------------------------------------------------------------------------ */
/* debugging */
tools/libs/guest/xg_suspend.c
-1
View File
@@ -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"
tools/libs/libs.mk
-1
View File
@@ -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
tools/libs/light/Makefile
+2 -6
View File
@@ -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
tools/libs/light/libxl_dom.c
-2
View File
@@ -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)
tools/libs/light/libxl_internal.h
-1
View File
@@ -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)
tools/libs/light/libxl_utils.c
-1
View File
@@ -18,7 +18,6 @@
#include <ctype.h>
#include "libxl_internal.h"
#include "_paths.h"
#ifndef LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE
const
tools/libs/stat/Makefile
+1 -6
View File
@@ -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))
tools/libs/stat/xenstat_qmp.c
-1
View File
@@ -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>
tools/xl/Makefile
+1 -6
View File
@@ -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
tools/xl/xl.h
-1
View File
@@ -17,7 +17,6 @@
#include <assert.h>
#include "_paths.h"
#include <xentoollog.h>
struct cmd_spec {
Reference in new issue
xen-project/xen
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.

The note is not visible to the blocked user.