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

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/olsrd@9486 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/Makefile b/Makefile
index a5b6f2d6540b4580eb9440ef735df3f57b07def7..d994972896f14ca65253049c0d341482400bbf89 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/olsrd
+define Package/olsrd/template
   SECTION:=net
   CATEGORY:=Network
   TITLE:=OLSR (Optimized Link State Routing) daemon
@@ -29,57 +29,55 @@ define Package/olsrd
   MENU:=1
 endef
 
+define Package/olsrd
+  $(call Package/olsrd/template)
+  MENU:=1
+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)
+  $(call Package/olsrd/template)
   DEPENDS:=olsrd +libpthread +kmod-tun
   TITLE:=Basic multicast forwarding plugin
-  MENU:=0
 endef
 
 define Package/olsrd-mod-dyn-gw
-  $(call Package/olsrd)
+  $(call Package/olsrd/template)
   DEPENDS:=olsrd +libpthread
   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
@@ -87,10 +85,9 @@ define Package/olsrd-mod-secure/conffiles
 endef
 
 define Package/olsrd-mod-tas
-  $(call Package/olsrd)
+  $(call Package/olsrd/template)
   DEPENDS:=olsrd
   TITLE:=Tiny Application Server (TAS) plugin
-  MENU:=0
 endef
 
 define Build/Configure

diff --git a/patches/110-build_fix.patch b/patches/110-build_fix.patch
new file mode 100644 (file)
index 0000000..ae229a8
--- /dev/null
+++ b/patches/110-build_fix.patch
@@ -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\"" >> "$@"