gitignore: adpat to scanner and protocol path changes

Submitted by Olivier Blin on Oct. 22, 2014, 4:44 p.m.

Details

Message ID 1413996299-715-1-git-send-email-olivier.blin@softathome.com
State Accepted
Commit 059220549cd080bae970a802856b2c44b2eeb3cc
Headers show

Not browsing as part of any series.

Commit Message

Olivier Blin Oct. 22, 2014, 4:44 p.m.
Since commit 4c163b9b001bd93aaf97d7e962873a379eb90bfd, wayland-scanner
is built in top builddir instead of src, and protocol files are
generated in protocol subdir instead of src.
Protocol files generated in the new path are already properly ignored
in the toplevel gitignore file.

Signed-off-by: Olivier Blin <olivier.blin@softathome.com>
---
 .gitignore     | 2 +-
 src/.gitignore | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

Patch hide | download patch | download mbox

diff --git a/.gitignore b/.gitignore
index d9d26ed..4e0f5d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,5 +54,5 @@  resources-test
 sanity-test
 signal-test
 socket-test
-wayland-scanner
+/wayland-scanner
 protocol/*.[ch]
diff --git a/src/.gitignore b/src/.gitignore
index 1438b74..4421b46 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,5 +1 @@ 
-wayland-scanner
-wayland-client-protocol.h
-wayland-protocol.c
-wayland-server-protocol.h
 /wayland-version.h

Comments

On Wed, 22 Oct 2014 18:44:59 +0200
Olivier Blin <olivier.blin@softathome.com> wrote:

> Since commit 4c163b9b001bd93aaf97d7e962873a379eb90bfd, wayland-scanner
> is built in top builddir instead of src, and protocol files are
> generated in protocol subdir instead of src.
> Protocol files generated in the new path are already properly ignored
> in the toplevel gitignore file.
> 
> Signed-off-by: Olivier Blin <olivier.blin@softathome.com>
> ---
>  .gitignore     | 2 +-
>  src/.gitignore | 4 ----
>  2 files changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/.gitignore b/.gitignore
> index d9d26ed..4e0f5d9 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -54,5 +54,5 @@ resources-test
>  sanity-test
>  signal-test
>  socket-test
> -wayland-scanner
> +/wayland-scanner
>  protocol/*.[ch]
> diff --git a/src/.gitignore b/src/.gitignore
> index 1438b74..4421b46 100644
> --- a/src/.gitignore
> +++ b/src/.gitignore
> @@ -1,5 +1 @@
> -wayland-scanner
> -wayland-client-protocol.h
> -wayland-protocol.c
> -wayland-server-protocol.h
>  /wayland-version.h

Yup, pushed.

Thanks,
pq