[PATCH v2 synaptics 0/7] Revert "build: collapse all Makefile.am files into a single non-recursive one

[Peter Hutterer]

On Thu, Jun 30, 2011 at 01:01:54PM -0400, Gaetan Nadon wrote:
> Version 2 adds patches 6 and 7 to implement distcheck support for non-writable dirs.
> These may be pushed after 1.5.
> 
> As I reverted this patch and found new issues, I ended up reverting 5 patches.
> Solving conflicts is always risky, and some reversal were not bisectable.
> 
> I realized I could just revert the patches in the opposite direction
> and have no conflicts at all.
> 
> The order of the reversal does not reflect the order in which problems have been found.
> I would not recommend trying to modify some of the patches if a fix seems apparent.
> I'd rather reviewers accept/reject this series as a unit of work.
> Any desirable feature to be retained would be safer done/reviewed separatly.
> 
> Distcheck passes with each patch. None of them "in between" pacthes were related
> to autotool or makefile. This seems the safest approach as 1.5 waiting around the corner.

urgh, I'm not sure which version goes where now. I've had some of your
patches merged already. Can you push your branch (with my include removal
patch) somewhere and I'll just pull it in? That'd make it easier than
applying them one by one. 

Thanks

Cheers,
  Peter

> 
> Gaetan Nadon (7):
>   Revert "build: apply the distcheck tricks used in xf86-input-evdev"
>   Revert "build: create object files following the sources' structure."
>   Revert "build: install documentation as part of make install."
>   Revert "build: collapse all Makefile.am files into a single
>     non-recursive one."
>   Revert "build: sort building of tools, ensure that cross-pkg-config
>     works."
>   Add distcheck support for header files when sdk is not writable
>   Add distcheck support for configuration files when dir is not
>     writable
> 
>  .gitignore          |    4 --
>  Makefile.am         |  104 ++------------------------------------------------
>  conf/Makefile.am    |   27 +++++++++++++
>  configure.ac        |   15 ++++++-
>  include/Makefile.am |   21 ++++++++++
>  man/Makefile.am     |   47 +++++++++++++++++++++++
>  src/Makefile.am     |   52 +++++++++++++++++++++++++
>  test/.gitignore     |    6 +++
>  test/Makefile.am    |   15 +++++++
>  tools/.gitignore    |    3 +
>  tools/Makefile.am   |   31 +++++++++++++++
>  11 files changed, 220 insertions(+), 105 deletions(-)
>  create mode 100644 conf/Makefile.am
>  create mode 100644 include/Makefile.am
>  create mode 100644 man/Makefile.am
>  create mode 100644 src/Makefile.am
>  create mode 100644 test/.gitignore
>  create mode 100644 test/Makefile.am
>  create mode 100644 tools/.gitignore
>  create mode 100644 tools/Makefile.am
> 
> -- 
> 1.7.4.1
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>