X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ef738d18e48b1251253ff130aac83e86edc56859..c73f40600d5d7eece7cf7a80d9c067583c39cf5b:/include/autotools.mk

diff --git a/include/autotools.mk b/include/autotools.mk
index 7e251ead5..534add642 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -49,18 +49,21 @@ define remove_version_check
 	fi
 endef
 
-# XXX the libtool fixups got deactivated in the course of switching to libtool2 in trunk XXX
-# ifneq ($(filter libtool,$(PKG_FIXUP)),)
-#   PKG_BUILD_DEPENDS += libtool
-#   Hooks/Configure/Pre += update_libtool remove_version_check
-#   Hooks/Configure/Post += update_libtool
-#   Hooks/InstallDev/Post += libtool_fixup_libdir
-# endif
-# 
-# ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)
-#   PKG_BUILD_DEPENDS += libtool
-#   Hooks/Configure/Pre += update_libtool_ucxx remove_version_check
-#   Hooks/Configure/Post += update_libtool_ucxx
-#   Hooks/InstallDev/Post += libtool_fixup_libdir
-# endif
+# delete *.la-files from staging_dir - we can not yet remove respective lines within all package
+# Makefiles, since backfire still uses libtool v1.5.x which (may) require those files
+define libtool_remove_files
+	find $(1) -name '*.la' | $(XARGS) rm -f
+endef
+
+Hooks/InstallDev/Post += libtool_remove_files
+
+ifneq ($(filter libtool,$(PKG_FIXUP)),)
+  # WARNING: the use of PKG_FIXUP is DEPRECATED
+  PKG_BUILD_DEPENDS += libtool
+endif
+ 
+ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)
+  # WARNING: the use of PKG_FIXUP is DEPRECATED
+  PKG_BUILD_DEPENDS += libtool
+endif