NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup srcdir usage

Browse Source 
In a lot places we use path like this:

  $(srcdir)/../src/....

when in fact it can be:

  $(top_srcdir)/src/

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2015-04-27 11:08:59 +02:00
parent ab7cd11e0b
commit f58a3a51fc
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
daemon/Makefile.am
View File

@ -77,21 +77,21 @@ REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
LXC_PROTOCOL = $(top_srcdir)/src/remote/lxc_protocol.x LXC_PROTOCOL = $(top_srcdir)/src/remote/lxc_protocol.x
QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x
remote_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \ remote_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \
$(REMOTE_PROTOCOL) $(REMOTE_PROTOCOL)
$(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl \ $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
--mode=server remote REMOTE $(REMOTE_PROTOCOL) \ --mode=server remote REMOTE $(REMOTE_PROTOCOL) \
> $(srcdir)/remote_dispatch.h > $(srcdir)/remote_dispatch.h
lxc_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \ lxc_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \
$(LXC_PROTOCOL) $(LXC_PROTOCOL)
$(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl \ $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
--mode=server lxc LXC $(LXC_PROTOCOL) \ --mode=server lxc LXC $(LXC_PROTOCOL) \
> $(srcdir)/lxc_dispatch.h > $(srcdir)/lxc_dispatch.h
qemu_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \ qemu_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \
$(QEMU_PROTOCOL) $(QEMU_PROTOCOL)
$(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl \ $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
--mode=server qemu QEMU $(QEMU_PROTOCOL) \ --mode=server qemu QEMU $(QEMU_PROTOCOL) \
> $(srcdir)/qemu_dispatch.h > $(srcdir)/qemu_dispatch.h

50
docs/Makefile.am
View File

@ -199,10 +199,10 @@ todo:
hvsupport.html:: $(srcdir)/hvsupport.html.in hvsupport.html:: $(srcdir)/hvsupport.html.in
$(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \
$(srcdir)/../src/libvirt_public.syms \ $(top_srcdir)/src/libvirt_public.syms \
$(srcdir)/../src/libvirt_qemu.syms $(srcdir)/../src/libvirt_lxc.syms \ $(top_srcdir)/src/libvirt_qemu.syms $(top_srcdir)/src/libvirt_lxc.syms \
$(srcdir)/../src/driver.h $(top_srcdir)/src/driver.h
$(AM_V_GEN)$(PERL) $(srcdir)/hvsupport.pl $(srcdir)/../src > $@ \ $(AM_V_GEN)$(PERL) $(srcdir)/hvsupport.pl $(top_srcdir)/src > $@ \
|| { rm $@ && exit 1; } || { rm $@ && exit 1; }
.PHONY: todo .PHONY: todo
@ -290,27 +290,27 @@ EXTRA_DIST += $(APIBUILD_STAMP)
$(python_generated_files): $(APIBUILD_STAMP) $(python_generated_files): $(APIBUILD_STAMP)
$(APIBUILD_STAMP): $(srcdir)/apibuild.py \ $(APIBUILD_STAMP): $(srcdir)/apibuild.py \
$(srcdir)/../include/libvirt/libvirt.h.in \ $(top_srcdir)/include/libvirt/libvirt.h.in \
$(srcdir)/../include/libvirt/libvirt-domain-snapshot.h \ $(top_srcdir)/include/libvirt/libvirt-domain-snapshot.h \
$(srcdir)/../include/libvirt/libvirt-domain.h \ $(top_srcdir)/include/libvirt/libvirt-domain.h \
$(srcdir)/../include/libvirt/libvirt-event.h \ $(top_srcdir)/include/libvirt/libvirt-event.h \
$(srcdir)/../include/libvirt/libvirt-host.h \ $(top_srcdir)/include/libvirt/libvirt-host.h \
$(srcdir)/../include/libvirt/libvirt-interface.h \ $(top_srcdir)/include/libvirt/libvirt-interface.h \
$(srcdir)/../include/libvirt/libvirt-network.h \ $(top_srcdir)/include/libvirt/libvirt-network.h \
$(srcdir)/../include/libvirt/libvirt-nodedev.h \ $(top_srcdir)/include/libvirt/libvirt-nodedev.h \
$(srcdir)/../include/libvirt/libvirt-nwfilter.h \ $(top_srcdir)/include/libvirt/libvirt-nwfilter.h \
$(srcdir)/../include/libvirt/libvirt-secret.h \ $(top_srcdir)/include/libvirt/libvirt-secret.h \
$(srcdir)/../include/libvirt/libvirt-storage.h \ $(top_srcdir)/include/libvirt/libvirt-storage.h \
$(srcdir)/../include/libvirt/libvirt-stream.h \ $(top_srcdir)/include/libvirt/libvirt-stream.h \
$(srcdir)/../include/libvirt/libvirt-lxc.h \ $(top_srcdir)/include/libvirt/libvirt-lxc.h \
$(srcdir)/../include/libvirt/libvirt-qemu.h \ $(top_srcdir)/include/libvirt/libvirt-qemu.h \
$(srcdir)/../include/libvirt/virterror.h \ $(top_srcdir)/include/libvirt/virterror.h \
$(srcdir)/../src/libvirt.c \ $(top_srcdir)/src/libvirt.c \
$(srcdir)/../src/libvirt-lxc.c \ $(top_srcdir)/src/libvirt-lxc.c \
$(srcdir)/../src/libvirt-qemu.c \ $(top_srcdir)/src/libvirt-qemu.c \
$(srcdir)/../src/util/virerror.c \ $(top_srcdir)/src/util/virerror.c \
$(srcdir)/../src/util/virevent.c \ $(top_srcdir)/src/util/virevent.c \
$(srcdir)/../src/util/virtypedparam.c $(top_srcdir)/src/util/virtypedparam.c
$(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(APIBUILD) $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(APIBUILD)
touch $@ touch $@

2
src/Makefile.am
View File

@ -20,7 +20,7 @@
abs_builddir = $(shell pwd) abs_builddir = $(shell pwd)
abs_topbuilddir = $(shell cd .. && pwd) abs_topbuilddir = $(shell cd .. && pwd)
abs_srcdir = $(shell cd $(srcdir) && pwd) abs_srcdir = $(shell cd $(srcdir) && pwd)
abs_topsrcdir = $(shell cd $(srcdir)/.. && pwd) abs_topsrcdir = $(shell cd $(top_srcdir) && pwd)
# No libraries with the exception of LIBXML should be listed # No libraries with the exception of LIBXML should be listed
# here. List them against the individual XXX_la_CFLAGS targets # here. List them against the individual XXX_la_CFLAGS targets

2
tests/schematestutils.sh
View File

@ -5,7 +5,7 @@
check_schema () { check_schema () {
DIRS=$1 DIRS=$1
SCHEMA="$abs_srcdir/../docs/schemas/$2" SCHEMA="$abs_top_srcdir/docs/schemas/$2"
test_intro $this_test test_intro $this_test