[packages] utils/triggerhappy: fix path to linux/input.h

[openwrt/svn-archive/archive.git] / utils / lm-sensors / Makefile

diff --git a/utils/lm-sensors/Makefile b/utils/lm-sensors/Makefile
index 974fd408f9bba5087bc188a13c1e7ed74b6382d8..63e1a22ba0ba0a2a6b0f8659aee50d5e2507db7a 100644 (file)
--- a/utils/lm-sensors/Makefile
+++ b/utils/lm-sensors/Makefile
@@ -1,54 +1,93 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lm-sensors
-PKG_VERSION:=2.10.3
-PKG_RELEASE:=1
+PKG_VERSION:=3.2.0
+PKG_RELEASE:=2
 
-PKG_SOURCE:=lm_sensors-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=lm_sensors-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://dl.lm-sensors.org/lm-sensors/releases/
-PKG_MD5SUM:=55d77146fbd56c205a9f81d262b9453c
-PKG_CAT:=zcat
+PKG_MD5SUM:=829d88fb09d67723fbf42853eb84d1fd
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/lm_sensors-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/lm-sensors/Default
+  DEPENDS:=+sysfsutils
+  URL:=http://www.lm-sensors.org/
+endef
+
 define Package/lm-sensors
+  $(call Package/lm-sensors/Default)
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=lm-sensors
-  DEPENDS:=+sysfsutils
-  DESCRIPTION:=\
+  DEPENDS+=+libsensors
+endef
+
+define Package/libsensors
+  $(call Package/lm-sensors/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=libsensors
+endef
+
+define Package/lm-sensors/description
        Utility to read hardware sensor data
-  URL:=http://www.lm-sensors.org/
+endef
+
+define Package/libsensors/description
+       lm-sensors libraries
+endef
+
+define Package/lm-sensors/conffiles
+/etc/sensors.conf
 endef
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
                KERNELVERSION="$(LINUX_VERSION)" \
                LINUX="$(LINUX_DIR)" \
                CC="$(TARGET_CC)" \
                STAGING_DIR="$(STAGING_DIR)" \
+               PREFIX="/usr" \
+               MACHINE="$(ARCH)" \
                user
 endef
 
-define Package/lm-sensors/install
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include/sensors
+       $(CP) \
+               $(PKG_BUILD_DIR)/lib/sensors.h \
+               $(1)/usr/include/sensors
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/lib/libsensors.so* $(1)/usr/lib/
+       $(CP) \
+               $(PKG_BUILD_DIR)/lib/libsensors.{a,so*} \
+               $(1)/usr/lib/
+endef
+
+define Package/lm-sensors/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/prog/sensors/sensors $(1)/usr/sbin/
-       $(CP) $(PKG_BUILD_DIR)/prog/detect/i2cdetect $(1)/usr/sbin/
-       $(CP) $(PKG_BUILD_DIR)/prog/detect/sensors-detect $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/prog/sensors/sensors $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/prog/detect/sensors-detect $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc
-       $(CP) files/sensors.conf $(1)/etc/sensors.conf
+       $(INSTALL_CONF) ./files/sensors.conf $(1)/etc/sensors.conf
+endef
+
+define Package/libsensors/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/lib/libsensors.so* $(1)/usr/lib/
 endef
 
+
 $(eval $(call BuildPackage,lm-sensors))
+$(eval $(call BuildPackage,libsensors))