Commit 6dd08ebb authored by Kristian Høgsberg's avatar Kristian Høgsberg
Browse files

Move core protocol libraries into wayland/ subdirectory

parent 76b43326
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
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
......
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}
......@@ -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
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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment