configure: Make wayland sources depend on generated headers.
authorRyan C. Gordon <icculus@icculus.org>
Tue, 07 Aug 2018 17:28:07 -0400
changeset 12081277e57c09ff4
parent 12080 18ea018e00a0
child 12082 09999a0e8f9a
configure: Make wayland sources depend on generated headers.

Otherwise occasionally the sources will try to compile before the headers it
needs are generated.

Fixes Bugzilla #3977.
configure
configure.in
     1.1 --- a/configure	Tue Aug 07 16:56:46 2018 -0400
     1.2 +++ b/configure	Tue Aug 07 17:28:07 2018 -0400
     1.3 @@ -19227,7 +19227,8 @@
     1.4  
     1.5              fi
     1.6  
     1.7 -            SOURCES="$SOURCES $srcdir/src/video/wayland/*.c"
     1.8 +            WAYLAND_SOURCES="$srcdir/src/video/wayland/*.c"
     1.9 +            SOURCES="$SOURCES $WAYLAND_SOURCES"
    1.10              EXTRA_CFLAGS="$EXTRA_CFLAGS $WAYLAND_CFLAGS -I\$(gen)"
    1.11              # Check whether --enable-wayland-shared was given.
    1.12  if test "${enable_wayland_shared+set}" = set; then :
    1.13 @@ -24735,7 +24736,9 @@
    1.14          echo ;\
    1.15          echo "\\$(objects)/\$p-protocol.lo: \\$(gen)/\$p-protocol.c \\$(gen)/\$p-client-protocol.h" ;\
    1.16          echo "	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@" ;\
    1.17 -        done`
    1.18 +        done ;\
    1.19 +        echo ;\
    1.20 +        for s in $WAYLAND_SOURCES ; do echo -n "\$s:" ; for p in $WAYLAND_PROTOCOLS ; do echo -n " \\$(gen)/\$p-client-protocol.h" ; done ; echo ; done ; echo`
    1.21  fi
    1.22  
    1.23  OBJECTS=`echo $SOURCES`
     2.1 --- a/configure.in	Tue Aug 07 16:56:46 2018 -0400
     2.2 +++ b/configure.in	Tue Aug 07 17:28:07 2018 -0400
     2.3 @@ -1414,7 +1414,8 @@
     2.4                  AC_DEFINE(SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH, 1, [ ])
     2.5              fi
     2.6  
     2.7 -            SOURCES="$SOURCES $srcdir/src/video/wayland/*.c"
     2.8 +            WAYLAND_SOURCES="$srcdir/src/video/wayland/*.c"
     2.9 +            SOURCES="$SOURCES $WAYLAND_SOURCES"
    2.10              EXTRA_CFLAGS="$EXTRA_CFLAGS $WAYLAND_CFLAGS -I\$(gen)"
    2.11              AC_ARG_ENABLE(wayland-shared,
    2.12  AC_HELP_STRING([--enable-wayland-shared], [dynamically load Wayland support [[default=maybe]]]),
    2.13 @@ -3996,7 +3997,9 @@
    2.14          echo ;\
    2.15          echo "\\$(objects)/\$p-protocol.lo: \\$(gen)/\$p-protocol.c \\$(gen)/\$p-client-protocol.h" ;\
    2.16          echo "	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@" ;\
    2.17 -        done`
    2.18 +        done ;\
    2.19 +        echo ;\
    2.20 +        for s in $WAYLAND_SOURCES ; do echo -n "\$s:" ; for p in $WAYLAND_PROTOCOLS ; do echo -n " \\$(gen)/\$p-client-protocol.h" ; done ; echo ; done ; echo`
    2.21  fi
    2.22  
    2.23  OBJECTS=`echo $SOURCES`