Do not set include path ("-I") in Makefile.am

.[ch] files should specify their own paths explicitly. Setting paths in the Makefile was always a bad idea, but it is totally untenable if we are supporting cmake.
elktk · Sep 20, 2017 · 1f3704b · 1f3704b
1 parent 6e0ae04
commit 1f3704b
Show file tree

Hide file tree

Showing 308 changed files with 399 additions and 450 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -241,27 +241,11 @@ set (fftw_threads_SOURCE ${fftw_par_SOURCE} threads/threads.c)
 set (fftw_omp_SOURCE ${fftw_par_SOURCE} threads/openmp.c)
 
 
-include_directories(
-    kernel
-    api
-    dft
-    dft/scalar
-    dft/scalar/codelets # really needed?
-    dft/simd
-    dft/simd/sse2
-    dft/simd/avx
-    rdft
-    rdft/scalar
-    rdft/simd
-    reodft
-    simd-support
-    libbench2
-)
+include_directories(.)
 
 install (FILES api/fftw3.h api/fftw3.f DESTINATION include)
 
 
-
 if (WITH_COMBINED_THREADS)
   list (APPEND SOURCEFILES ${fftw_threads_SOURCE})
 endif ()

diff --git a/api/Makefile.am b/api/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/kernel -I$(top_srcdir)/dft		\
--I$(top_srcdir)/rdft -I$(top_srcdir)/reodft
 AM_CFLAGS = $(STACK_ALIGN_CFLAGS)
 
 EXTRA_DIST = f03api.sh genf03.pl fftw3.f03.in

diff --git a/api/api.h b/api/api.h
@@ -49,9 +49,9 @@
    and is defined even if <complex.h> is not included) */
 #define FFTW_NO_Complex
 
-#include "fftw3.h"
-#include "ifftw.h"
-#include "rdft.h"
+#include "api/fftw3.h"
+#include "kernel/ifftw.h"
+#include "rdft/rdft.h"
 
 #ifdef __cplusplus
 extern "C"

diff --git a/api/apiplan.c b/api/apiplan.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 static planner_hook_t before_planner_hook = 0, after_planner_hook = 0;
 

diff --git a/api/configure.c b/api/configure.c
@@ -18,10 +18,10 @@
  *
  */
 
-#include "api.h"
-#include "dft.h"
-#include "rdft.h"
-#include "reodft.h"
+#include "api/api.h"
+#include "dft/dft.h"
+#include "rdft/rdft.h"
+#include "reodft/reodft.h"
 
 void X(configure_planner)(planner *plnr)
 {

diff --git a/api/execute-dft-c2r.c b/api/execute-dft-c2r.c
@@ -18,8 +18,8 @@
  *
  */
 
-#include "api.h"
-#include "rdft.h"
+#include "api/api.h"
+#include "rdft/rdft.h"
 
 /* guru interface: requires care in alignment, r - i, etcetera. */
 void X(execute_dft_c2r)(const X(plan) p, C *in, R *out)

diff --git a/api/execute-dft-r2c.c b/api/execute-dft-r2c.c
@@ -18,8 +18,8 @@
  *
  */
 
-#include "api.h"
-#include "rdft.h"
+#include "api/api.h"
+#include "rdft/rdft.h"
 
 /* guru interface: requires care in alignment, r - i, etcetera. */
 void X(execute_dft_r2c)(const X(plan) p, R *in, C *out)

diff --git a/api/execute-dft.c b/api/execute-dft.c
@@ -18,8 +18,8 @@
  *
  */
 
-#include "api.h"
-#include "dft.h"
+#include "api/api.h"
+#include "dft/dft.h"
 
 /* guru interface: requires care in alignment etcetera. */
 void X(execute_dft)(const X(plan) p, C *in, C *out)

diff --git a/api/execute-r2r.c b/api/execute-r2r.c
@@ -18,8 +18,8 @@
  *
  */
 
-#include "api.h"
-#include "rdft.h"
+#include "api/api.h"
+#include "rdft/rdft.h"
 
 /* guru interface: requires care in alignment, etcetera. */
 void X(execute_r2r)(const X(plan) p, R *in, R *out)

diff --git a/api/execute-split-dft-c2r.c b/api/execute-split-dft-c2r.c
@@ -18,8 +18,8 @@
  *
  */
 
-#include "api.h"
-#include "rdft.h"
+#include "api/api.h"
+#include "rdft/rdft.h"
 
 /* guru interface: requires care in alignment, r - i, etcetera. */
 void X(execute_split_dft_c2r)(const X(plan) p, R *ri, R *ii, R *out)

diff --git a/api/execute-split-dft-r2c.c b/api/execute-split-dft-r2c.c
@@ -18,8 +18,8 @@
  *
  */
 
-#include "api.h"
-#include "rdft.h"
+#include "api/api.h"
+#include "rdft/rdft.h"
 
 /* guru interface: requires care in alignment, r - i, etcetera. */
 void X(execute_split_dft_r2c)(const X(plan) p, R *in, R *ro, R *io)

diff --git a/api/execute-split-dft.c b/api/execute-split-dft.c
@@ -18,8 +18,8 @@
  *
  */
 
-#include "api.h"
-#include "dft.h"
+#include "api/api.h"
+#include "dft/dft.h"
 
 /* guru interface: requires care in alignment, r - i, etcetera. */
 void X(execute_split_dft)(const X(plan) p, R *ri, R *ii, R *ro, R *io)

diff --git a/api/execute.c b/api/execute.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 void X(execute)(const X(plan) p)
 {

diff --git a/api/export-wisdom-to-file.c b/api/export-wisdom-to-file.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 void X(export_wisdom_to_file)(FILE *output_file)
 {

diff --git a/api/export-wisdom-to-string.c b/api/export-wisdom-to-string.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 char *X(export_wisdom_to_string)(void)
 {

diff --git a/api/export-wisdom.c b/api/export-wisdom.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 typedef struct {
      printer super;

diff --git a/api/f77api.c b/api/f77api.c
@@ -18,11 +18,11 @@
  *
  */
 
-#include "api.h"
-#include "dft.h"
-#include "rdft.h"
+#include "api/api.h"
+#include "dft/dft.h"
+#include "rdft/rdft.h"
 
-#include "x77.h"
+#include "api/x77.h"
 
 /* if F77_FUNC is not defined, then we don't know how to mangle identifiers
    for the Fortran linker, and we must omit the f77 API. */

diff --git a/api/flops.c b/api/flops.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 void X(flops)(const X(plan) p, double *add, double *mul, double *fma)
 {

diff --git a/api/forget-wisdom.c b/api/forget-wisdom.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 void X(forget_wisdom)(void)
 {

diff --git a/api/import-system-wisdom.c b/api/import-system-wisdom.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 #if defined(FFTW_SINGLE)
 #  define WISDOM_NAME "wisdomf"

diff --git a/api/import-wisdom-from-file.c b/api/import-wisdom-from-file.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 #include <stdio.h>
 
 /* getc()/putc() are *unbelievably* slow on linux.  Looks like glibc

diff --git a/api/import-wisdom-from-string.c b/api/import-wisdom-from-string.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 typedef struct {
      scanner super;

diff --git a/api/import-wisdom.c b/api/import-wisdom.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 typedef struct {
      scanner super;

diff --git a/api/malloc.c b/api/malloc.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 
 void *X(malloc)(size_t n)

diff --git a/api/map-r2r-kind.c b/api/map-r2r-kind.c
@@ -18,8 +18,8 @@
  *
  */
 
-#include "api.h"
-#include "rdft.h"
+#include "api/api.h"
+#include "rdft/rdft.h"
 
 rdft_kind *X(map_r2r_kind)(int rank, const X(r2r_kind) * kind)
 {

diff --git a/api/mapflags.c b/api/mapflags.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 #include <math.h>
 
 /* a flag operation: x is either a flag, in which case xm == 0, or

diff --git a/api/mkprinter-file.c b/api/mkprinter-file.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 #include <stdio.h>
 
 #define BUFSZ 256

diff --git a/api/mkprinter-str.c b/api/mkprinter-str.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 typedef struct {
      printer super;

diff --git a/api/mktensor-iodims.h b/api/mktensor-iodims.h
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 tensor *MKTENSOR_IODIMS(int rank, const IODIM *dims, int is, int os)
 {

diff --git a/api/mktensor-rowmajor.c b/api/mktensor-rowmajor.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 tensor *X(mktensor_rowmajor)(int rnk, const int *n,
 			     const int *niphys, const int *nophys,

diff --git a/api/plan-dft-1d.c b/api/plan-dft-1d.c
@@ -18,8 +18,8 @@
  *
  */
 
-#include "api.h"
-#include "dft.h"
+#include "api/api.h"
+#include "dft/dft.h"
 
 X(plan) X(plan_dft_1d)(int n, C *in, C *out, int sign, unsigned flags)
 {

diff --git a/api/plan-dft-2d.c b/api/plan-dft-2d.c
@@ -18,8 +18,8 @@
  *
  */
 
-#include "api.h"
-#include "dft.h"
+#include "api/api.h"
+#include "dft/dft.h"
 
 X(plan) X(plan_dft_2d)(int nx, int ny, C *in, C *out, int sign, unsigned flags)
 {

diff --git a/api/plan-dft-3d.c b/api/plan-dft-3d.c
@@ -18,8 +18,8 @@
  *
  */
 
-#include "api.h"
-#include "dft.h"
+#include "api/api.h"
+#include "dft/dft.h"
 
 X(plan) X(plan_dft_3d)(int nx, int ny, int nz,
 		       C *in, C *out, int sign, unsigned flags)

diff --git a/api/plan-dft-c2r-1d.c b/api/plan-dft-c2r-1d.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 X(plan) X(plan_dft_c2r_1d)(int n, C *in, R *out, unsigned flags)
 {

diff --git a/api/plan-dft-c2r-2d.c b/api/plan-dft-c2r-2d.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 X(plan) X(plan_dft_c2r_2d)(int nx, int ny, C *in, R *out, unsigned flags)
 {

diff --git a/api/plan-dft-c2r-3d.c b/api/plan-dft-c2r-3d.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 X(plan) X(plan_dft_c2r_3d)(int nx, int ny, int nz,
 			   C *in, R *out, unsigned flags)

diff --git a/api/plan-dft-c2r.c b/api/plan-dft-c2r.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 X(plan) X(plan_dft_c2r)(int rank, const int *n, C *in, R *out, unsigned flags)
 {

diff --git a/api/plan-dft-r2c-1d.c b/api/plan-dft-r2c-1d.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "api.h"
+#include "api/api.h"
 
 X(plan) X(plan_dft_r2c_1d)(int n, R *in, C *out, unsigned flags)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ @@
      *
      */
-    #include "api.h"
+    #include "api/api.h"
     static planner_hook_t before_planner_hook = 0, after_planner_hook = 0;
@@ Expand Down @@