X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/3b5357f927c0fe18037b21355160b2d6d7ce8c24..3eff226019956112e6f3eec0dedff1b6f14aa6c7:/openwrt/package/net-snmp/Makefile

diff --git a/openwrt/package/net-snmp/Makefile b/openwrt/package/net-snmp/Makefile
index 721190699..95e01f661 100644
--- a/openwrt/package/net-snmp/Makefile
+++ b/openwrt/package/net-snmp/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=net-snmp
 PKG_VERSION:=5.1.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=8080555ab3f90011f25d5122042d9a8d
 
 PKG_SOURCE_URL:=@SF/net-snmp
@@ -23,7 +23,6 @@ SNMP_MIB_MODULES_INCLUDED = \
 	host/hr_proc \
 	host/hr_storage \
 	host/hr_system \
-	ieee802dot11 \
 	mibII/at \
 	mibII/icmp \
 	mibII/interfaces \
@@ -41,8 +40,11 @@ SNMP_MIB_MODULES_INCLUDED = \
 	snmpv3/usmUser \
 	snmpv3mibs \
 	tunnel \
+	ucd-snmp/disk \
+	ucd-snmp/extensible \
 	ucd-snmp/loadave \
 	ucd-snmp/memory \
+	ucd-snmp/pass \
 	ucd-snmp/proc \
 	ucd-snmp/vmstat \
 	util_funcs \
@@ -52,6 +54,7 @@ SNMP_MIB_MODULES_EXCLUDED = \
 	agent_mibs \
 	agentx \
 	host \
+	ieee802dot11 \
 	mibII \
 	notification \
 	snmpv3mibs \
@@ -99,8 +102,8 @@ $(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
 		ac_cv_header_pcap_h=no \
 		./configure \
 		  --target=$(GNU_TARGET_NAME) \
@@ -154,6 +157,26 @@ $(IPKG_SNMPD):
 
 $(IPKG_SNMP_UTILS):
 	install -d -m0755 $(IDIR_SNMP_UTILS)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,walk} $(IDIR_SNMP_UTILS)/usr/bin/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(IDIR_SNMP_UTILS)/usr/bin/
 	$(RSTRIP) $(IDIR_SNMP_UTILS)
 	$(IPKG_BUILD) $(IDIR_SNMP_UTILS) $(PACKAGE_DIR)
+
+$(STAGING_DIR)/usr/lib/libnetsnmp.so: $(PKG_BUILD_DIR)/.built
+	mkdir -p $(STAGING_DIR)/usr/bin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(STAGING_DIR)/usr/bin/
+	mkdir -p $(STAGING_DIR)/usr/include
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/net-snmp $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(STAGING_DIR)/usr/lib/
+	touch $@
+
+install-dev: $(STAGING_DIR)/usr/lib/libnetsnmp.so
+
+uninstall-dev:
+	rm -rf \
+		$(STAGING_DIR)/usr/bin/net-snmp-config \
+		$(STAGING_DIR)/usr/include/net-snmp \
+		$(STAGING_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} \
+
+compile: install-dev
+clean: uninstall-dev