Re: [Spice-devel] [vdagent-linux v2 4/5] build-sys: remove prefix from filenames
Hi,
On Fri, Sep 16, 2016 at 10:38:56AM -0400, Frediano Ziglio wrote:
> >
> > ---
> > .gitignore | 6 +
> > Makefile.am| 28
> > +++---
> > src/vdagent/{vdagent-audio.c => audio.c} | 2 +-
> > src/vdagent/{vdagent-audio.h => audio.h} | 4 ++--
> > src/vdagent/{vdagent-file-xfers.c => file-xfers.c} | 4 ++--
> > src/vdagent/{vdagent-file-xfers.h => file-xfers.h} | 0
> > src/vdagent/vdagent.c | 6 ++---
> > src/vdagent/{vdagent-x11-priv.h => x11-priv.h} | 0
> > src/vdagent/{vdagent-x11-randr.c => x11-randr.c} | 4 ++--
> > src/vdagent/{vdagent-x11.c => x11.c} | 4 ++--
> > src/vdagent/{vdagent-x11.h => x11.h} | 4 ++--
> > src/vdagentd/{vdagentd-uinput.c => uinput.c} | 4 ++--
> > src/vdagentd/{vdagentd-uinput.h => uinput.h} | 0
> > src/vdagentd/vdagentd.c| 6 ++---
> > .../{vdagent-virtio-port.c => virtio-port.c} | 2 +-
> > .../{vdagent-virtio-port.h => virtio-port.h} | 4 ++--
> > src/vdagentd/{vdagentd-xorg-conf.c => xorg-conf.c} | 2 +-
> > src/vdagentd/{vdagentd-xorg-conf.h => xorg-conf.h} | 0
> > 18 files changed, 43 insertions(+), 37 deletions(-)
> > rename src/vdagent/{vdagent-audio.c => audio.c} (99%)
> > rename src/vdagent/{vdagent-audio.h => audio.h} (91%)
> > rename src/vdagent/{vdagent-file-xfers.c => file-xfers.c} (99%)
> > rename src/vdagent/{vdagent-file-xfers.h => file-xfers.h} (100%)
> > rename src/vdagent/{vdagent-x11-priv.h => x11-priv.h} (100%)
> > rename src/vdagent/{vdagent-x11-randr.c => x11-randr.c} (99%)
> > rename src/vdagent/{vdagent-x11.c => x11.c} (99%)
> > rename src/vdagent/{vdagent-x11.h => x11.h} (95%)
> > rename src/vdagentd/{vdagentd-uinput.c => uinput.c} (99%)
> > rename src/vdagentd/{vdagentd-uinput.h => uinput.h} (100%)
> > rename src/vdagentd/{vdagent-virtio-port.c => virtio-port.c} (99%)
> > rename src/vdagentd/{vdagent-virtio-port.h => virtio-port.h} (97%)
> > rename src/vdagentd/{vdagentd-xorg-conf.c => xorg-conf.c} (99%)
> > rename src/vdagentd/{vdagentd-xorg-conf.h => xorg-conf.h} (100%)
> >
> > diff --git a/.gitignore b/.gitignore
> > index 4c039ee..ae47a90 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -8,6 +8,12 @@ src/stamp-h1
> > src/*.o
> > src/.deps
> > src/.dirstamp
> > +src/vdagent/*.o
> > +src/vdagent/.deps
> > +src/vdagent/.dirstamp
> > +src/vdagentd/*.o
> > +src/vdagentd/.deps
> > +src/vdagentd/.dirstamp
> > config.log
> > config.status
> > aclocal.m4
> > diff --git a/Makefile.am b/Makefile.am
> > index 861d806..7755f09 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -29,14 +29,14 @@ src_spice_vdagent_LDADD = \
> >
> > src_spice_vdagent_SOURCES =\
> > $(common_sources) \
> > - src/vdagent/vdagent-audio.c \
> > - src/vdagent/vdagent-audio.h \
> > - src/vdagent/vdagent-file-xfers.c\
> > - src/vdagent/vdagent-file-xfers.h\
> > - src/vdagent/vdagent-x11-priv.h \
> > - src/vdagent/vdagent-x11-randr.c \
> > - src/vdagent/vdagent-x11.c \
> > - src/vdagent/vdagent-x11.h \
> > + src/vdagent/audio.c \
> > + src/vdagent/audio.h \
> > + src/vdagent/file-xfers.c\
> > + src/vdagent/file-xfers.h\
> > + src/vdagent/x11-priv.h \
> > + src/vdagent/x11-randr.c \
> > + src/vdagent/x11.c \
> > + src/vdagent/x11.h \
> > src/vdagent/vdagent.c \
> > $(NULL)
> >
> > @@ -63,12 +63,12 @@ src_spice_vdagentd_SOURCES =\
> > $(common_sources) \
> > src/vdagentd/vdagentd.c \
> > src/vdagentd/session-info.h \
> > - src/vdagentd/vdagentd-uinput.c \
> > - src/vdagentd/vdagentd-uinput.h \
> > - src/vdagentd/vdagentd-xorg-conf.c \
> > - src/vdagentd/vdagentd-xorg-conf.h \
> > - src/vdagentd/vdagent-virtio-port.c \
> > - src/vdagentd/vdagent-virtio-port.h \
> > + src/vdagentd/uinput.c \
> > + src/vdagentd/uinput.h \
> > + src/vdagentd/xorg-conf.c\
> > + src/vdagentd/xorg-conf.h\
> > + src/vdagentd/virtio-port.c \
> > + src/vdagentd/virtio-port.h \
> > $(NULL)
> >
> > if HAVE_CONSOLE_KIT
> > diff --git a/src/vdagent/vdagent-audio.c b/src/vdagent/audio.c
> > similarity index 99%
> > rename from src/vdagent/vdagent-audio.c
> > rename to src/vdagent/audio.c
> > index 6b11cd8..e823569 100644
> > --- a/src/vdagent/vdagent-audio.c
> > +++ b/src/vdagent/audio.c
> > @@ -26,7 +26,7 @@
> > #include
>
Re: [Spice-devel] [vdagent-linux v2 4/5] build-sys: remove prefix from filenames
>
> ---
> .gitignore | 6 +
> Makefile.am| 28
> +++---
> src/vdagent/{vdagent-audio.c => audio.c} | 2 +-
> src/vdagent/{vdagent-audio.h => audio.h} | 4 ++--
> src/vdagent/{vdagent-file-xfers.c => file-xfers.c} | 4 ++--
> src/vdagent/{vdagent-file-xfers.h => file-xfers.h} | 0
> src/vdagent/vdagent.c | 6 ++---
> src/vdagent/{vdagent-x11-priv.h => x11-priv.h} | 0
> src/vdagent/{vdagent-x11-randr.c => x11-randr.c} | 4 ++--
> src/vdagent/{vdagent-x11.c => x11.c} | 4 ++--
> src/vdagent/{vdagent-x11.h => x11.h} | 4 ++--
> src/vdagentd/{vdagentd-uinput.c => uinput.c} | 4 ++--
> src/vdagentd/{vdagentd-uinput.h => uinput.h} | 0
> src/vdagentd/vdagentd.c| 6 ++---
> .../{vdagent-virtio-port.c => virtio-port.c} | 2 +-
> .../{vdagent-virtio-port.h => virtio-port.h} | 4 ++--
> src/vdagentd/{vdagentd-xorg-conf.c => xorg-conf.c} | 2 +-
> src/vdagentd/{vdagentd-xorg-conf.h => xorg-conf.h} | 0
> 18 files changed, 43 insertions(+), 37 deletions(-)
> rename src/vdagent/{vdagent-audio.c => audio.c} (99%)
> rename src/vdagent/{vdagent-audio.h => audio.h} (91%)
> rename src/vdagent/{vdagent-file-xfers.c => file-xfers.c} (99%)
> rename src/vdagent/{vdagent-file-xfers.h => file-xfers.h} (100%)
> rename src/vdagent/{vdagent-x11-priv.h => x11-priv.h} (100%)
> rename src/vdagent/{vdagent-x11-randr.c => x11-randr.c} (99%)
> rename src/vdagent/{vdagent-x11.c => x11.c} (99%)
> rename src/vdagent/{vdagent-x11.h => x11.h} (95%)
> rename src/vdagentd/{vdagentd-uinput.c => uinput.c} (99%)
> rename src/vdagentd/{vdagentd-uinput.h => uinput.h} (100%)
> rename src/vdagentd/{vdagent-virtio-port.c => virtio-port.c} (99%)
> rename src/vdagentd/{vdagent-virtio-port.h => virtio-port.h} (97%)
> rename src/vdagentd/{vdagentd-xorg-conf.c => xorg-conf.c} (99%)
> rename src/vdagentd/{vdagentd-xorg-conf.h => xorg-conf.h} (100%)
>
> diff --git a/.gitignore b/.gitignore
> index 4c039ee..ae47a90 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -8,6 +8,12 @@ src/stamp-h1
> src/*.o
> src/.deps
> src/.dirstamp
> +src/vdagent/*.o
> +src/vdagent/.deps
> +src/vdagent/.dirstamp
> +src/vdagentd/*.o
> +src/vdagentd/.deps
> +src/vdagentd/.dirstamp
> config.log
> config.status
> aclocal.m4
> diff --git a/Makefile.am b/Makefile.am
> index 861d806..7755f09 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -29,14 +29,14 @@ src_spice_vdagent_LDADD = \
>
> src_spice_vdagent_SOURCES = \
> $(common_sources) \
> - src/vdagent/vdagent-audio.c \
> - src/vdagent/vdagent-audio.h \
> - src/vdagent/vdagent-file-xfers.c\
> - src/vdagent/vdagent-file-xfers.h\
> - src/vdagent/vdagent-x11-priv.h \
> - src/vdagent/vdagent-x11-randr.c \
> - src/vdagent/vdagent-x11.c \
> - src/vdagent/vdagent-x11.h \
> + src/vdagent/audio.c \
> + src/vdagent/audio.h \
> + src/vdagent/file-xfers.c\
> + src/vdagent/file-xfers.h\
> + src/vdagent/x11-priv.h \
> + src/vdagent/x11-randr.c \
> + src/vdagent/x11.c \
> + src/vdagent/x11.h \
> src/vdagent/vdagent.c \
> $(NULL)
>
> @@ -63,12 +63,12 @@ src_spice_vdagentd_SOURCES = \
> $(common_sources) \
> src/vdagentd/vdagentd.c \
> src/vdagentd/session-info.h \
> - src/vdagentd/vdagentd-uinput.c \
> - src/vdagentd/vdagentd-uinput.h \
> - src/vdagentd/vdagentd-xorg-conf.c \
> - src/vdagentd/vdagentd-xorg-conf.h \
> - src/vdagentd/vdagent-virtio-port.c \
> - src/vdagentd/vdagent-virtio-port.h \
> + src/vdagentd/uinput.c \
> + src/vdagentd/uinput.h \
> + src/vdagentd/xorg-conf.c\
> + src/vdagentd/xorg-conf.h\
> + src/vdagentd/virtio-port.c \
> + src/vdagentd/virtio-port.h \
> $(NULL)
>
> if HAVE_CONSOLE_KIT
> diff --git a/src/vdagent/vdagent-audio.c b/src/vdagent/audio.c
> similarity index 99%
> rename from src/vdagent/vdagent-audio.c
> rename to src/vdagent/audio.c
> index 6b11cd8..e823569 100644
> --- a/src/vdagent/vdagent-audio.c
> +++ b/src/vdagent/audio.c
> @@ -26,7 +26,7 @@
> #include
> #include
> #include
> -#include "vdagent-audio.h"
> +#include "audio.h"
>
> #define ALSA_MUTE 0
> #define ALSA_UNMUTE 1
> diff --git a/src/vdagent/vdagent-audio.h b/src/vdagent/audio.h
> similarity index 91%
> rename
