[packages] clean fixups

[packages.git] / libs / avahi / Makefile

diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index d7980fa..647166a 100644 (file)
--- a/libs/avahi/Makefile
+++ b/libs/avahi/Makefile
@@ -1,23 +1,27 @@
 #
-
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=avahi
-PKG_VERSION:=0.6.23
-PKG_RELEASE:=2
+PKG_VERSION:=0.6.28
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://avahi.org/download/
-PKG_MD5SUM:=aab1a304851d8145ea5f6a85c10af9e9
+PKG_MD5SUM:=d0143a5aa3265019072e53ab497818d0
+
+PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host
+
+PKG_FIXUP:=libtool
+PKG_REMOVE_FILES:=autogen.sh
 
-PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -42,12 +46,12 @@ define Package/libavahi
   $(call Package/avahi/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libdaemon +libpthread
+  DEPENDS:=+libdaemon +libpthread +libgdbm
   TITLE+= (library)
 endef
 
 define Package/libavahi/description
-$(call Package/avahi/Default/description) 
+$(call Package/avahi/Default/description)
  .
  This package contains the mDNS/DNS-SD shared libraries, used by other programs.
 endef
@@ -100,7 +104,8 @@ $(call Package/avahi/Default/description)
  in a DHCP-like fashion. Especially useful on IPv6.
 endef
 
-TARGET_CFLAGS += $(FPIC)
+TARGET_CFLAGS += $(FPIC) -DGETTEXT_PACKAGE
+
 CONFIGURE_ARGS+= \
        --enable-shared \
        --enable-static \
@@ -109,6 +114,7 @@ CONFIGURE_ARGS+= \
        --disable-qt3 \
        --disable-qt4 \
        --disable-gtk \
+       --disable-gtk3 \
        --disable-dbus \
        --with-xml=expat \
        --disable-dbm \
@@ -142,21 +148,14 @@ CONFIGURE_ARGS+= \
 endif
 
 CONFIGURE_VARS+= \
-       CFLAGS="$$$$CFLAGS -DNDEBUG" \
-       $(if $(CONFIG_LINUX_2_4),ac_cv_header_sys_inotify_h=no)
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
+       CFLAGS="$$$$CFLAGS -DNDEBUG -DDISABLE_SYSTEMD" \
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/include
+       $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-{common,core} $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.{a,so*} $(1)/usr/lib/
-       mkdir -p $(1)/usr/lib/pkgconfig
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(1)/usr/lib/pkgconfig/
 endef
 
@@ -195,8 +194,3 @@ $(eval $(call BuildPackage,libavahi))
 $(eval $(call BuildPackage,avahi-autoipd))
 $(eval $(call BuildPackage,avahi-daemon))
 $(eval $(call BuildPackage,avahi-dnsconfd))
-
-$(eval $(call RequireCommand,intltool-update, \
-       $(PKG_NAME) requires intltool >= 0.35.0 \
-))
-