this patch cleans up lcd4linux deps. (#3521)

Signed-off-by: Michael Vogt <michu at neophob.com>
SVN-Revision: 11438

diff --git a/utils/lcd4linux/Config.in b/utils/lcd4linux/Config.in
index 501d278a736aad105192ef967ccabe69827204c9..c846af1835eb31893ea98a97eab6e623b4b9b7f3 100644 (file)
--- a/utils/lcd4linux/Config.in
+++ b/utils/lcd4linux/Config.in
@@ -70,11 +70,11 @@ config LCD4LINUX_DRV_NULL
 
 config LCD4LINUX_DRV_PNG
        bool
 
 config LCD4LINUX_DRV_PNG
        bool

-       prompt "PNG (you need to select libgd)"
+       prompt "PNG"

 
 config LCD4LINUX_DRV_PPM
        bool
 
 config LCD4LINUX_DRV_PPM
        bool

-       prompt "PPM (you need to select libgd)"
+       prompt "PPM"

 
 config LCD4LINUX_DRV_Pertelian
        bool
 
 config LCD4LINUX_DRV_Pertelian
        bool


@@ -98,7 +98,7 @@ config LCD4LINUX_DRV_SimpleLCD
 
 config LCD4LINUX_DRV_st2205
        bool
 
 config LCD4LINUX_DRV_st2205
        bool

-       prompt "st2205 (you need to select st2205tool)"
+       prompt "st2205"

 
 config LCD4LINUX_DRV_T6963
        bool
 
 config LCD4LINUX_DRV_T6963
        bool


@@ -164,7 +164,7 @@ config LCD4LINUX_PLUGIN_file
 
 config LCD4LINUX_PLUGIN_gps
        bool
 
 config LCD4LINUX_PLUGIN_gps
        bool

-       prompt "gps (you need to select libnmeap)"
+       prompt "gps"

 
 config LCD4LINUX_PLUGIN_i2c_sensors
        bool
 
 config LCD4LINUX_PLUGIN_i2c_sensors
        bool

diff --git a/utils/lcd4linux/Makefile b/utils/lcd4linux/Makefile
index cf2b3fdcdf42fb0662633627d0565afac8b0a425..c65fe07c2a251a01c08de0b60c7b61ceb94e9316 100644 (file)
--- a/utils/lcd4linux/Makefile
+++ b/utils/lcd4linux/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=lcd4linux
 PKG_REV:=877
 PKG_VERSION:=r$(PKG_REV)
 PKG_NAME:=lcd4linux
 PKG_REV:=877
 PKG_VERSION:=r$(PKG_REV)

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/


@@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/lcd4linux
   SECTION:=utils
   CATEGORY:=Utilities
 define Package/lcd4linux
   SECTION:=utils
   CATEGORY:=Utilities

-  DEPENDS:=+libncurses +libusb +libiconv +libgd
+  DEPENDS:=+libusb

   TITLE:=LCD display utility
   URL:=http://lcd4linux.bulix.org/
 endef
   TITLE:=LCD display utility
   URL:=http://lcd4linux.bulix.org/
 endef


@@ -130,14 +130,58 @@ ifneq ($(CONFIG_LCD4LINUX_DRV_PPM),)
 PKG_BUILD_DEPENDS += libgd
 endif
 
 PKG_BUILD_DEPENDS += libgd
 endif
 

+ifneq ($(CONFIG_LCD4LINUX_DRV_G15),)
+PKG_BUILD_DEPENDS += libgd
+endif
+
+ifneq ($(CONFIG_LCD4LINUX_DRV_LPH7508),)
+PKG_BUILD_DEPENDS += libgd
+endif
+
+ifneq ($(CONFIG_LCD4LINUX_DRV_LUIse),)
+PKG_BUILD_DEPENDS += libgd
+endif
+
+ifneq ($(CONFIG_LCD4LINUX_DRV_Noritake),)
+PKG_BUILD_DEPENDS += libgd
+endif
+
+ifneq ($(CONFIG_LCD4LINUX_DRV_serdisplib),)
+PKG_BUILD_DEPENDS += libgd, serdisplib
+endif
+

 ifneq ($(CONFIG_LCD4LINUX_DRV_st2205),)
 ifneq ($(CONFIG_LCD4LINUX_DRV_st2205),)

-PKG_BUILD_DEPENDS += st2205tool
+PKG_BUILD_DEPENDS += libgd, st2205tool
+endif
+
+ifneq ($(CONFIG_LCD4LINUX_DRV_T6963),)
+PKG_BUILD_DEPENDS += libgd
+endif
+
+ifneq ($(CONFIG_LCD4LINUX_DRV_Curses),)
+PKG_BUILD_DEPENDS += libncurses
+endif
+
+ifneq ($(CONFIG_LCD4LINUX_DRV_X11),)
+PKG_BUILD_DEPENDS += libgd, libX11

 endif
 
 ifneq ($(CONFIG_LCD4LINUX_PLUGIN_gps),)
 PKG_BUILD_DEPENDS += libnmeap
 endif
 
 endif
 
 ifneq ($(CONFIG_LCD4LINUX_PLUGIN_gps),)
 PKG_BUILD_DEPENDS += libnmeap
 endif
 

+ifneq ($(CONFIG_LCD4LINUX_PLUGIN_iconv),)
+PKG_BUILD_DEPENDS += libiconv
+endif
+
+ifneq ($(CONFIG_LCD4LINUX_PLUGIN_mysql),)
+PKG_BUILD_DEPENDS += libmysqlclient
+endif
+
+
+## TODO PYTHON PLUGIN, DEPENDS on ver >= '2.1.0'
+
+

 EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib/libiconv/include
 EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib
 
 EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib/libiconv/include
 EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib