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

clean up olsrd makefile, fix a very annoying dependency bug in the olsrd build system

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@9486 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-11-03 10:34:44 +00:00
parent 6216570bb0
commit a4f9fb3582
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
net/olsrd/Makefile
View File

@ -21,7 +21,7 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/olsrd define Package/olsrd/template
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
TITLE:=OLSR (Optimized Link State Routing) daemon TITLE:=OLSR (Optimized Link State Routing) daemon
@ -29,57 +29,55 @@ define Package/olsrd
MENU:=1 MENU:=1
endef endef
define Package/olsrd
$(call Package/olsrd/template)
MENU:=1
endef
define Package/olsrd/conffiles define Package/olsrd/conffiles
/etc/olsrd.conf /etc/olsrd.conf
endef endef
define Package/olsrd-mod-dot-draw define Package/olsrd-mod-dot-draw
$(call Package/olsrd) $(call Package/olsrd/template)
DEPENDS:=olsrd DEPENDS:=olsrd
TITLE:=Dot topology information plugin TITLE:=Dot topology information plugin
MENU:=0
endef endef
define Package/olsrd-mod-bmf define Package/olsrd-mod-bmf
$(call Package/olsrd) $(call Package/olsrd/template)
DEPENDS:=olsrd +libpthread +kmod-tun DEPENDS:=olsrd +libpthread +kmod-tun
TITLE:=Basic multicast forwarding plugin TITLE:=Basic multicast forwarding plugin
MENU:=0
endef endef
define Package/olsrd-mod-dyn-gw define Package/olsrd-mod-dyn-gw
$(call Package/olsrd) $(call Package/olsrd/template)
DEPENDS:=olsrd +libpthread DEPENDS:=olsrd +libpthread
TITLE:=Dynamic internet gateway plugin TITLE:=Dynamic internet gateway plugin
MENU:=0
endef endef
define Package/olsrd-mod-httpinfo define Package/olsrd-mod-httpinfo
$(call Package/olsrd) $(call Package/olsrd/template)
DEPENDS:=olsrd DEPENDS:=olsrd
TITLE:=Small informative web server plugin TITLE:=Small informative web server plugin
MENU:=0
endef endef
define Package/olsrd-mod-nameservice define Package/olsrd-mod-nameservice
$(call Package/olsrd) $(call Package/olsrd/template)
DEPENDS:=olsrd DEPENDS:=olsrd
TITLE:=Lightweight hostname resolver plugin TITLE:=Lightweight hostname resolver plugin
MENU:=0
endef endef
define Package/olsrd-mod-secure define Package/olsrd-mod-secure
$(call Package/olsrd) $(call Package/olsrd/template)
DEPENDS:=olsrd DEPENDS:=olsrd
TITLE:=Message signing plugin to secure routing domain TITLE:=Message signing plugin to secure routing domain
MENU:=0
endef endef
define Package/olsrd-mod-txtinfo define Package/olsrd-mod-txtinfo
$(call Package/olsrd) $(call Package/olsrd/template)
DEPENDS:=olsrd DEPENDS:=olsrd
TITLE:=Small informative web server plugin TITLE:=Small informative web server plugin
MENU:=0
endef endef
define Package/olsrd-mod-secure/conffiles define Package/olsrd-mod-secure/conffiles
@ -87,10 +85,9 @@ define Package/olsrd-mod-secure/conffiles
endef endef
define Package/olsrd-mod-tas define Package/olsrd-mod-tas
$(call Package/olsrd) $(call Package/olsrd/template)
DEPENDS:=olsrd DEPENDS:=olsrd
TITLE:=Tiny Application Server (TAS) plugin TITLE:=Tiny Application Server (TAS) plugin
MENU:=0
endef endef
define Build/Configure define Build/Configure

13
net/olsrd/patches/110-build_fix.patch Normal file
View File

@ -0,0 +1,13 @@
Index: olsrd-0.5.4/Makefile
===================================================================
--- olsrd-0.5.4.orig/Makefile 2007-11-03 11:33:37.075400513 +0100
+++ olsrd-0.5.4/Makefile 2007-11-03 11:33:47.171975883 +0100
@@ -71,8 +71,6 @@
$(CFGOBJS):
$(MAKECMD) -C $(CFGDIR)
-# generate it always
-.PHONY: src/builddata.c
src/builddata.c:
@$(RM) "$@"
@echo "#include \"defs.h\"" >> "$@"