Rename source subdir from wayland to src

diff --git a/Makefile.am b/Makefile.am
index 6da4426..4461e48 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = wayland
+SUBDIRS = src
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 

diff --git a/configure.ac b/configure.ac
index 7dc8ccb..bac5a0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ AC_SUBST(EXPAT_LIBS)
 
 AC_CONFIG_FILES([Makefile
                 wayland-scanner.m4
-                wayland/Makefile
-                wayland/wayland-server.pc
-                wayland/wayland-client.pc])
+                src/Makefile
+                src/wayland-server.pc
+                src/wayland-client.pc])
 AC_OUTPUT

diff --git a/wayland/.gitignore b/src/.gitignore
similarity index 100%
rename from wayland/.gitignore
rename to src/.gitignore

diff --git a/wayland/Makefile.am b/src/Makefile.am
similarity index 92%
rename from wayland/Makefile.am
rename to src/Makefile.am
index 8a73cd3..156ca2e 100644 (file)
--- a/wayland/Makefile.am
+++ b/src/Makefile.am
@@ -37,12 +37,12 @@ AM_CFLAGS = $(GCC_CFLAGS)
 protocoldir = $(top_srcdir)/protocol
 
 if ENABLE_SCANNER
-wayland_scanner = $(top_builddir)/wayland/wayland-scanner
+wayland_scanner = $(top_builddir)/src/wayland-scanner
 else
 wayland_scanner = wayland-scanner
 endif
 
-include $(top_srcdir)/wayland/scanner.mk
+include $(top_srcdir)/src/scanner.mk
 
 if ENABLE_SCANNER
 bin_PROGRAMS = wayland-scanner

diff --git a/wayland/connection.c b/src/connection.c
similarity index 100%
rename from wayland/connection.c
rename to src/connection.c

diff --git a/wayland/connection.h b/src/connection.h
similarity index 100%
rename from wayland/connection.h
rename to src/connection.h

diff --git a/wayland/event-loop.c b/src/event-loop.c
similarity index 100%
rename from wayland/event-loop.c
rename to src/event-loop.c

diff --git a/wayland/scanner.c b/src/scanner.c
similarity index 100%
rename from wayland/scanner.c
rename to src/scanner.c

diff --git a/wayland/scanner.mk b/src/scanner.mk
similarity index 100%
rename from wayland/scanner.mk
rename to src/scanner.mk

diff --git a/wayland/wayland-client.c b/src/wayland-client.c
similarity index 100%
rename from wayland/wayland-client.c
rename to src/wayland-client.c

diff --git a/wayland/wayland-client.h b/src/wayland-client.h
similarity index 100%
rename from wayland/wayland-client.h
rename to src/wayland-client.h

diff --git a/wayland/wayland-client.pc.in b/src/wayland-client.pc.in
similarity index 100%
rename from wayland/wayland-client.pc.in
rename to src/wayland-client.pc.in

diff --git a/wayland/wayland-egl.h b/src/wayland-egl.h
similarity index 100%
rename from wayland/wayland-egl.h
rename to src/wayland-egl.h

diff --git a/wayland/wayland-hash.c b/src/wayland-hash.c
similarity index 100%
rename from wayland/wayland-hash.c
rename to src/wayland-hash.c

diff --git a/wayland/wayland-server.c b/src/wayland-server.c
similarity index 100%
rename from wayland/wayland-server.c
rename to src/wayland-server.c

diff --git a/wayland/wayland-server.h b/src/wayland-server.h
similarity index 100%
rename from wayland/wayland-server.h
rename to src/wayland-server.h

diff --git a/wayland/wayland-server.pc.in b/src/wayland-server.pc.in
similarity index 100%
rename from wayland/wayland-server.pc.in
rename to src/wayland-server.pc.in

diff --git a/wayland/wayland-shm.c b/src/wayland-shm.c
similarity index 100%
rename from wayland/wayland-shm.c
rename to src/wayland-shm.c

diff --git a/wayland/wayland-util.c b/src/wayland-util.c
similarity index 100%
rename from wayland/wayland-util.c
rename to src/wayland-util.c

diff --git a/wayland/wayland-util.h b/src/wayland-util.h
similarity index 100%
rename from wayland/wayland-util.h
rename to src/wayland-util.h