[PULL synaptics] Revert "build: collapse all Makefile.am files into a single non-recursive one

[Peter Hutterer]

On Mon, Jul 11, 2011 at 05:02:25PM -0400, Gaetan Nadon wrote:
> I inserted your patch just after the reverts. This allowed me to remove
> the -I sdkdir in tools.


Merged
   a0b7f75..ca3e0b3  master -> master


thanks!

Cheers,
  Peter
> 
> The following changes since commit
> a0b7f755e925194b8245d580182fede9ee197985:
> 
>   conf: fix snippet to ignore /dev/input/mouse* on Linux (2011-06-28
> 08:10:46 +1000)
> 
> are available in the git repository at:
>   git://people.freedesktop.org/~gnadon/xf86-input-synaptics master
> 
> Gaetan Nadon (8):
>       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."
>       tools: remove unrequired sdkdir include directive
>       Add distcheck support for header files when sdk is not writable
>       Add distcheck support for configuration files when dir is not
> writable
> 
> Peter Hutterer (1):
>       tools: don't include xserver-properties.h
> 
>  .gitignore          |    4 --
>  Makefile.am         |  104
> ++------------------------------------------------
>  conf/Makefile.am    |   27 +++++++++++++
>  configure.ac        |    9 +++-
>  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 +++++++++++++++
>  tools/synclient.c   |    1 -
>  12 files changed, 214 insertions(+), 106 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