From cb6818b6230ca43ddaabfb8f16feaef9ae3ef68e Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Tue, 28 Jun 2011 17:13:30 -0400 Subject: Revert "build: collapse all Makefile.am files into a single non-recursive one." This reverts commit 39afe69ad7d2258d4043044d1283bd6e311e48da. 1. For such a small module, the build time improvement is most likely negligible. At least, I'd like to see some timings proving it's worthiness before seeing the patch go back in. 2. This kind of change would need a thorough review. The need to operate the build from a single toplevel Makefile is a significant change. The two most noticeable issues for me are that collapsing all the Makefiles could easily cause namespacing issues with the variables, and operating on files outside the current directory can introduce subtle bugs. I feel that the non-recursive style is generally less robust than the standard recursive make scheme. 3. It's unlike all the other X.org modules. This isn't a showstopper for me, but the recursive style is well understood here and you've beaten all the modules into a consistent format that makes build bugs unique to specific modules less likely. Acked-by: Dan Nicholson To give a concrete example for #3 above, the 175 man pages are much easier maintained using a very similar makefile in the man directory of all X.Org module. The cost of maintaining a single makefile is much higher. Every target in the makefile has to be reviewed and tested when changes are made. Not everyone has the all the skills to handle widely different targets such as man pages, DocBook/XML, librairies, C code, distribution hooks, and so on. Acked-by: Daniel Stone Signed-off-by: Gaetan Nadon --- conf/Makefile.am | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 conf/Makefile.am (limited to 'conf') diff --git a/conf/Makefile.am b/conf/Makefile.am new file mode 100644 index 0000000..38d2a01 --- /dev/null +++ b/conf/Makefile.am @@ -0,0 +1,27 @@ +# Copyright 2005 Adam Jackson. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# on the rights to use, copy, modify, merge, publish, distribute, sub +# license, and/or sell copies of the Software, and to permit persons to whom +# the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +if HAS_XORG_CONF_DIR +dist_config_DATA = 50-synaptics.conf +else +fdidir = $(datadir)/hal/fdi/policy/20thirdparty +dist_fdi_DATA = 11-x11-synaptics.fdi +endif -- cgit v1.2.3