[PATCH v2 xserver 0/7] Minor build system corrections

Mihail Konev k.mvc at ya.ru
Wed Apr 5 14:42:33 UTC 2017


On Wed, Apr 05, 2017 at 04:49:39AM +0500, Mihail Konev wrote:
> v2 (Emil Velikov):
>   2/7: Figure out what exactly happens.
>   3/7: Add missing ifdef.
>   5/7: Move DESTDIR to configure.
>        Add missing Cc.
>   1-5/7: Reword.
> 
> The 7/7 has also been suggested to use "ln -s".
> Kept unchanged since:
> 
> - It is simpler than https://lists.x.org/archives/xorg-devel/2017-February/052761.html
>   No need to SUFFIXES, CLEANFILES, or -include in every makefile.
> 
> - Compiler errors are acceptable:
> 
>     CC       posix_tty.include.lo
>   In file included from posix_tty.include.c:1:0:
>   ../shared/posix_tty.c: In function `GetBaud':
>   ../shared/posix_tty.c:110:9: error: `rturn' undeclared (first use in this function)
>            rturn B460800;
>            ^
>   ../shared/posix_tty.c:110:9: note: each undeclared identifier is reported only once for each function it appears in
>   In file included from /usr/include/termios.h:39:0,
>                    from ../../../../hw/xfree86/os-support/xf86_OSlib.h:186,
>                    from ../shared/posix_tty.c:63,
>                    from posix_tty.include.c:1:
>   ../shared/posix_tty.c:110:15: error: expected `;' before numeric constant
>            rturn B460800;
>                  ^
>   Makefile:670: recipe for target 'posix_tty.include.lo' failed
>   make: *** [posix_tty.include.lo] Error 1
> 

The missing part:

- Rebuilding the .include.c file when the original changes is taken care
  of by Automake (Dependecy Tracking).

  Symlinks could be used (both variants attached), but then:
  * If symlinks have the ".include.c" extension, it inappropriately goes also into error/warning messages.
  * If symlinks have the ".c" extension, they are not obvious in makefiles.

> Mihail Konev (7):
>   configure.ac: only stub sdksyms.dep as needed
>   sdksyms: fix typo in export keyword index
>   hw/xfree86: add suid wrapper to uninstall target
>   configure.ac: add missing xquartz destdir
>   hw/xquartz: fix path to pseudoramiX headers
>   os-support/solaris: add asm to gitignore
>   configure.ac: use automake option subdir-objects
> 
>  .gitignore                                        |  1 +
>  configure.ac                                      | 10 ++++++----
>  hw/dmx/Makefile.am                                |  4 ++--
>  hw/dmx/config/Makefile.am                         |  4 ++--
>  hw/dmx/config/dmxlog.include.c                    |  1 +
>  hw/dmx/config/strlcpy.include.c                   |  1 +
>  hw/dmx/miinitext.include.c                        |  1 +
>  hw/dmx/panoramiX.include.c                        |  1 +
>  hw/kdrive/src/Makefile.am                         |  2 +-
>  hw/kdrive/src/miinitext.include.c                 |  1 +
>  hw/vfb/Makefile.am                                |  2 +-
>  hw/vfb/miinitext.include.c                        |  1 +
>  hw/xfree86/Makefile.am                            |  3 +++
>  hw/xfree86/dixmods/Makefile.am                    |  2 +-
>  hw/xfree86/dixmods/miinitext.include.c            |  1 +
>  hw/xfree86/glamor_egl/Makefile.am                 |  4 ++--
>  hw/xfree86/glamor_egl/glamor_egl.include.c        |  1 +
>  hw/xfree86/glamor_egl/glamor_eglmodule.include.c  |  1 +
>  hw/xfree86/int10/Makefile.am                      |  4 ++--
>  hw/xfree86/int10/linux.include.c                  |  1 +
>  hw/xfree86/int10/linux_vm86.include.c             |  1 +
>  hw/xfree86/os-support/Makefile.am                 | 14 +++++++++++++-
>  hw/xfree86/os-support/bsd/Makefile.am             | 20 ++++++++++----------
>  hw/xfree86/os-support/bsd/agp_noop.include.c      |  1 +
>  hw/xfree86/os-support/bsd/ioperm_noop.include.c   |  1 +
>  hw/xfree86/os-support/bsd/kmod_noop.include.c     |  1 +
>  hw/xfree86/os-support/bsd/lnx_agp.include.c       |  1 +
>  hw/xfree86/os-support/bsd/pm_noop.include.c       |  1 +
>  hw/xfree86/os-support/bsd/posix_tty.include.c     |  1 +
>  hw/xfree86/os-support/bsd/sigio.include.c         |  1 +
>  hw/xfree86/os-support/bsd/vidmem.include.c        |  1 +
>  hw/xfree86/os-support/hurd/Makefile.am            | 14 +++++++-------
>  hw/xfree86/os-support/hurd/VTsw_noop.include.c    |  1 +
>  hw/xfree86/os-support/hurd/agp_noop.include.c     |  1 +
>  hw/xfree86/os-support/hurd/kmod_noop.include.c    |  1 +
>  hw/xfree86/os-support/hurd/pm_noop.include.c      |  1 +
>  hw/xfree86/os-support/hurd/posix_tty.include.c    |  1 +
>  hw/xfree86/os-support/hurd/sigiostubs.include.c   |  1 +
>  hw/xfree86/os-support/hurd/vidmem.include.c       |  1 +
>  hw/xfree86/os-support/linux/Makefile.am           |  8 ++++----
>  hw/xfree86/os-support/linux/VTsw_usl.include.c    |  1 +
>  hw/xfree86/os-support/linux/posix_tty.include.c   |  1 +
>  hw/xfree86/os-support/linux/sigio.include.c       |  1 +
>  hw/xfree86/os-support/linux/vidmem.include.c      |  1 +
>  hw/xfree86/os-support/solaris/.gitignore          |  1 +
>  hw/xfree86/os-support/solaris/Makefile.am         | 12 ++++++------
>  hw/xfree86/os-support/solaris/VTsw_noop.include.c |  1 +
>  hw/xfree86/os-support/solaris/agp_noop.include.c  |  1 +
>  hw/xfree86/os-support/solaris/kmod_noop.include.c |  1 +
>  hw/xfree86/os-support/solaris/posix_tty.include.c |  1 +
>  hw/xfree86/os-support/solaris/sigio.include.c     |  1 +
>  hw/xfree86/os-support/solaris/vidmem.include.c    |  1 +
>  hw/xfree86/os-support/stub/Makefile.am            | 16 ++++++++--------
>  hw/xfree86/os-support/stub/VTsw_noop.include.c    |  1 +
>  hw/xfree86/os-support/stub/agp_noop.include.c     |  1 +
>  hw/xfree86/os-support/stub/ioperm_noop.include.c  |  1 +
>  hw/xfree86/os-support/stub/kmod_noop.include.c    |  1 +
>  hw/xfree86/os-support/stub/pm_noop.include.c      |  1 +
>  hw/xfree86/os-support/stub/posix_tty.include.c    |  1 +
>  hw/xfree86/os-support/stub/sigio.include.c        |  1 +
>  hw/xfree86/os-support/stub/vidmem.include.c       |  1 +
>  hw/xfree86/sdksyms.sh                             |  2 +-
>  hw/xfree86/utils/cvt/Makefile.am                  |  4 ++--
>  hw/xfree86/utils/cvt/xf86cvt.include.c            |  1 +
>  hw/xfree86/utils/cvt/xprintf.include.c            |  1 +
>  hw/xnest/Makefile.am                              |  2 +-
>  hw/xnest/miinitext.include.c                      |  1 +
>  hw/xquartz/Makefile.am                            |  4 ++--
>  hw/xquartz/bundle/Makefile.am                     |  8 ++++----
>  hw/xquartz/mach-startup/Makefile.am               |  4 ++--
>  hw/xquartz/mach-startup/strndup.include.c         |  1 +
>  hw/xquartz/miinitext.include.c                    |  1 +
>  hw/xquartz/xpr/Makefile.am                        |  2 +-
>  hw/xwayland/Makefile.am                           |  6 +++---
>  hw/xwayland/dpmsstubs.include.c                   |  1 +
>  hw/xwayland/miinitext.include.c                   |  1 +
>  hw/xwayland/stubs.include.c                       |  1 +
>  hw/xwin/Makefile.am                               |  2 +-
>  hw/xwin/miinitext.include.c                       |  1 +
>  test/miinitext.include.c                          |  1 +
>  80 files changed, 141 insertions(+), 68 deletions(-)
>  create mode 100644 hw/dmx/config/dmxlog.include.c
>  create mode 100644 hw/dmx/config/strlcpy.include.c
>  create mode 100644 hw/dmx/miinitext.include.c
>  create mode 100644 hw/dmx/panoramiX.include.c
>  create mode 100644 hw/kdrive/src/miinitext.include.c
>  create mode 100644 hw/vfb/miinitext.include.c
>  create mode 100644 hw/xfree86/dixmods/miinitext.include.c
>  create mode 100644 hw/xfree86/glamor_egl/glamor_egl.include.c
>  create mode 100644 hw/xfree86/glamor_egl/glamor_eglmodule.include.c
>  create mode 100644 hw/xfree86/int10/linux.include.c
>  create mode 100644 hw/xfree86/int10/linux_vm86.include.c
>  create mode 100644 hw/xfree86/os-support/bsd/agp_noop.include.c
>  create mode 100644 hw/xfree86/os-support/bsd/ioperm_noop.include.c
>  create mode 100644 hw/xfree86/os-support/bsd/kmod_noop.include.c
>  create mode 100644 hw/xfree86/os-support/bsd/lnx_agp.include.c
>  create mode 100644 hw/xfree86/os-support/bsd/pm_noop.include.c
>  create mode 100644 hw/xfree86/os-support/bsd/posix_tty.include.c
>  create mode 100644 hw/xfree86/os-support/bsd/sigio.include.c
>  create mode 100644 hw/xfree86/os-support/bsd/vidmem.include.c
>  create mode 100644 hw/xfree86/os-support/hurd/VTsw_noop.include.c
>  create mode 100644 hw/xfree86/os-support/hurd/agp_noop.include.c
>  create mode 100644 hw/xfree86/os-support/hurd/kmod_noop.include.c
>  create mode 100644 hw/xfree86/os-support/hurd/pm_noop.include.c
>  create mode 100644 hw/xfree86/os-support/hurd/posix_tty.include.c
>  create mode 100644 hw/xfree86/os-support/hurd/sigiostubs.include.c
>  create mode 100644 hw/xfree86/os-support/hurd/vidmem.include.c
>  create mode 100644 hw/xfree86/os-support/linux/VTsw_usl.include.c
>  create mode 100644 hw/xfree86/os-support/linux/posix_tty.include.c
>  create mode 100644 hw/xfree86/os-support/linux/sigio.include.c
>  create mode 100644 hw/xfree86/os-support/linux/vidmem.include.c
>  create mode 100644 hw/xfree86/os-support/solaris/.gitignore
>  create mode 100644 hw/xfree86/os-support/solaris/VTsw_noop.include.c
>  create mode 100644 hw/xfree86/os-support/solaris/agp_noop.include.c
>  create mode 100644 hw/xfree86/os-support/solaris/kmod_noop.include.c
>  create mode 100644 hw/xfree86/os-support/solaris/posix_tty.include.c
>  create mode 100644 hw/xfree86/os-support/solaris/sigio.include.c
>  create mode 100644 hw/xfree86/os-support/solaris/vidmem.include.c
>  create mode 100644 hw/xfree86/os-support/stub/VTsw_noop.include.c
>  create mode 100644 hw/xfree86/os-support/stub/agp_noop.include.c
>  create mode 100644 hw/xfree86/os-support/stub/ioperm_noop.include.c
>  create mode 100644 hw/xfree86/os-support/stub/kmod_noop.include.c
>  create mode 100644 hw/xfree86/os-support/stub/pm_noop.include.c
>  create mode 100644 hw/xfree86/os-support/stub/posix_tty.include.c
>  create mode 100644 hw/xfree86/os-support/stub/sigio.include.c
>  create mode 100644 hw/xfree86/os-support/stub/vidmem.include.c
>  create mode 100644 hw/xfree86/utils/cvt/xf86cvt.include.c
>  create mode 100644 hw/xfree86/utils/cvt/xprintf.include.c
>  create mode 100644 hw/xnest/miinitext.include.c
>  create mode 100644 hw/xquartz/mach-startup/strndup.include.c
>  create mode 100644 hw/xquartz/miinitext.include.c
>  create mode 100644 hw/xwayland/dpmsstubs.include.c
>  create mode 100644 hw/xwayland/miinitext.include.c
>  create mode 100644 hw/xwayland/stubs.include.c
>  create mode 100644 hw/xwin/miinitext.include.c
>  create mode 100644 test/miinitext.include.c
> 
> -- 
> 2.9.2
> 
Mihail
-------------- next part --------------
A non-text attachment was scrubbed...
Name: c.patch
Type: text/x-diff
Size: 33515 bytes
Desc: not available
URL: <https://lists.x.org/archives/xorg-devel/attachments/20170405/dc70d34b/attachment-0002.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ln.patch
Type: text/x-diff
Size: 34600 bytes
Desc: not available
URL: <https://lists.x.org/archives/xorg-devel/attachments/20170405/dc70d34b/attachment-0003.patch>


More information about the xorg-devel mailing list