bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

this patch cleans up lcd4linux deps. (#3521)

Browse Source 
Signed-off-by: Michael Vogt <michu at neophob.com>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@11438 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2008-06-11 16:34:38 +00:00
parent 22a7f44f2a
commit 4f45a3ce70
2 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/lcd4linux/Config.in
View File

@ -70,11 +70,11 @@ config LCD4LINUX_DRV_NULL
config LCD4LINUX_DRV_PNG config LCD4LINUX_DRV_PNG
bool bool
prompt "PNG (you need to select libgd)" prompt "PNG"
config LCD4LINUX_DRV_PPM config LCD4LINUX_DRV_PPM
bool bool
prompt "PPM (you need to select libgd)" prompt "PPM"
config LCD4LINUX_DRV_Pertelian config LCD4LINUX_DRV_Pertelian
bool bool
@ -98,7 +98,7 @@ config LCD4LINUX_DRV_SimpleLCD
config LCD4LINUX_DRV_st2205 config LCD4LINUX_DRV_st2205
bool bool
prompt "st2205 (you need to select st2205tool)" prompt "st2205"
config LCD4LINUX_DRV_T6963 config LCD4LINUX_DRV_T6963
bool bool
@ -164,7 +164,7 @@ config LCD4LINUX_PLUGIN_file
config LCD4LINUX_PLUGIN_gps config LCD4LINUX_PLUGIN_gps
bool bool
prompt "gps (you need to select libnmeap)" prompt "gps"
config LCD4LINUX_PLUGIN_i2c_sensors config LCD4LINUX_PLUGIN_i2c_sensors
bool bool

50
utils/lcd4linux/Makefile
View File

@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lcd4linux PKG_NAME:=lcd4linux
PKG_REV:=877 PKG_REV:=877
PKG_VERSION:=r$(PKG_REV) PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/ PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/
@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/lcd4linux define Package/lcd4linux
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+libncurses +libusb +libiconv +libgd DEPENDS:=+libusb
TITLE:=LCD display utility TITLE:=LCD display utility
URL:=http://lcd4linux.bulix.org/ URL:=http://lcd4linux.bulix.org/
endef endef
@ -130,14 +130,58 @@ ifneq ($(CONFIG_LCD4LINUX_DRV_PPM),)
PKG_BUILD_DEPENDS += libgd PKG_BUILD_DEPENDS += libgd
endif 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 endif
ifneq ($(CONFIG_LCD4LINUX_PLUGIN_gps),) ifneq ($(CONFIG_LCD4LINUX_PLUGIN_gps),)
PKG_BUILD_DEPENDS += libnmeap PKG_BUILD_DEPENDS += libnmeap
endif 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_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_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib