#! /bin/sh /usr/share/dpatch/dpatch-run ## 01_fix_makefiles by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: moving /u/s/kino/help to /u/s/doc/kino/help @DPATCH@ --- fftw-2.1.3.orig/threads/Makefile.am +++ fftw-2.1.3/threads/Makefile.am @@ -2,15 +2,15 @@ # the --enable-threads option. This requires us to use the combination # of foo_* and EXTRA_* variables below. -lib_LTLIBRARIES = @FFTW_THREADS_LIBLIST@ -include_HEADERS = @FFTW_THREADS_INCLUDELIST@ -noinst_PROGRAMS = @FFTW_THREADS_PROGLIST@ - -EXTRA_LTLIBRARIES = libXXX_FFTW_PREFIX_XXXfftw_threads.la \ - libXXX_FFTW_PREFIX_XXXrfftw_threads.la -EXTRA_HEADERS = XXX_FFTW_PREFIX_XXXfftw_threads.h \ - XXX_FFTW_PREFIX_XXXrfftw_threads.h -EXTRA_PROGRAMS = fftw_threads_test rfftw_threads_test +#lib_LTLIBRARIES = @FFTW_THREADS_LIBLIST@ +#include_HEADERS = @FFTW_THREADS_INCLUDELIST@ +#noinst_PROGRAMS = @FFTW_THREADS_PROGLIST@ + +lib_LTLIBRARIES = lib@FFTW_PREFIX@fftw_threads.la \ + lib@FFTW_PREFIX@rfftw_threads.la +include_HEADERS = @FFTW_PREFIX@fftw_threads.h \ + @FFTW_PREFIX@rfftw_threads.h +noinst_PROGRAMS = fftw_threads_test rfftw_threads_test FFTWDIR=../fftw RFFTWDIR=../rfftw @@ -18,50 +18,54 @@ -I$(srcdir)/$(FFTWDIR) -I$(srcdir)/$(RFFTWDIR) -I$(srcdir) -libXXX_FFTW_PREFIX_XXXfftw_threads_la_SOURCES = \ +lib@FFTW_PREFIX@fftw_threads_la_SOURCES = \ executor_threads.c fftw_threads.c \ fftwnd_threads.c \ fftw_f77_threads.c \ - XXX_FFTW_PREFIX_XXXfftw_threads.h \ + @FFTW_PREFIX@fftw_threads.h \ fftw_threads-int.h -libXXX_FFTW_PREFIX_XXXfftw_threads_la_LDFLAGS = \ - -version-info @SHARED_VERSION_INFO@ \ - -rpath $(libdir) - -XXX_FFTW_PREFIX1_XXXfftw_threads.h: fftw_threads.h - rm -f XXX_FFTW_PREFIX_XXXfftw_threads.h - sed 's/ XXX_FFTW_PREFIX_XXXfftw_threads.h +lib@FFTW_PREFIX@fftw_threads_la_LDFLAGS = \ + -version-info @SHARED_VERSION_INFO@ +lib@FFTW_PREFIX@fftw_threads_la_LIBADD = \ + $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la -lpthread + +@FFTW_PREFIX1@fftw_threads.h: fftw_threads.h + rm -f @FFTW_PREFIX@fftw_threads.h + sed 's/ @FFTW_PREFIX@fftw_threads.h fftw_threads_test_SOURCES = fftw_threads_test.c fftw_threads_test_LDADD = ../tests/test_main.o \ - libXXX_FFTW_PREFIX_XXXfftw_threads.la \ - $(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la \ + lib@FFTW_PREFIX@fftw_threads.la \ + $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \ @THREADLIBS@ -libXXX_FFTW_PREFIX_XXXrfftw_threads_la_SOURCES = \ +lib@FFTW_PREFIX@rfftw_threads_la_SOURCES = \ rexec_threads.c rexec2_threads.c \ rfftwnd_threads.c \ rfftw_f77_threads.c \ - XXX_FFTW_PREFIX_XXXfftw_threads.h \ + @FFTW_PREFIX@fftw_threads.h \ fftw_threads-int.h \ - XXX_FFTW_PREFIX_XXXrfftw_threads.h -libXXX_FFTW_PREFIX_XXXrfftw_threads_la_LDFLAGS = \ - -version-info @SHARED_VERSION_INFO@ \ - -rpath $(libdir) - -XXX_FFTW_PREFIX1_XXXrfftw_threads.h: rfftw_threads.h - rm -f XXX_FFTW_PREFIX_XXXrfftw_threads.h - sed 's/ XXX_FFTW_PREFIX_XXXrfftw_threads.h + @FFTW_PREFIX@rfftw_threads.h +lib@FFTW_PREFIX@rfftw_threads_la_LDFLAGS = \ + -version-info @SHARED_VERSION_INFO@ +lib@FFTW_PREFIX@rfftw_threads_la_LIBADD = \ + lib@FFTW_PREFIX@fftw_threads.la \ + $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \ + $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la -lpthread + +@FFTW_PREFIX1@rfftw_threads.h: rfftw_threads.h + rm -f @FFTW_PREFIX@rfftw_threads.h + sed 's/ @FFTW_PREFIX@rfftw_threads.h -CLEANFILES = XXX_FFTW_PREFIX1_XXXfftw_threads.h \ - XXX_FFTW_PREFIX1_XXXrfftw_threads.h +CLEANFILES = @FFTW_PREFIX1@fftw_threads.h \ + @FFTW_PREFIX1@rfftw_threads.h rfftw_threads_test_SOURCES = rfftw_threads_test.c rfftw_threads_test_LDADD = ../tests/test_main.o \ - libXXX_FFTW_PREFIX_XXXrfftw_threads.la \ - libXXX_FFTW_PREFIX_XXXfftw_threads.la \ - $(RFFTWDIR)/libXXX_FFTW_PREFIX_XXXrfftw.la \ - $(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la \ + lib@FFTW_PREFIX@rfftw_threads.la \ + lib@FFTW_PREFIX@fftw_threads.la \ + $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \ + $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \ @THREADLIBS@ # for some reason, automake tries to use autoheader in order to --- fftw-2.1.3.orig/rfftw/Makefile.am +++ fftw-2.1.3/rfftw/Makefile.am @@ -1,8 +1,8 @@ # This file was automatically generated # DO NOT EDIT! # -lib_LTLIBRARIES = libXXX_FFTW_PREFIX_XXXrfftw.la -include_HEADERS = XXX_FFTW_PREFIX_XXXrfftw.h +lib_LTLIBRARIES = lib@FFTW_PREFIX@rfftw.la +include_HEADERS = @FFTW_PREFIX@rfftw.h INCLUDES = -I$(srcdir)/../fftw -I$(srcdir) NOTW_CODELETS= frc_1.c frc_2.c frc_3.c frc_4.c frc_5.c frc_6.c frc_7.c frc_8.c frc_9.c frc_10.c frc_11.c frc_12.c frc_13.c frc_14.c frc_15.c frc_16.c frc_32.c frc_64.c frc_128.c @@ -14,18 +14,19 @@ OTHERSRC = rconfig.c rplanner.c rexec.c rexec2.c rfftwnd.c rgeneric.c \ rfftwf77.c -libXXX_FFTW_PREFIX_XXXrfftw_la_SOURCES = $(CODELETS) $(OTHERSRC) \ +lib@FFTW_PREFIX@rfftw_la_SOURCES = $(CODELETS) $(OTHERSRC) \ rfftw.h -libXXX_FFTW_PREFIX_XXXrfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ +lib@FFTW_PREFIX@rfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ +#lib@FFTW_PREFIX@rfftw_la_LIBADD = $(srcdir)/fftw/lib@FFTW_PREFIX@fftw.la MAINTAINERCLEANFILES = $(CODELETS) rconfig.c DISTCLEANFILES = srfftw.h drfftw.h -XXX_FFTW_PREFIX1_XXXrfftw.h: rfftw.h - rm -f XXX_FFTW_PREFIX_XXXrfftw.h - sed 's/ XXX_FFTW_PREFIX_XXXrfftw.h +@FFTW_PREFIX1@rfftw.h: rfftw.h + rm -f @FFTW_PREFIX@rfftw.h + sed 's/ @FFTW_PREFIX@rfftw.h -CLEANFILES = XXX_FFTW_PREFIX1_XXXrfftw.h +CLEANFILES = @FFTW_PREFIX1@rfftw.h # for some reason, automake tries to use autoheader in order to # generate config.h.in, and fails because config.h.in is GNU-lly --- fftw-2.1.3.orig/fftw/Makefile.am +++ fftw-2.1.3/fftw/Makefile.am @@ -1,8 +1,8 @@ # This file was automatically generated # DO NOT EDIT! # -lib_LTLIBRARIES = libXXX_FFTW_PREFIX_XXXfftw.la -include_HEADERS = XXX_FFTW_PREFIX_XXXfftw.h +lib_LTLIBRARIES = lib@FFTW_PREFIX@fftw.la +include_HEADERS = @FFTW_PREFIX@fftw.h INCLUDES = -I$(srcdir)/../fftw -I$(srcdir) NOTW_CODELETS= fn_1.c fn_2.c fn_3.c fn_4.c fn_5.c fn_6.c fn_7.c fn_8.c fn_9.c fn_10.c fn_11.c fn_12.c fn_13.c fn_14.c fn_15.c fn_16.c fn_32.c fn_64.c @@ -15,18 +15,18 @@ generic.c fftwnd.c malloc.c wisdom.c wisdomio.c putils.c rader.c \ fftwf77.c f77_func.h -libXXX_FFTW_PREFIX_XXXfftw_la_SOURCES = $(CODELETS) $(OTHERSRC) \ +lib@FFTW_PREFIX@fftw_la_SOURCES = $(CODELETS) $(OTHERSRC) \ fftw.h fftw-int.h -libXXX_FFTW_PREFIX_XXXfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ +lib@FFTW_PREFIX@fftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ MAINTAINERCLEANFILES = $(CODELETS) config.c DISTCLEANFILES = fftw.h sfftw.h dfftw.h -XXX_FFTW_PREFIX1_XXXfftw.h: fftw.h - rm -f XXX_FFTW_PREFIX_XXXfftw.h - sed 's/ XXX_FFTW_PREFIX_XXXfftw.h +@FFTW_PREFIX1@fftw.h: fftw.h + rm -f @FFTW_PREFIX@fftw.h + sed 's/ @FFTW_PREFIX@fftw.h -CLEANFILES = XXX_FFTW_PREFIX1_XXXfftw.h +CLEANFILES = @FFTW_PREFIX1@fftw.h # for some reason, automake tries to use autoheader in order to # generate config.h.in, and fails because config.h.in is GNU-lly --- fftw-2.1.3.orig/tests/Makefile.am +++ fftw-2.1.3/tests/Makefile.am @@ -6,11 +6,11 @@ INCLUDES = -I$(srcdir)/$(FFTWDIR) -I$(srcdir)/$(RFFTWDIR) fftw_test_SOURCES = fftw_test.c test_main.c -fftw_test_LDADD = $(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la +fftw_test_LDADD = $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la rfftw_test_SOURCES = rfftw_test.c test_main.c -rfftw_test_LDADD = $(RFFTWDIR)/libXXX_FFTW_PREFIX_XXXrfftw.la \ - $(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la +rfftw_test_LDADD = $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \ + $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la check: fftw-tests rfftw-tests --- fftw-2.1.3.orig/mpi/Makefile.am +++ fftw-2.1.3/mpi/Makefile.am @@ -2,68 +2,74 @@ # the --enable-mpi option. This requires us to use the combination # of foo_* and EXTRA_* variables below. -lib_LTLIBRARIES = @FFTW_MPI_LIBLIST@ -include_HEADERS = @FFTW_MPI_INCLUDELIST@ -noinst_PROGRAMS = @FFTW_MPI_PROGLIST@ - -EXTRA_LTLIBRARIES = libXXX_FFTW_PREFIX_XXXfftw_mpi.la \ - libXXX_FFTW_PREFIX_XXXrfftw_mpi.la -EXTRA_HEADERS = XXX_FFTW_PREFIX_XXXfftw_mpi.h XXX_FFTW_PREFIX_XXXrfftw_mpi.h -EXTRA_PROGRAMS = test_sched test_transpose_mpi fftw_mpi_test rfftw_mpi_test +#lib_LTLIBRARIES = @FFTW_MPI_LIBLIST@ +#include_HEADERS = @FFTW_MPI_INCLUDELIST@ +#noinst_PROGRAMS = @FFTW_MPI_PROGLIST@ + +lib_LTLIBRARIES = lib@FFTW_PREFIX@fftw_mpi.la \ + lib@FFTW_PREFIX@rfftw_mpi.la +include_HEADERS = @FFTW_PREFIX@fftw_mpi.h @FFTW_PREFIX@rfftw_mpi.h +noinst_PROGRAMS = test_sched test_transpose_mpi fftw_mpi_test rfftw_mpi_test EXTRA_DIST = README.f77 -CC=@MPICC@ +#CC=@MPICC@ FFTWDIR=../fftw RFFTWDIR=../rfftw -INCLUDES = -I$(srcdir)/../tests \ +INCLUDES = -I$(srcdir)/../tests -I/usr/include/mpi \ -I$(srcdir)/$(FFTWDIR) -I$(srcdir)/$(RFFTWDIR) -I$(srcdir) -libXXX_FFTW_PREFIX_XXXfftw_mpi_la_SOURCES = \ +lib@FFTW_PREFIX@fftw_mpi_la_SOURCES = \ sched.c sched.h TOMS_transpose.c TOMS_transpose.h \ transpose_mpi.c fftwnd_mpi.c fftw_mpi.c \ - XXX_FFTW_PREFIX_XXXfftw_mpi.h \ + @FFTW_PREFIX@fftw_mpi.h \ fftw_f77_mpi.c fftw_f77_mpi.h -libXXX_FFTW_PREFIX_XXXfftw_mpi_la_LDFLAGS = \ - -version-info @SHARED_VERSION_INFO@ \ - -rpath $(libdir) - -XXX_FFTW_PREFIX1_XXXfftw_mpi.h: fftw_mpi.h - rm -f XXX_FFTW_PREFIX_XXXfftw_mpi.h - sed 's/ XXX_FFTW_PREFIX_XXXfftw_mpi.h +lib@FFTW_PREFIX@fftw_mpi_la_LDFLAGS = \ + -version-info @SHARED_VERSION_INFO@ +lib@FFTW_PREFIX@fftw_mpi_la_LIBADD = \ + $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \ + @MPILIBS@ -libXXX_FFTW_PREFIX_XXXrfftw_mpi_la_SOURCES = \ - rfftwnd_mpi.c XXX_FFTW_PREFIX_XXXrfftw_mpi.h \ + +@FFTW_PREFIX1@fftw_mpi.h: fftw_mpi.h + rm -f @FFTW_PREFIX@fftw_mpi.h + sed 's/ @FFTW_PREFIX@fftw_mpi.h + +lib@FFTW_PREFIX@rfftw_mpi_la_SOURCES = \ + rfftwnd_mpi.c @FFTW_PREFIX@rfftw_mpi.h \ rfftw_f77_mpi.c -libXXX_FFTW_PREFIX_XXXrfftw_mpi_la_LDFLAGS = \ - -version-info @SHARED_VERSION_INFO@ \ - -rpath $(libdir) - -XXX_FFTW_PREFIX1_XXXrfftw_mpi.h: rfftw_mpi.h - rm -f XXX_FFTW_PREFIX_XXXrfftw_mpi.h - sed 's/ XXX_FFTW_PREFIX_XXXrfftw_mpi.h +lib@FFTW_PREFIX@rfftw_mpi_la_LDFLAGS = \ + -version-info @SHARED_VERSION_INFO@ +lib@FFTW_PREFIX@rfftw_mpi_la_LIBADD = \ + lib@FFTW_PREFIX@fftw_mpi.la \ + $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \ + @MPILIBS@ + +@FFTW_PREFIX1@rfftw_mpi.h: rfftw_mpi.h + rm -f @FFTW_PREFIX@rfftw_mpi.h + sed 's/ @FFTW_PREFIX@rfftw_mpi.h -CLEANFILES = XXX_FFTW_PREFIX1_XXXfftw_mpi.h XXX_FFTW_PREFIX1_XXXrfftw_mpi.h +CLEANFILES = @FFTW_PREFIX1@fftw_mpi.h @FFTW_PREFIX1@rfftw_mpi.h test_sched_SOURCES = test_sched.c -test_sched_LDADD = libXXX_FFTW_PREFIX_XXXfftw_mpi.la \ - $(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la @MPILIBS@ +test_sched_LDADD = lib@FFTW_PREFIX@fftw_mpi.la \ + $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@ test_transpose_mpi_SOURCES = test_transpose_mpi.c -test_transpose_mpi_LDADD = libXXX_FFTW_PREFIX_XXXfftw_mpi.la \ - $(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la @MPILIBS@ +test_transpose_mpi_LDADD = lib@FFTW_PREFIX@fftw_mpi.la \ + $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@ fftw_mpi_test_SOURCES = fftw_mpi_test.c fftw_mpi_test_LDADD = ../tests/test_main.o \ - libXXX_FFTW_PREFIX_XXXfftw_mpi.la \ - $(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la @MPILIBS@ + lib@FFTW_PREFIX@fftw_mpi.la \ + $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@ rfftw_mpi_test_SOURCES = rfftw_mpi_test.c rfftw_mpi_test_LDADD = ../tests/test_main.o \ - libXXX_FFTW_PREFIX_XXXrfftw_mpi.la \ - libXXX_FFTW_PREFIX_XXXfftw_mpi.la \ - $(RFFTWDIR)/libXXX_FFTW_PREFIX_XXXrfftw.la \ - $(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la \ + 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@ # for some reason, automake tries to use autoheader in order to --- fftw-2.1.3.orig/gensrc/Makefile.fftw.am +++ fftw-2.1.3/gensrc/Makefile.fftw.am @@ -1,8 +1,8 @@ # This file was automatically generated # DO NOT EDIT! # -lib_LTLIBRARIES = libXXX_FFTW_PREFIX_XXXfftw.la -include_HEADERS = XXX_FFTW_PREFIX_XXXfftw.h +lib_LTLIBRARIES = lib@FFTW_PREFIX@fftw.la +include_HEADERS = @FFTW_PREFIX@fftw.h INCLUDES = -I$(srcdir)/../fftw -I$(srcdir) NOTW_CODELETS=@NOTW_CODELETS@ @@ -15,18 +15,18 @@ generic.c fftwnd.c malloc.c wisdom.c wisdomio.c putils.c rader.c \ fftwf77.c f77_func.h -libXXX_FFTW_PREFIX_XXXfftw_la_SOURCES = $(CODELETS) $(OTHERSRC) \ +lib@FFTW_PREFIX@fftw_la_SOURCES = $(CODELETS) $(OTHERSRC) \ fftw.h fftw-int.h -libXXX_FFTW_PREFIX_XXXfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ +lib@FFTW_PREFIX@fftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ MAINTAINERCLEANFILES = $(CODELETS) config.c DISTCLEANFILES = fftw.h sfftw.h dfftw.h -XXX_FFTW_PREFIX1_XXXfftw.h: fftw.h - rm -f XXX_FFTW_PREFIX_XXXfftw.h - sed 's/ XXX_FFTW_PREFIX_XXXfftw.h +@FFTW_PREFIX1@fftw.h: fftw.h + rm -f @FFTW_PREFIX@fftw.h + sed 's/ @FFTW_PREFIX@fftw.h -CLEANFILES = XXX_FFTW_PREFIX1_XXXfftw.h +CLEANFILES = @FFTW_PREFIX1@fftw.h # for some reason, automake tries to use autoheader in order to # generate config.h.in, and fails because config.h.in is GNU-lly --- fftw-2.1.3.orig/gensrc/Makefile.rfftw.am +++ fftw-2.1.3/gensrc/Makefile.rfftw.am @@ -1,8 +1,8 @@ # This file was automatically generated # DO NOT EDIT! # -lib_LTLIBRARIES = libXXX_FFTW_PREFIX_XXXrfftw.la -include_HEADERS = XXX_FFTW_PREFIX_XXXrfftw.h +lib_LTLIBRARIES = lib@FFTW_PREFIX@rfftw.la +include_HEADERS = @FFTW_PREFIX@rfftw.h INCLUDES = -I$(srcdir)/../fftw -I$(srcdir) NOTW_CODELETS=@NOTW_CODELETS@ @@ -14,18 +14,19 @@ OTHERSRC = rconfig.c rplanner.c rexec.c rexec2.c rfftwnd.c rgeneric.c \ rfftwf77.c -libXXX_FFTW_PREFIX_XXXrfftw_la_SOURCES = $(CODELETS) $(OTHERSRC) \ +lib@FFTW_PREFIX@rfftw_la_SOURCES = $(CODELETS) $(OTHERSRC) \ rfftw.h -libXXX_FFTW_PREFIX_XXXrfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ +lib@FFTW_PREFIX@rfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ +lib@FFTW_PREFIX@rfftw_la_LIBADD = $(FFTWDIR)/fftw/lib@FFTW_PREFIX@fftw.la MAINTAINERCLEANFILES = $(CODELETS) rconfig.c DISTCLEANFILES = srfftw.h drfftw.h -XXX_FFTW_PREFIX1_XXXrfftw.h: rfftw.h - rm -f XXX_FFTW_PREFIX_XXXrfftw.h - sed 's/ XXX_FFTW_PREFIX_XXXrfftw.h +@FFTW_PREFIX1@rfftw.h: rfftw.h + rm -f @FFTW_PREFIX@rfftw.h + sed 's/ @FFTW_PREFIX@rfftw.h -CLEANFILES = XXX_FFTW_PREFIX1_XXXrfftw.h +CLEANFILES = @FFTW_PREFIX1@rfftw.h # for some reason, automake tries to use autoheader in order to # generate config.h.in, and fails because config.h.in is GNU-lly