X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6f58d685d7226ea8459105db15c7f54b8bc90d8f..abf8637f43de1f3b6acb12a51b3ee67092d04a32:/openwrt/package/avahi/Makefile

diff --git a/openwrt/package/avahi/Makefile b/openwrt/package/avahi/Makefile
index a6b4a626a..16fb20385 100644
--- a/openwrt/package/avahi/Makefile
+++ b/openwrt/package/avahi/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=avahi
-PKG_VERSION:=0.1
+PKG_VERSION:=0.6.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=1ccbbc46d2aedf0c864b94c58ea220e6
+PKG_MD5SUM:=330613902c59bd597f140a8254e9f4ec
 
 PKG_SOURCE_URL:=http://www.freedesktop.org/~lennart/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -23,9 +23,9 @@ $(eval $(call PKG_template,LIBAVAHI,libavahi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARC
 $(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)/lib -L$(STAGING_DIR)/usr/lib" \
+		CFLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
 		ac_cv_func_malloc_0_nonnull=yes \
 		ac_cv_func_realloc_0_nonnull=yes \
@@ -54,18 +54,31 @@ $(PKG_BUILD_DIR)/.configured:
 			--disable-rpath \
 			--with-gnu-ld \
 			--disable-glib \
+			--disable-qt3 \
+			--disable-qt4 \
 			--disable-gtk \
 			--disable-dbus \
 			--enable-expat \
 			--enable-libdaemon \
 			--disable-python \
+			--disable-pygtk \
+			--disable-python-dbus \
+			--disable-mono \
+			--disable-monodoc \
 			--disable-doxygen-doc \
 			--disable-doxygen-dot \
+			--disable-doxygen-man \
+			--disable-doxygen-rtf \
+			--disable-doxygen-xml \
+			--disable-doxygen-chm \
+			--disable-doxygen-chi \
 			--disable-doxygen-html \
 			--disable-doxygen-ps \
 			--disable-doxygen-pdf \
 			--disable-xmltoman \
-			--with-distro=openwrt \
+			--with-distro=none \
+			--with-avahi-user=nobody \
+			--with-avahi-group=nogroup \
 	);
 	touch $@
 
@@ -79,39 +92,43 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_AVAHI_DAEMON):
 	install -d -m0755 $(IDIR_AVAHI_DAEMON)/etc/avahi
-	cp -fpR $(PKG_INSTALL_DIR)/etc/avahi/avahi-daemon.conf $(IDIR_AVAHI_DAEMON)/etc/avahi/
-	cp -fpR $(PKG_INSTALL_DIR)/etc/avahi/services $(IDIR_AVAHI_DAEMON)/etc/avahi/
+	install -m0644 ./files/avahi-daemon.conf $(IDIR_AVAHI_DAEMON)/etc/avahi/
+	install -d -m0755 $(IDIR_AVAHI_DAEMON)/etc/avahi/services
+	install -m0644 ./files/service-http $(IDIR_AVAHI_DAEMON)/etc/avahi/services/http.service
+	install -m0644 ./files/service-ssh $(IDIR_AVAHI_DAEMON)/etc/avahi/services/ssh.service
+	install -d -m0755 $(IDIR_AVAHI_DAEMON)/etc/init.d
+	install -m0755 ./files/avahi-daemon.init $(IDIR_AVAHI_DAEMON)/etc/init.d/avahi-daemon
 	install -d -m0755 $(IDIR_AVAHI_DAEMON)/usr/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(IDIR_AVAHI_DAEMON)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(IDIR_AVAHI_DAEMON)/usr/sbin/
 	$(RSTRIP) $(IDIR_AVAHI_DAEMON)
 	$(IPKG_BUILD) $(IDIR_AVAHI_DAEMON) $(PACKAGE_DIR)
 
 $(IPKG_AVAHI_DNSCONFD):
 	install -d -m0755 $(IDIR_AVAHI_DNSCONFD)/etc/avahi
-	cp -fpR $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(IDIR_AVAHI_DNSCONFD)/etc/avahi/
+	$(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(IDIR_AVAHI_DNSCONFD)/etc/avahi/
 	install -d -m0755 $(IDIR_AVAHI_DNSCONFD)/usr/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(IDIR_AVAHI_DNSCONFD)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(IDIR_AVAHI_DNSCONFD)/usr/sbin/
 	$(RSTRIP) $(IDIR_AVAHI_DNSCONFD)
 	$(IPKG_BUILD) $(IDIR_AVAHI_DNSCONFD) $(PACKAGE_DIR)
 
 $(IPKG_LIBAVAHI):
 	install -d -m0755 $(IDIR_LIBAVAHI)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so.* $(IDIR_LIBAVAHI)/usr/lib/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so.* $(IDIR_LIBAVAHI)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so.* $(IDIR_LIBAVAHI)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so.* $(IDIR_LIBAVAHI)/usr/lib/
 	$(RSTRIP) $(IDIR_LIBAVAHI)
 	$(IPKG_BUILD) $(IDIR_LIBAVAHI) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/avahi.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/avahi-common $(STAGING_DIR)/usr/include/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/avahi-core $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-common $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-core $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.a $(STAGING_DIR)/usr/lib/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so* $(STAGING_DIR)/usr/lib/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.a $(STAGING_DIR)/usr/lib/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so* $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.a $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so* $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.a $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so* $(STAGING_DIR)/usr/lib/
 	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(STAGING_DIR)/usr/lib/pkgconfig/
 	$(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc
 	$(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc
 	touch $@
@@ -128,8 +145,8 @@ uninstall-dev:
 		$(STAGING_DIR)/usr/lib/libavahi-core.so* \
 		$(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
 
 mostlyclean:
 	-$(MAKE) -C $(PKG_BUILD_DIR) clean