use $(FPIC) in a few places where it matters

[openwrt.git] / package / nvram / Makefile

diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index f7312fe..ec20de2 100644 (file)
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
@@ -5,42 +11,38 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=nvram
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+include $(INCLUDE_DIR)/package.mk
 
-include $(TOPDIR)/package/rules.mk
+define Package/nvram
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=@TARGET_brcm_2_4
+  TITLE:=Broadcom config utility
+endef
 
-# does not depend on menuconfig
-ifneq ($(BOARD)-$(KERNEL),brcm-2.4)
-BR2_PACKAGE_NVRAM:=m
-else
-BR2_PACKAGE_NVRAM:=y
-endif
+define Package/nvram/description
+ This package contains an utility to control broadcom's 'nvram' config area.
+endef
 
-$(eval $(call PKG_template,NVRAM,nvram,$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.prepared:
+define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
-       cp -a ./src/* $(PKG_BUILD_DIR)
-       touch $@
-
-$(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include"
-       touch $@
-
-$(IPKG_NVRAM):
-       mkdir -p $(IDIR_NVRAM)/usr/lib
-       cp $(PKG_BUILD_DIR)/*.so $(IDIR_NVRAM)/usr/lib
-       mkdir -p $(IDIR_NVRAM)/usr/sbin
-       cp $(PKG_BUILD_DIR)/nvram $(IDIR_NVRAM)/usr/sbin
-       $(RSTRIP) $(IDIR_NVRAM)
-       $(IPKG_BUILD) $(IDIR_NVRAM) $(PACKAGE_DIR)
-
-
-compile: install-dev
-install-dev:
-       mkdir -p $(STAGING_DIR)/usr/lib
-       cp $(PKG_BUILD_DIR)/*.so $(STAGING_DIR)/usr/lib
-       
-
+       $(CP) ./src/* $(PKG_BUILD_DIR)
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/InstallDev
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/libnvram*.so $(1)/usr/lib/
+endef
+
+define Package/nvram/install
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/nvram.init $(1)/etc/init.d/nvram
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/libnvram*.so $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,nvram))