summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gmail.com>2011-05-14 03:14:56 +0200
committerChristoph Brill <egore911@egore911.de>2011-05-15 21:46:06 +0200
commit39afe69ad7d2258d4043044d1283bd6e311e48da (patch)
tree0ebd3e7a95dbbc86ac8bbddd070d46759f230d2d /conf
parent4005df66072ceac175ea71427deb16176262f197 (diff)
build: collapse all Makefile.am files into a single non-recursive one.
With this change, the whole of the build is done non-recursively in the top-level Makefile.am. This reduces the amount of overhead due to recursing into directories only to build one file. Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com> Signed-off-by: Christoph Brill <egore911@egore911.de>
Diffstat (limited to 'conf')
-rw-r--r--conf/Makefile.am27
1 files changed, 0 insertions, 27 deletions
diff --git a/conf/Makefile.am b/conf/Makefile.am
deleted file mode 100644
index 38d2a01..0000000
--- a/conf/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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