Move core protocol libraries into wayland/ subdirectory

diff --git a/Makefile b/Makefile
index 199914d..d7d1671 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,69 +1,15 @@
 include config.mk
 
-subdirs = compositor clients spec data
-libs = libwayland-server.so libwayland-client.so
+subdirs = wayland compositor clients spec data
 
-all : $(libs) subdirs-all scanner
-
-headers =                                      \
-       wayland-util.h                          \
-       wayland-server-protocol.h               \
-       wayland-server.h                        \
-       wayland-client-protocol.h               \
-       wayland-client.h \
-
-libwayland-server.so :                         \
-       wayland-protocol.o                      \
-       wayland-server.o                        \
-       event-loop.o                            \
-       connection.o                            \
-       wayland-util.o                          \
-       wayland-hash.o
-
-libwayland-client.so :                         \
-       wayland-protocol.o                      \
-       wayland-client.o                        \
-       connection.o                            \
-       wayland-util.o                          \
-       wayland-hash.o
-
-wayland-server.o : wayland-server-protocol.h
-wayland-client.o : wayland-client-protocol.h
-
-wayland-protocol.c : protocol.xml scanner
-       ./scanner code < $< > $@
-
-wayland-server-protocol.h : protocol.xml scanner
-       ./scanner server-header < $< > $@
-
-wayland-client-protocol.h : protocol.xml scanner
-       ./scanner client-header < $< > $@
-
-$(libs) : CFLAGS += -fPIC $(FFI_CFLAGS)
-$(libs) : LDLIBS += $(FFI_LIBS)
-$(libs) :
-       gcc -shared $^ $(LDLIBS)  -o $@
-
-scanner :                                      \
-       scanner.o                               \
-       wayland-util.o
-
-scanner : LDLIBS += $(EXPAT_LIBS)
+all : subdirs-all
 
 subdirs-all subdirs-clean subdirs-install:
        for f in $(subdirs); do $(MAKE) -C $$f $(@:subdirs-%=%); done
 
-install : $(libs) compositor subdirs-install
-       install -d $(libdir) $(libdir)/pkgconfig ${udev_rules_dir}
-       install $(libs) $(libdir)
-       install wayland-server.pc wayland-client.pc $(libdir)/pkgconfig
-       install $(headers) $(includedir)
-       install 70-wayland.rules ${udev_rules_dir}
+install : subdirs-install
 
 clean : subdirs-clean
-       rm -f scanner *.o *.so .*.deps
-       rm -f wayland-protocol.c \
-               wayland-server-protocol.h wayland-client-protocol.h
 
 config.mk : config.mk.in
        ./config.status

diff --git a/clients/Makefile b/clients/Makefile
index 85c6d4b..222a7ae 100644 (file)
--- a/clients/Makefile
+++ b/clients/Makefile
@@ -1,7 +1,7 @@
 include ../config.mk
 
 CFLAGS += -I.. $(CLIENT_CFLAGS)
-LDLIBS += -L.. -lwayland-client $(CLIENT_LIBS) -lrt -lm
+LDLIBS += -L../wayland -lwayland-client $(CLIENT_LIBS) -lrt -lm
 
 egl_clients = gears
 cairo_clients = flower screenshot terminal image view dnd

diff --git a/70-wayland.rules b/compositor/70-wayland.rules
similarity index 100%
rename from 70-wayland.rules
rename to compositor/70-wayland.rules

diff --git a/compositor/Makefile b/compositor/Makefile
index 5e67825..a17d414 100644 (file)
--- a/compositor/Makefile
+++ b/compositor/Makefile
@@ -1,7 +1,7 @@
 include ../config.mk
 
 CFLAGS += $(COMPOSITOR_CFLAGS)
-LDLIBS += -L.. -lwayland-server $(COMPOSITOR_LIBS) -rdynamic -lrt -lEGL -lm
+LDLIBS += -L../wayland -lwayland-server $(COMPOSITOR_LIBS) -rdynamic -lrt -lm
 
 all : compositor
 
@@ -15,4 +15,5 @@ compositor :                                  \
 clean :
        rm -f compositor *.o .*.deps
 
-install :
\ No newline at end of file
+install :
+       install 70-wayland.rules ${udev_rules_dir}

diff --git a/configure.ac b/configure.ac
index 2b5b912..2e2743f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,5 +25,5 @@ AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-lexpat"],
             [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
 AC_SUBST(EXPAT_LIBS)
 
-AC_CONFIG_FILES([config.mk wayland-server.pc wayland-client.pc])
+AC_CONFIG_FILES([config.mk wayland/wayland-server.pc wayland/wayland-client.pc])
 AC_OUTPUT

diff --git a/wayland/Makefile b/wayland/Makefile
new file mode 100644 (file)
index 0000000..827c73e
--- /dev/null
+++ b/wayland/Makefile
@@ -0,0 +1,61 @@
+include ../config.mk
+
+libs = libwayland-server.so libwayland-client.so
+
+all : $(libs) scanner
+
+headers =                                      \
+       wayland-util.h                          \
+       wayland-server-protocol.h               \
+       wayland-server.h                        \
+       wayland-client-protocol.h               \
+       wayland-client.h \
+
+libwayland-server.so :                         \
+       wayland-protocol.o                      \
+       wayland-server.o                        \
+       event-loop.o                            \
+       connection.o                            \
+       wayland-util.o                          \
+       wayland-hash.o
+
+libwayland-client.so :                         \
+       wayland-protocol.o                      \
+       wayland-client.o                        \
+       connection.o                            \
+       wayland-util.o                          \
+       wayland-hash.o
+
+wayland-server.o : wayland-server-protocol.h
+wayland-client.o : wayland-client-protocol.h
+
+wayland-protocol.c : protocol.xml scanner
+       ./scanner code < $< > $@
+
+wayland-server-protocol.h : protocol.xml scanner
+       ./scanner server-header < $< > $@
+
+wayland-client-protocol.h : protocol.xml scanner
+       ./scanner client-header < $< > $@
+
+$(libs) : CFLAGS += -fPIC $(FFI_CFLAGS)
+$(libs) : LDLIBS += $(FFI_LIBS)
+$(libs) :
+       gcc -shared $^ $(LDLIBS)  -o $@
+
+scanner :                                      \
+       scanner.o                               \
+       wayland-util.o
+
+scanner : LDLIBS += $(EXPAT_LIBS)
+
+install : $(libs) compositor
+       install -d $(libdir) $(includedir) $(libdir)/pkgconfig
+       install wayland-server.pc wayland-client.pc $(libdir)/pkgconfig
+       install $(libs) $(libdir)
+       install $(headers) $(includedir)
+
+clean :
+       rm -f scanner *.o *.so .*.deps
+       rm -f wayland-protocol.c \
+               wayland-server-protocol.h wayland-client-protocol.h

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

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

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

diff --git a/protocol.xml b/wayland/protocol.xml
similarity index 100%
rename from protocol.xml
rename to wayland/protocol.xml

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

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

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

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

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

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

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

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

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

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