mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-10-06 23:44:58 +00:00
Move core protocol libraries into wayland/ subdirectory
This commit is contained in:
parent
76b43326a5
commit
6dd08ebbe1
60
Makefile
60
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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 :
|
||||
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
|
||||
|
|
61
wayland/Makefile
Normal file
61
wayland/Makefile
Normal file
|
@ -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
|
Loading…
Reference in a new issue