* rules/fftw.make

	version bump to 3.2


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9397 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 9 insertions, 62 deletions

diff --git a/rules/fftw.make b/rules/fftw.make
index caa7d45df..d3e84648f 100644
--- a/rules/fftw.make
+++ b/rules/fftw.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_FFTW) += fftw
 #
 # Paths and names
 #
-FFTW_VERSION	:= 3.1.2
+FFTW_VERSION	:= 3.2
 FFTW		:= fftw-$(FFTW_VERSION)
 FFTW_SUFFIX	:= tar.gz
-FFTW_URL	:= http://www.fftw.org//$(FFTW).$(FFTW_SUFFIX)
+FFTW_URL	:= http://www.fftw.org/$(FFTW).$(FFTW_SUFFIX)
 FFTW_SOURCE	:= $(SRCDIR)/$(FFTW).$(FFTW_SUFFIX)
 FFTW_DIR	:= $(BUILDDIR)/$(FFTW)
 
@@ -28,35 +28,14 @@ FFTW_DIR	:= $(BUILDDIR)/$(FFTW)
 # Get
 # ----------------------------------------------------------------------------
 
-fftw_get: $(STATEDIR)/fftw.get
-
-$(STATEDIR)/fftw.get: $(fftw_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(FFTW_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, FFTW)
 
 # ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-fftw_extract: $(STATEDIR)/fftw.extract
-
-$(STATEDIR)/fftw.extract: $(fftw_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(FFTW_DIR))
-	@$(call extract, FFTW)
-	@$(call patchin, FFTW)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-fftw_prepare: $(STATEDIR)/fftw.prepare
-
 FFTW_PATH	:= PATH=$(CROSS_PATH)
 FFTW_ENV 	:= $(CROSS_ENV)
 
@@ -67,44 +46,12 @@ FFTW_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
 	--enable-shared
 
-$(STATEDIR)/fftw.prepare: $(fftw_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(FFTW_DIR)/config.cache)
-	cd $(FFTW_DIR) && \
-		$(FFTW_PATH) $(FFTW_ENV) \
-		./configure $(FFTW_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-fftw_compile: $(STATEDIR)/fftw.compile
-
-$(STATEDIR)/fftw.compile: $(fftw_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(FFTW_DIR) && $(FFTW_PATH) $(MAKE)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-fftw_install: $(STATEDIR)/fftw.install
-
-$(STATEDIR)/fftw.install: $(fftw_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call install, FFTW)
-	@$(call touch, $@)
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-fftw_targetinstall: $(STATEDIR)/fftw.targetinstall
-
-$(STATEDIR)/fftw.targetinstall: $(fftw_targetinstall_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/fftw.targetinstall:
+	@$(call targetinfo)
 
 	@$(call install_init, fftw)
 	@$(call install_fixup, fftw,PACKAGE,fftw)
@@ -115,13 +62,13 @@ $(STATEDIR)/fftw.targetinstall: $(fftw_targetinstall_deps_default)
 	@$(call install_fixup, fftw,DEPENDS,)
 	@$(call install_fixup, fftw,DESCRIPTION,missing)
 
-	@$(call install_copy, fftw, 0, 0, 0644, $(FFTW_DIR)/.libs/libfftw3.so.3.1.2, /usr/lib/libfftw3.so.3.1.2)
-	@$(call install_link, fftw, libfftw3.so.3.1.2, /usr/lib/libfftw3.so.3)
-	@$(call install_link, fftw, libfftw3.so.3.1.2, /usr/lib/libfftw3.so)
+	@$(call install_copy, fftw, 0, 0, 0644, $(FFTW_DIR)/.libs/libfftw3.so.3.2.2, /usr/lib/libfftw3.so.3.2.2)
+	@$(call install_link, fftw, libfftw3.so.3.2.2, /usr/lib/libfftw3.so.3)
+	@$(call install_link, fftw, libfftw3.so.3.2.2, /usr/lib/libfftw3.so)
 
 	@$(call install_finish, fftw)
 
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean