diff options
| author | Michael Forney <mforney@mforney.org> | 2016-10-30 01:27:06 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-10-30 13:44:58 -0700 |
| commit | a4e38bc8e915b650ebbce639ed4714fd4038e7ac (patch) | |
| tree | 3aaf36643ae74bf805857e046f5b824322fdf924 | |
| parent | 726ba84ab4289e181d2500c995430b9f36d315d0 (diff) | |
wayland: Fix dependencies and generation of wayland-version.h
| -rw-r--r-- | desktop/wayland/gen.rc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/wayland/gen.rc b/desktop/wayland/gen.rc index bbd76953..6386f109 100644 --- a/desktop/wayland/gen.rc +++ b/desktop/wayland/gen.rc @@ -6,7 +6,7 @@ cflags\ -I '$outdir'/include\ -I '$srcdir'/src -build '$outdir'/wayland-version.h sed '$srcdir'/src/wayland-version.h.in ; exprs=(\ +build '$outdir'/include/wayland-version.h sed '$srcdir'/src/wayland-version.h.in ; exprs=(\ -e s,@WAYLAND_VERSION_MAJOR@,1,\ -e s,@WAYLAND_VERSION_MINOR@,11,\ -e s,@WAYLAND_VERSION_MICRO@,0,\ @@ -17,7 +17,7 @@ cc src/wayland-util.c cc src/wayland-os.c cc src/connection.c '||' phony/desktop/libffi/headers -exe wayland-scanner -d phony/desktop/expat/headers\ +exe wayland-scanner -d 'phony/desktop/expat/headers $outdir/include/wayland-version.h' \ src/^(scanner.c wayland-util.c.o)\ '$builddir'/desktop/expat/libexpat.a @@ -25,11 +25,11 @@ waylandproto protocol/wayland.xml\ include/wayland-^(client server)^-protocol.h\ src/wayland-protocol.c -hdrs=wayland-^(client-core client egl-core egl server-core server util version)^.h +hdrs=wayland-^(client-core client egl-core egl server-core server util)^.h for(hdr in $hdrs) build '$outdir'/include/$hdr copy '$srcdir'/src/$hdr build '$outdir'/include/wayland-cursor.h copy '$srcdir'/cursor/wayland-cursor.h -phony headers include/^($hdrs wayland-^(cursor.h (client server)^-protocol.h)) +phony headers include/^($hdrs wayland-^(cursor.h (client server)^-protocol.h version.h)) lib libwayland-server.a -d 'phony/$dir/headers' src/^(\ connection.c.o\ |