flite: Parallel build fixes.

[openwrt/svn-archive/archive.git] / sound / flite / Makefile

diff --git a/sound/flite/Makefile b/sound/flite/Makefile
index 93a7d1298a8773352867a1b0de2804fa502a8139..ceda6b904a11d1aedaed04c97e61363c8211c861 100644 (file)
--- a/sound/flite/Makefile
+++ b/sound/flite/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,19 +8,21 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=flite
 PKG_VERSION:=1.3-release
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/
 PKG_MD5SUM:=ae0aca1cb7b4801f4372f3a75a9e52b5
- 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/flite
   SECTION:=sound
   CATEGORY:=Sound
+  DEPENDS:=@!GCC_VERSION_3_4_6
   TITLE:=Text-to-speech for embedded systems
   URL:=http://www.speech.cs.cmu.edu/flite/index.html
 endef
@@ -42,25 +44,12 @@ define Build/Configure
        )
 endef
 
-define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
 define Build/InstallDev
-       mkdir -p $(1)/usr/include/flite
+       $(INSTALL_DIR) $(1)/usr/include/flite
        $(CP) $(PKG_INSTALL_DIR)/usr/include/flite/{cst,flite}*.h $(1)/usr/include/flite/
-       mkdir -p $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libflite*.so.* $(1)/usr/lib/
 endef
-       
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/flite/{cst,flite}*.h \
-               $(STAGING_DIR)/usr/lib/libflite*.so.*
-endef
 
 define Package/flite/install
        $(INSTALL_DIR) $(1)/usr/bin