Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > d0e87e521cabeffce0f9a9fb963ecf75 > files > 3

fftw2-2.1.5-14mdv2010.0.src.rpm

diff -Naur fftw-2.1.5/double/mpi/Makefile.am fftw-2.1.5.oden/double/mpi/Makefile.am
--- fftw-2.1.5/double/mpi/Makefile.am	2003-03-17 00:43:19.000000000 +0100
+++ fftw-2.1.5.oden/double/mpi/Makefile.am	2008-08-04 09:12:31.000000000 +0200
@@ -28,6 +28,9 @@
                          -version-info @SHARED_VERSION_INFO@ \
                          -rpath $(libdir)
 
+lib@FFTW_PREFIX@fftw_mpi_la_LIBADD = \
+                    @MPILIBS@ $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
+
 @FFTW_PREFIX1@fftw_mpi.h: fftw_mpi.h
 	rm -f $@
 	sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/fftw_mpi.h > $@
@@ -39,32 +42,38 @@
                           -version-info @SHARED_VERSION_INFO@ \
                           -rpath $(libdir)
 
-@FFTW_PREFIX1@rfftw_mpi.h: rfftw_mpi.h
+lib@FFTW_PREFIX@rfftw_mpi_la_LIBADD = \
+                       @MPILIBS@ \
+		        $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \
+                       $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
+
+@FFTW_PREFIX1@rfftw_mpi.h: rfftw_mpi.h 	
 	rm -f $@
 	sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/rfftw_mpi.h > $@
 
 CLEANFILES = @FFTW_PREFIX1@fftw_mpi.h @FFTW_PREFIX1@rfftw_mpi.h
 
 test_sched_SOURCES = test_sched.c
-test_sched_LDADD = lib@FFTW_PREFIX@fftw_mpi.la \
-                   $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@
+test_sched_LDADD =  @MPILIBS@ lib@FFTW_PREFIX@fftw_mpi.la \
+                   $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
 
 test_transpose_mpi_SOURCES = test_transpose_mpi.c
-test_transpose_mpi_LDADD = lib@FFTW_PREFIX@fftw_mpi.la \
-                           $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@
+test_transpose_mpi_LDADD = @MPILIBS@ lib@FFTW_PREFIX@fftw_mpi.la \
+                           $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
 
 fftw_mpi_test_SOURCES = fftw_mpi_test.c
 fftw_mpi_test_LDADD = ../tests/test_main.o \
+		      @MPILIBS@ \
                       lib@FFTW_PREFIX@fftw_mpi.la \
-                      $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@
+                      $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
 
 rfftw_mpi_test_SOURCES = rfftw_mpi_test.c
 rfftw_mpi_test_LDADD = ../tests/test_main.o \
+		      @MPILIBS@ \
                        lib@FFTW_PREFIX@rfftw_mpi.la \
                        lib@FFTW_PREFIX@fftw_mpi.la \
 		       $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \
-                       $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \
-                       @MPILIBS@
+                       $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
 
 # for some reason, automake tries to use autoheader in order to
 # generate config.h.in, and fails because config.h.in is GNU-lly
diff -Naur fftw-2.1.5/double/mpi/test_sched.c fftw-2.1.5.oden/double/mpi/test_sched.c
--- fftw-2.1.5/double/mpi/test_sched.c	2003-03-17 00:43:19.000000000 +0100
+++ fftw-2.1.5.oden/double/mpi/test_sched.c	2008-08-04 09:12:31.000000000 +0200
@@ -27,6 +27,8 @@
      int **sched;
      int npes = -1, sortpe = -1, steps;
 
+     /* needed to link with proper mpi libs */
+     MPI_Init(&argc,&argv);
      if (argc >= 2) {
 	  npes = atoi(argv[1]);
 	  if (npes <= 0) {
@@ -121,5 +123,6 @@
 	  }
      }
 
+     MPI_Finalize();
      return 0;
 }
diff -Naur fftw-2.1.5/double/rfftw/Makefile.am fftw-2.1.5.oden/double/rfftw/Makefile.am
--- fftw-2.1.5/double/rfftw/Makefile.am	2003-03-24 08:05:32.000000000 +0100
+++ fftw-2.1.5.oden/double/rfftw/Makefile.am	2008-08-04 09:12:31.000000000 +0200
@@ -18,6 +18,7 @@
 					 rfftw.h                   
 
 lib@FFTW_PREFIX@rfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+lib@FFTW_PREFIX@rfftw_la_LIBADD = ../fftw/lib@FFTW_PREFIX@fftw.la
 MAINTAINERCLEANFILES = $(CODELETS) rconfig.c
 DISTCLEANFILES = srfftw.h drfftw.h
 
diff -Naur fftw-2.1.5/double/threads/Makefile.am fftw-2.1.5.oden/double/threads/Makefile.am
--- fftw-2.1.5/double/threads/Makefile.am	2003-03-17 00:43:19.000000000 +0100
+++ fftw-2.1.5.oden/double/threads/Makefile.am	2008-08-04 09:26:42.000000000 +0200
@@ -28,6 +28,10 @@
                              -version-info @SHARED_VERSION_INFO@ \
                              -rpath $(libdir)
 
+lib@FFTW_PREFIX@fftw_threads_la_LIBADD = \
+                          $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \
+	 		  @THREADLIBS@
+
 @FFTW_PREFIX1@fftw_threads.h: fftw_threads.h
 	rm -f $@
 	sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/fftw_threads.h > $@
@@ -49,6 +53,12 @@
                               -version-info @SHARED_VERSION_INFO@ \
                               -rpath $(libdir)
 
+lib@FFTW_PREFIX@rfftw_threads_la_LIBADD = \
+                          $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \
+                          $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \
+                          libfftw_threads.la \
+			  @THREADLIBS@
+
 @FFTW_PREFIX1@rfftw_threads.h: rfftw_threads.h
 	rm -f $@
 	sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/rfftw_threads.h > $@
diff -Naur fftw-2.1.5/single/mpi/Makefile.am fftw-2.1.5.oden/single/mpi/Makefile.am
--- fftw-2.1.5/single/mpi/Makefile.am	2003-03-17 00:43:19.000000000 +0100
+++ fftw-2.1.5.oden/single/mpi/Makefile.am	2008-08-04 09:12:31.000000000 +0200
@@ -28,6 +28,9 @@
                          -version-info @SHARED_VERSION_INFO@ \
                          -rpath $(libdir)
 
+lib@FFTW_PREFIX@fftw_mpi_la_LIBADD = \
+                    @MPILIBS@ $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
+
 @FFTW_PREFIX1@fftw_mpi.h: fftw_mpi.h
 	rm -f $@
 	sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/fftw_mpi.h > $@
@@ -39,32 +42,38 @@
                           -version-info @SHARED_VERSION_INFO@ \
                           -rpath $(libdir)
 
-@FFTW_PREFIX1@rfftw_mpi.h: rfftw_mpi.h
+lib@FFTW_PREFIX@rfftw_mpi_la_LIBADD = \
+                       @MPILIBS@ \
+		        $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \
+                       $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
+
+@FFTW_PREFIX1@rfftw_mpi.h: rfftw_mpi.h 	
 	rm -f $@
 	sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/rfftw_mpi.h > $@
 
 CLEANFILES = @FFTW_PREFIX1@fftw_mpi.h @FFTW_PREFIX1@rfftw_mpi.h
 
 test_sched_SOURCES = test_sched.c
-test_sched_LDADD = lib@FFTW_PREFIX@fftw_mpi.la \
-                   $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@
+test_sched_LDADD =  @MPILIBS@ lib@FFTW_PREFIX@fftw_mpi.la \
+                   $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
 
 test_transpose_mpi_SOURCES = test_transpose_mpi.c
-test_transpose_mpi_LDADD = lib@FFTW_PREFIX@fftw_mpi.la \
-                           $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@
+test_transpose_mpi_LDADD = @MPILIBS@ lib@FFTW_PREFIX@fftw_mpi.la \
+                           $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
 
 fftw_mpi_test_SOURCES = fftw_mpi_test.c
 fftw_mpi_test_LDADD = ../tests/test_main.o \
+		      @MPILIBS@ \
                       lib@FFTW_PREFIX@fftw_mpi.la \
-                      $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@
+                      $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
 
 rfftw_mpi_test_SOURCES = rfftw_mpi_test.c
 rfftw_mpi_test_LDADD = ../tests/test_main.o \
+		      @MPILIBS@ \
                        lib@FFTW_PREFIX@rfftw_mpi.la \
                        lib@FFTW_PREFIX@fftw_mpi.la \
 		       $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \
-                       $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \
-                       @MPILIBS@
+                       $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
 
 # for some reason, automake tries to use autoheader in order to
 # generate config.h.in, and fails because config.h.in is GNU-lly
diff -Naur fftw-2.1.5/single/mpi/test_sched.c fftw-2.1.5.oden/single/mpi/test_sched.c
--- fftw-2.1.5/single/mpi/test_sched.c	2003-03-17 00:43:19.000000000 +0100
+++ fftw-2.1.5.oden/single/mpi/test_sched.c	2008-08-04 09:12:31.000000000 +0200
@@ -27,6 +27,8 @@
      int **sched;
      int npes = -1, sortpe = -1, steps;
 
+     /* needed to link with proper mpi libs */
+     MPI_Init(&argc,&argv);
      if (argc >= 2) {
 	  npes = atoi(argv[1]);
 	  if (npes <= 0) {
@@ -121,5 +123,6 @@
 	  }
      }
 
+     MPI_Finalize();
      return 0;
 }
diff -Naur fftw-2.1.5/single/rfftw/Makefile.am fftw-2.1.5.oden/single/rfftw/Makefile.am
--- fftw-2.1.5/single/rfftw/Makefile.am	2003-03-24 08:05:32.000000000 +0100
+++ fftw-2.1.5.oden/single/rfftw/Makefile.am	2008-08-04 09:12:31.000000000 +0200
@@ -18,6 +18,7 @@
 					 rfftw.h                   
 
 lib@FFTW_PREFIX@rfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+lib@FFTW_PREFIX@rfftw_la_LIBADD = ../fftw/lib@FFTW_PREFIX@fftw.la
 MAINTAINERCLEANFILES = $(CODELETS) rconfig.c
 DISTCLEANFILES = srfftw.h drfftw.h
 
diff -Naur fftw-2.1.5/single/threads/Makefile.am fftw-2.1.5.oden/single/threads/Makefile.am
--- fftw-2.1.5/single/threads/Makefile.am	2003-03-17 00:43:19.000000000 +0100
+++ fftw-2.1.5.oden/single/threads/Makefile.am	2008-08-04 09:41:00.000000000 +0200
@@ -28,6 +28,10 @@
                              -version-info @SHARED_VERSION_INFO@ \
                              -rpath $(libdir)
 
+lib@FFTW_PREFIX@fftw_threads_la_LIBADD = \
+                          $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \
+	 		  @THREADLIBS@
+
 @FFTW_PREFIX1@fftw_threads.h: fftw_threads.h
 	rm -f $@
 	sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/fftw_threads.h > $@
@@ -49,6 +53,12 @@
                               -version-info @SHARED_VERSION_INFO@ \
                               -rpath $(libdir)
 
+lib@FFTW_PREFIX@rfftw_threads_la_LIBADD = \
+                          $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \
+                          $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \
+                          libsfftw_threads.la \
+			  @THREADLIBS@
+
 @FFTW_PREFIX1@rfftw_threads.h: rfftw_threads.h
 	rm -f $@
 	sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/rfftw_threads.h > $@

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional