Move clients to subdirectory

dev
Kristian Høgsberg 15 years ago
parent c9e208899b
commit b2a432ef18
  1. 2
      .gitignore
  2. 52
      Makefile
  3. 73
      Makefile.in
  4. 27
      clients/Makefile
  5. 0
      clients/flower.c
  6. 0
      clients/gears.c
  7. 0
      clients/image.c
  8. 0
      clients/screenshot.c
  9. 0
      clients/terminal.c
  10. 0
      clients/view.c
  11. 25
      config.mk.in
  12. 6
      configure.ac

2
.gitignore vendored

@ -14,4 +14,4 @@ autom4te.cache/
config.log config.log
config.status config.status
configure configure
Makefile config.mk

@ -0,0 +1,52 @@
include config.mk
subdirs = clients
libs = libwayland-server.so libwayland.so
compositors = wayland-system-compositor
all : $(libs) $(compositors) subdirs
libwayland-server.so : \
wayland.o \
event-loop.o \
connection.o \
wayland-util.o \
wayland-hash.o \
wayland-protocol.o
libwayland.so : \
wayland-client.o \
connection.o \
wayland-util.o \
wayland-hash.o \
wayland-protocol.o
$(libs) : CFLAGS += -fPIC $(FFI_CFLAGS)
$(libs) : LDLIBS += $(FFI_LIBS)
$(libs) :
gcc -shared $^ $(LDLIBS) -o $@
wayland-system-compositor : \
wayland-system-compositor.o \
evdev.o \
cairo-util.o \
wayland-util.o
wayland-system-compositor : CFLAGS += $(EGL_COMPOSITOR_CFLAGS)
wayland-system-compositor : LDLIBS += ./libwayland-server.so $(EGL_COMPOSITOR_LIBS) -rdynamic -lrt -lEGL
subdirs-all subdirs-clean :
for f in $(subdirs); do $(MAKE) -C $$f $(@:subdirs-%=%); done
install : $(libs) $(compositors)
install -d $(libdir) $(libdir)/pkgconfig ${udev_rules_dir}
install $(libs) $(libdir)
install wayland-server.pc wayland.pc $(libdir)/pkgconfig
install wayland-util.h wayland-client.h $(includedir)
install 70-wayland.rules ${udev_rules_dir}
clean : subdirs-clean
rm -f $(compositors) *.o *.so
config.mk : config.mk.in
./config.status

@ -1,73 +0,0 @@
CFLAGS = @GCC_CFLAGS@
prefix = @prefix@
exec_prefix = @exec_prefix@
udev_rules_dir = @sysconfdir@/udev/rules.d
libs = libwayland-server.so libwayland.so
egl_clients = gears
cairo_clients = flower screenshot terminal image view
compositors = wayland-system-compositor
clients = $(egl_clients) $(cairo_clients)
all : $(libs) $(compositors) $(clients)
libwayland-server.so : \
wayland.o \
event-loop.o \
connection.o \
wayland-util.o \
wayland-hash.o \
wayland-protocol.o
libwayland.so : \
wayland-client.o \
connection.o \
wayland-util.o \
wayland-hash.o \
wayland-protocol.o
$(libs) : CFLAGS += -fPIC @FFI_CFLAGS@
$(libs) : LDLIBS += @FFI_LIBS@
$(libs) :
gcc -shared $^ $(LDLIBS) -o $@
wayland-system-compositor : \
wayland-system-compositor.o \
evdev.o \
cairo-util.o \
wayland-util.o
wayland-system-compositor : CFLAGS += @EGL_COMPOSITOR_CFLAGS@
wayland-system-compositor : LDLIBS += ./libwayland-server.so @EGL_COMPOSITOR_LIBS@ -rdynamic -lrt -lEGL
flower : flower.o wayland-glib.o
gears : gears.o window.o wayland-glib.o cairo-util.o
screenshot : screenshot.o wayland-glib.o
terminal : terminal.o window.o wayland-glib.o cairo-util.o
image : image.o window.o wayland-glib.o cairo-util.o
view : view.o window.o wayland-glib.o cairo-util.o
terminal : LDLIBS += -lutil
image : CFLAGS += @GDK_PIXBUF_CFLAGS@
image : LDLIBS += @GDK_PIXBUF_LIBS@
view : CFLAGS += @POPPLER_CFLAGS@
view : LDLIBS += @POPPLER_LIBS@
$(egl_clients) : CFLAGS += @EGL_CLIENT_CFLAGS@
$(egl_clients) : LDLIBS += -L. -lwayland @EGL_CLIENT_LIBS@ -lrt -lEGL
$(cairo_clients) : CFLAGS += @CAIRO_CLIENT_CFLAGS@
$(cairo_clients) : LDLIBS += ./libwayland.so @CAIRO_CLIENT_LIBS@ -lrt
install : $(libs) $(compositors)
install -d @libdir@ @libdir@/pkgconfig ${udev_rules_dir}
install $(libs) @libdir@
install wayland-server.pc wayland.pc @libdir@/pkgconfig
install wayland-util.h wayland-client.h @includedir@
install 70-wayland.rules ${udev_rules_dir}
clean :
rm -f $(clients) $(compositors) *.o *.so
Makefile : Makefile.in
./config.status

@ -0,0 +1,27 @@
include ../config.mk
egl_clients = gears
cairo_clients = flower screenshot terminal image view
all : $(egl_clients) $(cairo_clients)
clean :
rm -f $(egl_clients) $(cairo_clients) *.o
flower : flower.o wayland-glib.o
gears : gears.o window.o wayland-glib.o cairo-util.o
screenshot : screenshot.o wayland-glib.o
terminal : terminal.o window.o wayland-glib.o cairo-util.o
image : image.o window.o wayland-glib.o cairo-util.o
view : view.o window.o wayland-glib.o cairo-util.o
terminal : LDLIBS += -lutil
image : CFLAGS += $(GDK_PIXBUF_CFLAGS)
image : LDLIBS += $(GDK_PIXBUF_LIBS)
view : CFLAGS += $(POPPLER_CFLAGS)
view : LDLIBS += $(POPPLER_LIBS)
$(egl_clients) : CFLAGS += $(EGL_CLIENT_CFLAGS)
$(egl_clients) : LDLIBS += -L.. -lwayland $(EGL_CLIENT_LIBS) -lrt
$(cairo_clients) : CFLAGS += $(CAIRO_CLIENT_CFLAGS)
$(cairo_clients) : LDLIBS += -L.. -lwayland $(CAIRO_CLIENT_LIBS) -lrt

@ -0,0 +1,25 @@
CFLAGS = @GCC_CFLAGS@
prefix = @prefix@
exec_prefix = @exec_prefix@
udev_rules_dir = @sysconfdir@/udev/rules.d
libdir = @libdir@
includedir = @includedir@
EGL_COMPOSITOR_CFLAGS = @EGL_COMPOSITOR_CFLAGS@
EGL_COMPOSITOR_LIBS = @EGL_COMPOSITOR_LIBS@
FFI_CFLAGS = @FFI_CFLAGS@
FFI_LIBS = @FFI_LIBS@
EGL_CLIENT_CFLAGS = @EGL_CLIENT_CFLAGS@
EGL_CLIENT_LIBS = @EGL_CLIENT_LIBS@
CAIRO_CLIENT_CFLAGS = @CAIRO_CLIENT_CFLAGS@
CAIRO_CLIENT_LIBS = @CAIRO_CLIENT_LIBS@
GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
POPPLER_CFLAGS = @POPPLER_CFLAGS@
POPPLER_LIBS = @POPPLER_LIBS@

@ -5,8 +5,8 @@ PKG_PROG_PKG_CONFIG()
PKG_CHECK_MODULES(FFI, [libffi]) PKG_CHECK_MODULES(FFI, [libffi])
PKG_CHECK_MODULES(EGL_COMPOSITOR, PKG_CHECK_MODULES(EGL_COMPOSITOR,
[gl libpng cairo gdk-pixbuf-2.0 libudev >= 136 libdrm >= 2.4.17]) [egl gl libpng cairo gdk-pixbuf-2.0 libudev >= 136 libdrm >= 2.4.17])
PKG_CHECK_MODULES(EGL_CLIENT, [gl cairo glib-2.0 libudev]) PKG_CHECK_MODULES(EGL_CLIENT, [egl gl cairo glib-2.0 libudev])
PKG_CHECK_MODULES(CAIRO_CLIENT, [cairo-drm glib-2.0]) PKG_CHECK_MODULES(CAIRO_CLIENT, [cairo-drm glib-2.0])
PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0]) PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0])
PKG_CHECK_MODULES(POPPLER, [poppler-glib gdk-2.0]) PKG_CHECK_MODULES(POPPLER, [poppler-glib gdk-2.0])
@ -16,5 +16,5 @@ if test $CC = gcc; then
fi fi
AC_SUBST(GCC_CFLAGS) AC_SUBST(GCC_CFLAGS)
AC_CONFIG_FILES([Makefile wayland-server.pc wayland.pc]) AC_CONFIG_FILES([config.mk wayland-server.pc wayland.pc])
AC_OUTPUT AC_OUTPUT

Loading…
Cancel
Save