Packages: directfb: install tslib if touchscreen input driver selected

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>

2 files changed, 30 insertions, 22 deletions

diff --git a/packages/graphics/directfb/directfb.kconfig b/packages/graphics/directfb/directfb.kconfig
index 06a6ce1..7e959af 100644
--- a/packages/graphics/directfb/directfb.kconfig
+++ b/packages/graphics/directfb/directfb.kconfig
@@ -2,18 +2,19 @@
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
 # Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved.
 #
-# This program is free software; you can distribute it and/or modify it
-# under the terms of the GNU General Public License
-# (Version 2 or later) published by the Free Software Foundation.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 ################################################################################
 #
 # \file         directfb.kconfig
@@ -150,6 +151,7 @@ comment "----------------------"
 		bool "SonyPI Jogdial"
 	config EMBTK_DIRECTFB_INPUT_TSLIB
 		bool "tslib"
+		select EMBTK_HAVE_TSLIB
 	config EMBTK_DIRECTFB_INPUT_UC1X00
 		bool "ucb1x00 Touchscreen"
 	config EMBTK_DIRECTFB_INPUT_WM97XX
diff --git a/packages/graphics/directfb/directfb.mk b/packages/graphics/directfb/directfb.mk
index f61b71d..939cb0c 100644
--- a/packages/graphics/directfb/directfb.mk
+++ b/packages/graphics/directfb/directfb.mk
@@ -2,18 +2,19 @@
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
 # Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved.
 #
-# This program is free software; you can distribute it and/or modify it
-# under the terms of the GNU General Public License
-# (Version 2 or later) published by the Free Software Foundation.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 ################################################################################
 #
 # \file         directfb.mk
@@ -89,11 +90,16 @@ CONFIG_DIRECTFB_INPUTS-$(CONFIG_EMBTK_DIRECTFB_INPUT_WM97XX) += , wm97xx
 CONFIG_DIRECTFB_INPUTS-$(CONFIG_EMBTK_DIRECTFB_INPUT_ZYTRONIC) += , zytronic
 CONFIG_DIRECTFB_INPUTS-y +="
 
+#directfb deps
+DIRECTFB_DEPS := libpng_install freetype_install libjpeg_install
+ifeq ($(CONFIG_EMBTK_DIRECTFB_INPUT_TSLIB),y)
+DIRECTFB_DEPS += tslib_install
+endif
+
 directfb_install:	$(DIRECTFB_BUILD_DIR)/.installed \
 			$(DIRECTFB_BUILD_DIR)/.special
 
-$(DIRECTFB_BUILD_DIR)/.installed: libpng_install freetype_install \
-	libjpeg_install download_directfb \
+$(DIRECTFB_BUILD_DIR)/.installed:  $(DIRECTFB_DEPS) download_directfb \
 	$(DIRECTFB_BUILD_DIR)/.decompressed $(DIRECTFB_BUILD_DIR)/.configured
 	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
 	DirectFB-$(DIRECTFB_VERSION) in your root filesystem...")