configure
changeset 12033 bc702c5a7c3a
parent 11956 f162f5d7798d
child 12035 1a7dec71e8e0
     1.1 --- a/configure	Sun Jun 24 15:21:01 2018 -0400
     1.2 +++ b/configure	Sun Jun 24 22:42:36 2018 -0700
     1.3 @@ -19228,6 +19228,7 @@
     1.4              fi
     1.5  
     1.6              WAYLAND_PROTOCOLS_UNSTABLE="relative-pointer-unstable-v1 pointer-constraints-unstable-v1 xdg-shell-unstable-v6"
     1.7 +            WAYLAND_PROTOCOLS_STABLE="xdg-shell"
     1.8  
     1.9              SOURCES="$SOURCES $srcdir/src/video/wayland/*.c"
    1.10              EXTRA_CFLAGS="$EXTRA_CFLAGS $WAYLAND_CFLAGS -I\$(gen)"
    1.11 @@ -24712,21 +24713,21 @@
    1.12  if test x$video_wayland = xyes; then
    1.13      WAYLAND_CORE_PROTOCOL_SOURCE='$(gen)/wayland-protocol.c'
    1.14      WAYLAND_CORE_PROTOCOL_HEADER='$(gen)/wayland-client-protocol.h'
    1.15 -    WAYLAND_PROTOCOLS_UNSTABLE_SOURCES=`echo $WAYLAND_PROTOCOLS_UNSTABLE |\
    1.16 +    WAYLAND_PROTOCOLS_SOURCES=`echo $WAYLAND_PROTOCOLS_UNSTABLE $WAYLAND_PROTOCOLS_STABLE |\
    1.17          sed 's,[^ ]\+,\\$(gen)/&-protocol.c,g'`
    1.18 -    WAYLAND_PROTOCOLS_UNSTABLE_HEADERS=`echo $WAYLAND_PROTOCOLS_UNSTABLE |\
    1.19 +    WAYLAND_PROTOCOLS_HEADERS=`echo $WAYLAND_PROTOCOLS_UNSTABLE $WAYLAND_PROTOCOLS_STABLE |\
    1.20          sed 's,[^ ]\+,\\$(gen)/&-client-protocol.h,g'`
    1.21 -    GEN_SOURCES="$GEN_SOURCES $WAYLAND_CORE_PROTOCOL_SOURCE $WAYLAND_PROTOCOLS_UNSTABLE_SOURCES"
    1.22 -    GEN_HEADERS="$GEN_HEADERS $WAYLAND_CORE_PROTOCOL_HEADER $WAYLAND_PROTOCOLS_UNSTABLE_HEADERS"
    1.23 +    GEN_SOURCES="$GEN_SOURCES $WAYLAND_CORE_PROTOCOL_SOURCE $WAYLAND_PROTOCOLS_SOURCES"
    1.24 +    GEN_HEADERS="$GEN_HEADERS $WAYLAND_CORE_PROTOCOL_HEADER $WAYLAND_PROTOCOLS_HEADERS"
    1.25  
    1.26      WAYLAND_CORE_PROTOCOL_SOURCE_DEPENDS="
    1.27  $WAYLAND_CORE_PROTOCOL_SOURCE: $WAYLAND_CORE_PROTOCOL_DIR/wayland.xml
    1.28 -	\$(SHELL) \$(auxdir)/mkinstalldirs \$(gen)
    1.29 +	@\$(SHELL) \$(auxdir)/mkinstalldirs \$(gen)
    1.30  	\$(RUN_CMD_GEN)\$(WAYLAND_SCANNER) code \$< \$@"
    1.31  
    1.32      WAYLAND_CORE_PROTOCOL_HEADER_DEPENDS="
    1.33  $WAYLAND_CORE_PROTOCOL_HEADER: $WAYLAND_CORE_PROTOCOL_DIR/wayland.xml
    1.34 -	\$(SHELL) \$(auxdir)/mkinstalldirs \$(gen)
    1.35 +	@\$(SHELL) \$(auxdir)/mkinstalldirs \$(gen)
    1.36  	\$(RUN_CMD_GEN)\$(WAYLAND_SCANNER) client-header \$< \$@"
    1.37  
    1.38      WAYLAND_CORE_PROTOCOL_OBJECT="
    1.39 @@ -24736,13 +24737,25 @@
    1.40      WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
    1.41          do echo ; echo \$p | sed\
    1.42          "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\$(gen)/&-client-protocol.h: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\
    1.43 -	\\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\
    1.44 +	@\\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\
    1.45 +	\\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) client-header \\$< \\$@," ; done`
    1.46 +
    1.47 +    WAYLAND_PROTOCOLS_CLIENT_HEADER_STABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_STABLE;\
    1.48 +        do echo ; echo \$p | sed\
    1.49 +        "s,^\\([a-z\\-]\\+\\)\$,\\$(gen)/&-client-protocol.h: $WAYLAND_PROTOCOLS_DIR/stable/\1/&.xml\\\\
    1.50 +	@\\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\
    1.51  	\\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) client-header \\$< \\$@," ; done`
    1.52  
    1.53      WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
    1.54          do echo ; echo \$p | sed\
    1.55          "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\$(gen)/&-protocol.c: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\
    1.56 -	\\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\
    1.57 +	@\\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\
    1.58 +	\\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) code \\$< \\$@," ; done`
    1.59 +
    1.60 +    WAYLAND_PROTOCOLS_CODE_STABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_STABLE;\
    1.61 +        do echo ; echo \$p | sed\
    1.62 +        "s,^\\([a-z\\-]\\+\\)\$,\\$(gen)/&-protocol.c: $WAYLAND_PROTOCOLS_DIR/stable/\1/&.xml\\\\
    1.63 +	@\\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\
    1.64  	\\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) code \\$< \\$@," ; done`
    1.65  
    1.66      WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
    1.67 @@ -24750,13 +24763,21 @@
    1.68          "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\\$(objects)/&-protocol.lo: \\$(gen)/&-protocol.c \\$(gen)/&-client-protocol.h\\\\
    1.69  	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@," ; done`
    1.70  
    1.71 +    WAYLAND_PROTOCOLS_OBJECTS_STABLE=`for p in $WAYLAND_PROTOCOLS_STABLE;\
    1.72 +        do echo ; echo \$p | sed\
    1.73 +        "s,^\\([a-z\\-]\\+\\)\$,\\\$(objects)/&-protocol.lo: \\$(gen)/&-protocol.c \\$(gen)/&-client-protocol.h\\\\
    1.74 +	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@," ; done`
    1.75 +
    1.76      WAYLAND_PROTOCOLS_DEPENDS="
    1.77  $WAYLAND_CORE_PROTOCOL_SOURCE_DEPENDS
    1.78  $WAYLAND_CORE_PROTOCOL_HEADER_DEPENDS
    1.79  $WAYLAND_CORE_PROTOCOL_OBJECT
    1.80  $WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS
    1.81 +$WAYLAND_PROTOCOLS_CLIENT_HEADER_STABLE_DEPENDS
    1.82  $WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS
    1.83 +$WAYLAND_PROTOCOLS_CODE_STABLE_DEPENDS
    1.84  $WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE
    1.85 +$WAYLAND_PROTOCOLS_OBJECTS_STABLE
    1.86  "
    1.87  fi
    1.88