X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Folsrd%2FMakefile;h=09c6372498eda5296a9beca570f97e1e4ad789e2;hp=a5b6f2d6540b4580eb9440ef735df3f57b07def7;hb=0080bbcdfc577b7b0c58ee8e48001ac51a0ba5e4;hpb=7b76d6bbcf838d351078279a8a9516ee7a31ccaa diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile index a5b6f2d654..09c6372498 100644 --- a/net/olsrd/Makefile +++ b/net/olsrd/Makefile @@ -9,19 +9,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=olsrd -PKG_VERSION:=0.5.4 +PKG_VERSION:=0.5.6-r2 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5 -PKG_MD5SUM:=471d0d268fae388d18f925ea9dfe0150 - -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_MD5SUM:=64b439cde30f48764f02cdd8766aba40 include $(INCLUDE_DIR)/package.mk -define Package/olsrd +TARGET_CFLAGS += $(FPIC) + +define Package/olsrd/template SECTION:=net CATEGORY:=Network TITLE:=OLSR (Optimized Link State Routing) daemon @@ -29,70 +29,62 @@ define Package/olsrd MENU:=1 endef +define Package/olsrd + $(call Package/olsrd/template) + MENU:=1 + DEPENDS:=+libpthread +endef + define Package/olsrd/conffiles /etc/olsrd.conf endef define Package/olsrd-mod-dot-draw - $(call Package/olsrd) + $(call Package/olsrd/template) DEPENDS:=olsrd TITLE:=Dot topology information plugin - MENU:=0 endef define Package/olsrd-mod-bmf - $(call Package/olsrd) - DEPENDS:=olsrd +libpthread +kmod-tun + $(call Package/olsrd/template) + DEPENDS:=olsrd +kmod-tun TITLE:=Basic multicast forwarding plugin - MENU:=0 endef define Package/olsrd-mod-dyn-gw - $(call Package/olsrd) - DEPENDS:=olsrd +libpthread + $(call Package/olsrd/template) + DEPENDS:=olsrd TITLE:=Dynamic internet gateway plugin - MENU:=0 endef define Package/olsrd-mod-httpinfo - $(call Package/olsrd) + $(call Package/olsrd/template) DEPENDS:=olsrd TITLE:=Small informative web server plugin - MENU:=0 endef define Package/olsrd-mod-nameservice - $(call Package/olsrd) + $(call Package/olsrd/template) DEPENDS:=olsrd TITLE:=Lightweight hostname resolver plugin - MENU:=0 endef define Package/olsrd-mod-secure - $(call Package/olsrd) + $(call Package/olsrd/template) DEPENDS:=olsrd TITLE:=Message signing plugin to secure routing domain - MENU:=0 endef define Package/olsrd-mod-txtinfo - $(call Package/olsrd) + $(call Package/olsrd/template) DEPENDS:=olsrd TITLE:=Small informative web server plugin - MENU:=0 endef define Package/olsrd-mod-secure/conffiles /etc/olsrd.d/olsrd_secure_key endef -define Package/olsrd-mod-tas - $(call Package/olsrd) - DEPENDS:=olsrd - TITLE:=Tiny Application Server (TAS) plugin - MENU:=0 -endef - define Build/Configure endef @@ -109,64 +101,59 @@ define Build/Compile SBINDIR="$(PKG_INSTALL_DIR)/usr/sbin/" \ ETCDIR="$(PKG_INSTALL_DIR)/etc" \ MANDIR="$(PKG_INSTALL_DIR)/usr/share/man" \ - STRIP="/bin/true" \ + STRIP="true" \ + INSTALL_LIB="true" \ + SUBDIRS="bmf dot_draw dyn_gw httpinfo nameservice secure txtinfo" \ all libs install install_libs endef define Package/olsrd/install $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/olsr.config $(1)/etc/config/olsr - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/olsrd.conf $(1)/etc/ + $(INSTALL_DATA) ./files/olsrd.config $(1)/etc/config/olsrd + $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/cfgparser/olsrd.conf.example $(1)/etc/olsrd.conf $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/olsrd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/olsrd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/olsrd.init $(1)/etc/init.d/olsrd endef define Package/olsrd-mod-dot-draw/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_dot_draw.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/dot_draw/olsrd_dot_draw.so.* $(1)/usr/lib/ endef define Package/olsrd-mod-bmf/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_bmf.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmf/olsrd_bmf.so.* $(1)/usr/lib/ endef define Package/olsrd-mod-dyn-gw/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_dyn_gw.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/dyn_gw/olsrd_dyn_gw.so.* $(1)/usr/lib/ endef define Package/olsrd-mod-httpinfo/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_httpinfo.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/httpinfo/olsrd_httpinfo.so.* $(1)/usr/lib/ endef define Package/olsrd-mod-nameservice/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_nameservice.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/nameservice/olsrd_nameservice.so.* $(1)/usr/lib/ endef define Package/olsrd-mod-secure/install $(INSTALL_DIR) $(1)/etc/olsrd.d $(CP) ./files/olsrd_secure_key $(1)/etc/olsrd.d/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_secure.so.* $(1)/usr/lib/ -endef - -define Package/olsrd-mod-tas/install - $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_tas.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/secure/olsrd_secure.so.* $(1)/usr/lib/ endef define Package/olsrd-mod-txtinfo/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_txtinfo.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/txtinfo/olsrd_txtinfo.so.* $(1)/usr/lib/ endef - - $(eval $(call BuildPackage,olsrd)) $(eval $(call BuildPackage,olsrd-mod-dot-draw)) $(eval $(call BuildPackage,olsrd-mod-bmf)) @@ -174,5 +161,4 @@ $(eval $(call BuildPackage,olsrd-mod-dyn-gw)) $(eval $(call BuildPackage,olsrd-mod-httpinfo)) $(eval $(call BuildPackage,olsrd-mod-nameservice)) $(eval $(call BuildPackage,olsrd-mod-secure)) -$(eval $(call BuildPackage,olsrd-mod-tas)) $(eval $(call BuildPackage,olsrd-mod-txtinfo))