diff --git a/contribs/pam/Makefile.am b/contribs/pam/Makefile.am index 25c3a2f1ff61a2419f3d8a0008db58a3f92500ce..799c7e63d26d7dbb72f4a7739470ff215b7721cf 100644 --- a/contribs/pam/Makefile.am +++ b/contribs/pam/Makefile.am @@ -4,8 +4,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -fPIC -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -fPIC -I$(top_srcdir) -I$(top_srcdir)/src/common PLUGIN_FLAGS = -module --export-dynamic -avoid-version pkglibdir = $(PAM_DIR) diff --git a/src/api/Makefile.am b/src/api/Makefile.am index d78c4d53889c1c3a297ea63941877135a2455b3f..f5ef0ff0064cc4fe7f7ee934c9aa926ce26259db 100644 --- a/src/api/Makefile.am +++ b/src/api/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) if WITH_GNU_LD VERSION_SCRIPT = \ diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 1ff1fe6d8b1d5b0ae3b760a07ad9096d52de4295..a0d6325328c0d2b84193f2ac67043e05e5311df7 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -18,7 +18,7 @@ build_unsetenv_src = unsetenv.c unsetenv.h extra_unsetenv_src = endif -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) $(HWLOC_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) $(HWLOC_CPPFLAGS) noinst_PROGRAMS = libcommon.o libeio.o libspank.o # This is needed if compiling on windows diff --git a/src/database/Makefile.am b/src/database/Makefile.am index 8bd82e8da1694f423c9ea36e83471107cbeb8f67..46bcf4636e03c1a1a597ecaaeb2421f4a1ac387d 100644 --- a/src/database/Makefile.am +++ b/src/database/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common if WITH_MYSQL MYSQL_LIB = libslurm_mysql.la diff --git a/src/db_api/Makefile.am b/src/db_api/Makefile.am index 4b392b53201c6ccff85d3585fb31c40ed894236f..246a6c6c670ce976f15e68ba9052f9c8a2d52969 100644 --- a/src/db_api/Makefile.am +++ b/src/db_api/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) if WITH_GNU_LD VERSION_SCRIPT = \ diff --git a/src/plugins/accounting_storage/common/Makefile.am b/src/plugins/accounting_storage/common/Makefile.am index 92545763292275ef0b3442a6a4f197092c7d6f33..53a6071dece8195ef82609c4715ccb1f57ea3be6 100644 --- a/src/plugins/accounting_storage/common/Makefile.am +++ b/src/plugins/accounting_storage/common/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) # making a .la diff --git a/src/plugins/accounting_storage/filetxt/Makefile.am b/src/plugins/accounting_storage/filetxt/Makefile.am index 85a83d5eb88437e473031fad75c239c4e07ff0fe..72a37a48a935371ef8edd9855f3bfee7a1c6000b 100644 --- a/src/plugins/accounting_storage/filetxt/Makefile.am +++ b/src/plugins/accounting_storage/filetxt/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = accounting_storage_filetxt.la diff --git a/src/plugins/accounting_storage/mysql/Makefile.am b/src/plugins/accounting_storage/mysql/Makefile.am index a884637904fadc302f2ef7634242bd900b784889..d7cfbb3784ebfee9c27d5f27c31914f75acd63d1 100644 --- a/src/plugins/accounting_storage/mysql/Makefile.am +++ b/src/plugins/accounting_storage/mysql/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common AS_MYSQL_SOURCES = accounting_storage_mysql.c accounting_storage_mysql.h \ as_mysql_acct.c as_mysql_acct.h \ diff --git a/src/plugins/accounting_storage/none/Makefile.am b/src/plugins/accounting_storage/none/Makefile.am index 338e0c6a5ae63af3e25c47a3750ac556f0b9e434..a6da95f3338a206709becdef4b66432c2d29036d 100644 --- a/src/plugins/accounting_storage/none/Makefile.am +++ b/src/plugins/accounting_storage/none/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = accounting_storage_none.la diff --git a/src/plugins/accounting_storage/pgsql/Makefile.am b/src/plugins/accounting_storage/pgsql/Makefile.am index d8b11af8d6823ded573fce3bcc5d614596a0bbdd..b77f560c800f8d826ef7636a64d30ea5d52f7895 100644 --- a/src/plugins/accounting_storage/pgsql/Makefile.am +++ b/src/plugins/accounting_storage/pgsql/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common AS_PG_SOURCES= accounting_storage_pgsql.c accounting_storage_pgsql.h \ as_pg_common.c as_pg_common.h \ diff --git a/src/plugins/accounting_storage/slurmdbd/Makefile.am b/src/plugins/accounting_storage/slurmdbd/Makefile.am index c52d160847f31daa5cd23fe10e91768b4fe05fc1..8f5b20855aba8b697f2161c9f716fc9dc0731cb6 100644 --- a/src/plugins/accounting_storage/slurmdbd/Makefile.am +++ b/src/plugins/accounting_storage/slurmdbd/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = accounting_storage_slurmdbd.la diff --git a/src/plugins/acct_gather_energy/ipmi/Makefile.am b/src/plugins/acct_gather_energy/ipmi/Makefile.am index c1215800c8c437c986d3300c390e5b691eb3b3b2..7ec336c4604ae37f79c6ce5088c311d3e7bf3187 100644 --- a/src/plugins/acct_gather_energy/ipmi/Makefile.am +++ b/src/plugins/acct_gather_energy/ipmi/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(FREEIPMI_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(FREEIPMI_CPPFLAGS) if BUILD_IPMI diff --git a/src/plugins/acct_gather_energy/none/Makefile.am b/src/plugins/acct_gather_energy/none/Makefile.am index 332a904aab51252201d6d633fe68a344f4b36586..337661fd8145829dec2322448b665617a0e11e4f 100644 --- a/src/plugins/acct_gather_energy/none/Makefile.am +++ b/src/plugins/acct_gather_energy/none/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_energy_none.la diff --git a/src/plugins/acct_gather_energy/rapl/Makefile.am b/src/plugins/acct_gather_energy/rapl/Makefile.am index d671bdf4c793bf4244be522a3b61a42123725514..e13073a80373601db8ad33c096ed49333ff753a5 100644 --- a/src/plugins/acct_gather_energy/rapl/Makefile.am +++ b/src/plugins/acct_gather_energy/rapl/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_energy_rapl.la diff --git a/src/plugins/acct_gather_filesystem/lustre/Makefile.am b/src/plugins/acct_gather_filesystem/lustre/Makefile.am index 476e129af73a05e6e29799a0422a05470925c8a2..529727eedb9779f12a6dd01d6c77056c92cd796f 100644 --- a/src/plugins/acct_gather_filesystem/lustre/Makefile.am +++ b/src/plugins/acct_gather_filesystem/lustre/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common PLUGIN_FLAGS = -module -avoid-version --export-dynamic diff --git a/src/plugins/acct_gather_filesystem/none/Makefile.am b/src/plugins/acct_gather_filesystem/none/Makefile.am index 18bf771ecf0b1955f3fbb79fc771a307c51300c3..007d84d340a8ab6df66f17cb3770f53e0b0c259a 100644 --- a/src/plugins/acct_gather_filesystem/none/Makefile.am +++ b/src/plugins/acct_gather_filesystem/none/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_filesystem_none.la diff --git a/src/plugins/acct_gather_infiniband/none/Makefile.am b/src/plugins/acct_gather_infiniband/none/Makefile.am index d7f212edf5a2ba9f8faeed9e0043d3d86fa1dbac..69d851fcbf6427d6e06e2b3698659e0bca7eb75a 100644 --- a/src/plugins/acct_gather_infiniband/none/Makefile.am +++ b/src/plugins/acct_gather_infiniband/none/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_infiniband_none.la diff --git a/src/plugins/acct_gather_infiniband/ofed/Makefile.am b/src/plugins/acct_gather_infiniband/ofed/Makefile.am index ad77d8bf6ec872a472b5028108f4ed24fa337bc7..e54c46623378df7c5ef7ce68ce7b3c3590eb68a1 100644 --- a/src/plugins/acct_gather_infiniband/ofed/Makefile.am +++ b/src/plugins/acct_gather_infiniband/ofed/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common if BUILD_OFED diff --git a/src/plugins/acct_gather_profile/hdf5/Makefile.am b/src/plugins/acct_gather_profile/hdf5/Makefile.am index e19b873b9bf9164e2686d685211140db30cced8e..0d3d6f7df53e5864c76f4600ef9b658e2ad23322 100644 --- a/src/plugins/acct_gather_profile/hdf5/Makefile.am +++ b/src/plugins/acct_gather_profile/hdf5/Makefile.am @@ -6,7 +6,7 @@ PLUGIN_FLAGS = -module -avoid-version --export-dynamic # Do not put a link to common here. src/common contains an mpi.h which # hdf5 could of been installed with a link to the generic mpi.h. -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) # cpu/core energy accounting plugin. HDF5_SOURCES = acct_gather_profile_hdf5.c diff --git a/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.am b/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.am index dadb2a81f90b93274124300ee4bb6c926b12632e..9d3ac00725feac5b9b452d84e80e66c6abc07fd8 100644 --- a/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.am +++ b/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign # Do not put a link to common here. src/common contains an mpi.h which # hdf5 could of been installed with a link to the generic mpi.h. -INCLUDES = -I$(top_srcdir) -I../ +AM_CPPFLAGS = -I$(top_srcdir) -I../ SHDF5_SOURCES = sh5util.c diff --git a/src/plugins/acct_gather_profile/none/Makefile.am b/src/plugins/acct_gather_profile/none/Makefile.am index cc5d507772b1ddcba5a764bfe4df4a9613cb48b9..451caab506970b442d6ebe0355439d456b6f6744 100644 --- a/src/plugins/acct_gather_profile/none/Makefile.am +++ b/src/plugins/acct_gather_profile/none/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_profile_none.la diff --git a/src/plugins/auth/authd/Makefile.am b/src/plugins/auth/authd/Makefile.am index 6d943cf19261bbe06b0933b1f25e58a35a526048..7e44d89547608e94d4f9b766bb746da7db734653 100644 --- a/src/plugins/auth/authd/Makefile.am +++ b/src/plugins/auth/authd/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common # Add your plugin to this line, following the naming conventions. if WITH_AUTHD diff --git a/src/plugins/auth/munge/Makefile.am b/src/plugins/auth/munge/Makefile.am index baafe57d001961d9a8a3244fa0df53d8b580453b..ebf4c04b6574386426b21bb8ec92f57e1fe2c27c 100644 --- a/src/plugins/auth/munge/Makefile.am +++ b/src/plugins/auth/munge/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(MUNGE_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(MUNGE_CPPFLAGS) # Add your plugin to this line, following the naming conventions. if WITH_MUNGE diff --git a/src/plugins/auth/none/Makefile.am b/src/plugins/auth/none/Makefile.am index 238a90d1a1499648ac7c37344286f7f65cff02c1..8a59782895487089280599f88c95c8da53eb3b05 100644 --- a/src/plugins/auth/none/Makefile.am +++ b/src/plugins/auth/none/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = auth_none.la diff --git a/src/plugins/checkpoint/aix/Makefile.am b/src/plugins/checkpoint/aix/Makefile.am index 071c72dbf2abf3cfab7f359a1108829f26a17850..514efc76500d6c89441308bfe826f21f2874647a 100644 --- a/src/plugins/checkpoint/aix/Makefile.am +++ b/src/plugins/checkpoint/aix/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common # AIX checkpoint plugin. if HAVE_AIX diff --git a/src/plugins/checkpoint/blcr/Makefile.am b/src/plugins/checkpoint/blcr/Makefile.am index f00b96bb38a22abb2029786f5d9c527e72e281ce..5059996a2564ddb520950bd001cb9c44b24d2972 100644 --- a/src/plugins/checkpoint/blcr/Makefile.am +++ b/src/plugins/checkpoint/blcr/Makefile.am @@ -2,12 +2,11 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" +AM_CPPFLAGS = -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \ + -I$(top_srcdir) -I$(top_srcdir)/src/common PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common - if WITH_BLCR pkglib_LTLIBRARIES = checkpoint_blcr.la checkpoint_blcr_la_SOURCES = checkpoint_blcr.c diff --git a/src/plugins/checkpoint/none/Makefile.am b/src/plugins/checkpoint/none/Makefile.am index 1ce67ad0608a11796469ca8d77720394ccc651cd..bb4cd44805fcfcef0209327e1e1c31627038fdaa 100644 --- a/src/plugins/checkpoint/none/Makefile.am +++ b/src/plugins/checkpoint/none/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = checkpoint_none.la diff --git a/src/plugins/checkpoint/ompi/Makefile.am b/src/plugins/checkpoint/ompi/Makefile.am index e2f5f74b594a582be2e94aab18b3c505c66d00c9..29ad130db935c0d4b487419eea08e11ed4699c23 100644 --- a/src/plugins/checkpoint/ompi/Makefile.am +++ b/src/plugins/checkpoint/ompi/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = checkpoint_ompi.la diff --git a/src/plugins/checkpoint/poe/Makefile.am b/src/plugins/checkpoint/poe/Makefile.am index 2911e17770028da6800d7bdf5c14bbef77635c34..4e631728fbf77da997f21cd1ab6fe2454f0dd323 100644 --- a/src/plugins/checkpoint/poe/Makefile.am +++ b/src/plugins/checkpoint/poe/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common # POE checkpoint plugin. if DONT_BUILD diff --git a/src/plugins/crypto/munge/Makefile.am b/src/plugins/crypto/munge/Makefile.am index 12d0f74d97eeebd852cc9c74eeb1b7b6c9dbbf40..c4a9bee49ac7fa7b799b3afa4e9c56c75a1307c8 100644 --- a/src/plugins/crypto/munge/Makefile.am +++ b/src/plugins/crypto/munge/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(MUNGE_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(MUNGE_CPPFLAGS) # Add your plugin to this line, following the naming conventions. if WITH_MUNGE diff --git a/src/plugins/crypto/openssl/Makefile.am b/src/plugins/crypto/openssl/Makefile.am index 3765f8fb9a0a150b6ef8e3593c14ffca74c7d7a9..b997cae66a799a19522f1748ba77b8812535c83d 100644 --- a/src/plugins/crypto/openssl/Makefile.am +++ b/src/plugins/crypto/openssl/Makefile.am @@ -10,7 +10,7 @@ endif PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) $(SSL_CPPFLAGS) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) $(SSL_CPPFLAGS) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = $(openssl_lib) diff --git a/src/plugins/ext_sensors/none/Makefile.am b/src/plugins/ext_sensors/none/Makefile.am index 1c88177d5657849bd2786a51ff4273b849d71ecf..adac0555c8e029bb2d3b52cdcabce3a4d884c663 100644 --- a/src/plugins/ext_sensors/none/Makefile.am +++ b/src/plugins/ext_sensors/none/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = ext_sensors_none.la diff --git a/src/plugins/ext_sensors/rrd/Makefile.am b/src/plugins/ext_sensors/rrd/Makefile.am index 36a5c1fbf4712a4554093f00f64a79b86b9241ec..c8c25b14d26e1e02b21133987314856ed2854d31 100644 --- a/src/plugins/ext_sensors/rrd/Makefile.am +++ b/src/plugins/ext_sensors/rrd/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(RRDTOOL_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(RRDTOOL_CPPFLAGS) if BUILD_RRD PLUGIN_FLAGS = -module -avoid-version --export-dynamic diff --git a/src/plugins/gres/gpu/Makefile.am b/src/plugins/gres/gpu/Makefile.am index 58f5c1ce308f3df3505b53102c1180aeed638a5a..8b8196b69ab1ff80f8be6c2b2b6440221fcfbeb9 100644 --- a/src/plugins/gres/gpu/Makefile.am +++ b/src/plugins/gres/gpu/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) pkglib_LTLIBRARIES = gres_gpu.la diff --git a/src/plugins/gres/mic/Makefile.am b/src/plugins/gres/mic/Makefile.am index 3c145cf6afe128d5953accbbfe909afc26c0133c..cfad49e4a020fb06098676218527760e1bfa2451 100644 --- a/src/plugins/gres/mic/Makefile.am +++ b/src/plugins/gres/mic/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) pkglib_LTLIBRARIES = gres_mic.la diff --git a/src/plugins/gres/nic/Makefile.am b/src/plugins/gres/nic/Makefile.am index 93d288a57372c48a87180e799281cd95bf1c3149..674ed3abf0cf16d512c387bb65909dc56052eb72 100644 --- a/src/plugins/gres/nic/Makefile.am +++ b/src/plugins/gres/nic/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) pkglib_LTLIBRARIES = gres_nic.la diff --git a/src/plugins/job_submit/all_partitions/Makefile.am b/src/plugins/job_submit/all_partitions/Makefile.am index c9a6e0ecf0b1d9f336b71a142690acf323922649..e1f56a1664c6e900d443eac3e5faf6387367961a 100644 --- a/src/plugins/job_submit/all_partitions/Makefile.am +++ b/src/plugins/job_submit/all_partitions/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_all_partitions.la diff --git a/src/plugins/job_submit/cnode/Makefile.am b/src/plugins/job_submit/cnode/Makefile.am index 871cbe5184c25c9a75859af1c6fc95f32ed40ec2..0a0e897a9e9e2b3ef36acfbf21f4417386fa554b 100644 --- a/src/plugins/job_submit/cnode/Makefile.am +++ b/src/plugins/job_submit/cnode/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_cnode.la diff --git a/src/plugins/job_submit/defaults/Makefile.am b/src/plugins/job_submit/defaults/Makefile.am index ff2506d09f1114d10add6f9c54323418bfdd03d3..e7182cf8fc5340acf1c53fdc3b4b62bd0455b4df 100644 --- a/src/plugins/job_submit/defaults/Makefile.am +++ b/src/plugins/job_submit/defaults/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_defaults.la diff --git a/src/plugins/job_submit/logging/Makefile.am b/src/plugins/job_submit/logging/Makefile.am index 3f0290da36d19ad5fd065ae72439b4ce7d955a1e..0326d1220482a06b46211d014a5a908ab95465e0 100644 --- a/src/plugins/job_submit/logging/Makefile.am +++ b/src/plugins/job_submit/logging/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_logging.la diff --git a/src/plugins/job_submit/lua/Makefile.am b/src/plugins/job_submit/lua/Makefile.am index dd7f354d3c403965118cad25176c9b7b5346835a..2a94e23d64a5826fcb4cf6f0c3e411cb4178b658 100644 --- a/src/plugins/job_submit/lua/Makefile.am +++ b/src/plugins/job_submit/lua/Makefile.am @@ -2,10 +2,10 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" +AM_CPPFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" \ + -I$(top_srcdir) -I$(top_srcdir)/src/common $(lua_CFLAGS) PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(lua_CFLAGS) if HAVE_LUA diff --git a/src/plugins/job_submit/partition/Makefile.am b/src/plugins/job_submit/partition/Makefile.am index 7db6073e1d130ce8ab75a6618157dd6191066eb1..c6aef859c1070ce260118f8887db7fa546188ae9 100644 --- a/src/plugins/job_submit/partition/Makefile.am +++ b/src/plugins/job_submit/partition/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_partition.la diff --git a/src/plugins/jobacct_gather/aix/Makefile.am b/src/plugins/jobacct_gather/aix/Makefile.am index 97f8ebfb4d5a2b25f442106d14388040aeeadc5c..1a9ccc3f1464c859888686b0424f889ff9469c72 100644 --- a/src/plugins/jobacct_gather/aix/Makefile.am +++ b/src/plugins/jobacct_gather/aix/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobacct_gather_aix.la diff --git a/src/plugins/jobacct_gather/cgroup/Makefile.am b/src/plugins/jobacct_gather/cgroup/Makefile.am index 5f9a70cecd6344c848bd31fdea1bd6bdc0d9fef9..50a6e0c859c339550ed2ee14edd4b0d16a2d24a1 100644 --- a/src/plugins/jobacct_gather/cgroup/Makefile.am +++ b/src/plugins/jobacct_gather/cgroup/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobacct_gather_cgroup.la diff --git a/src/plugins/jobacct_gather/linux/Makefile.am b/src/plugins/jobacct_gather/linux/Makefile.am index 68d280a3741b2a0d63def914e30bdc11dd095c46..a8ae60858b87871e737f5aed749274012a6bf144 100644 --- a/src/plugins/jobacct_gather/linux/Makefile.am +++ b/src/plugins/jobacct_gather/linux/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobacct_gather_linux.la diff --git a/src/plugins/jobacct_gather/none/Makefile.am b/src/plugins/jobacct_gather/none/Makefile.am index 84ec9ffdac03ee42e686b14e7373257edb8a8bc0..412fdf81e46fad193839beccff65caa0daf474c8 100644 --- a/src/plugins/jobacct_gather/none/Makefile.am +++ b/src/plugins/jobacct_gather/none/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobacct_gather_none.la diff --git a/src/plugins/jobcomp/filetxt/Makefile.am b/src/plugins/jobcomp/filetxt/Makefile.am index dc958ba7f7c23f46a8d8655ee427d8205196e561..aff5faddcd91ea683c19d4dc897c74418c69c961 100644 --- a/src/plugins/jobcomp/filetxt/Makefile.am +++ b/src/plugins/jobcomp/filetxt/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobcomp_filetxt.la diff --git a/src/plugins/jobcomp/mysql/Makefile.am b/src/plugins/jobcomp/mysql/Makefile.am index 5b01a39a9180e272de58f1756fb61d16dc9a3579..962b9fe6944de7c2a8959299c3fd59a5236e073e 100644 --- a/src/plugins/jobcomp/mysql/Makefile.am +++ b/src/plugins/jobcomp/mysql/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common if WITH_MYSQL pkglib_LTLIBRARIES = jobcomp_mysql.la diff --git a/src/plugins/jobcomp/none/Makefile.am b/src/plugins/jobcomp/none/Makefile.am index fa713024073be1c3c249069d003786cb17c7e6d1..82ed6f232ca21d9ca7aa570b0cd95cc546e67d25 100644 --- a/src/plugins/jobcomp/none/Makefile.am +++ b/src/plugins/jobcomp/none/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobcomp_none.la diff --git a/src/plugins/jobcomp/pgsql/Makefile.am b/src/plugins/jobcomp/pgsql/Makefile.am index 456a272e67f871a70e8ecc77b6d7119edd756f47..9ea9e3724ac1f0cce6170d10964b2dd28888e84f 100644 --- a/src/plugins/jobcomp/pgsql/Makefile.am +++ b/src/plugins/jobcomp/pgsql/Makefile.am @@ -1,12 +1,11 @@ # Makefile for jobcomp/pgsql plugin -AM_CPPFLAGS = $(PGSQL_CFLAGS) +AM_CPPFLAGS = $(PGSQL_CFLAGS) \ + -I$(top_srcdir) -I$(top_srcdir)/src/common AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common - if WITH_PGSQL pkglib_LTLIBRARIES = jobcomp_pgsql.la diff --git a/src/plugins/jobcomp/script/Makefile.am b/src/plugins/jobcomp/script/Makefile.am index d96c907882a954a22621a429873e74a3ed31ea47..c6f1f953fb8f0bbeef34cd42d602b90750d7daae 100644 --- a/src/plugins/jobcomp/script/Makefile.am +++ b/src/plugins/jobcomp/script/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobcomp_script.la diff --git a/src/plugins/launch/aprun/Makefile.am b/src/plugins/launch/aprun/Makefile.am index fa0acc594836799344698b2d8506ea1421e22c4f..4de9130db4f2697af7341e6635ecfb7074ed075f 100644 --- a/src/plugins/launch/aprun/Makefile.am +++ b/src/plugins/launch/aprun/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = launch_aprun.la diff --git a/src/plugins/launch/poe/Makefile.am b/src/plugins/launch/poe/Makefile.am index af07975882d28298f1d2bc95aa47013958a11182..fa20600b3c10058c86dd34ee629d365f51426c9f 100644 --- a/src/plugins/launch/poe/Makefile.am +++ b/src/plugins/launch/poe/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = launch_poe.la diff --git a/src/plugins/launch/runjob/Makefile.am b/src/plugins/launch/runjob/Makefile.am index 43edff4664ded1d286d94989d9075a83da875dcc..9812e8a57df13c7c51df1ebd574ab131204a023f 100644 --- a/src/plugins/launch/runjob/Makefile.am +++ b/src/plugins/launch/runjob/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) pkglib_LTLIBRARIES = launch_runjob.la diff --git a/src/plugins/launch/slurm/Makefile.am b/src/plugins/launch/slurm/Makefile.am index 80b3e9b7153f94b61b230f6373ecdbbad4aa031b..cd585bdc4ed86424839f430c72d8b28052f0e7d6 100644 --- a/src/plugins/launch/slurm/Makefile.am +++ b/src/plugins/launch/slurm/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = launch_slurm.la diff --git a/src/plugins/mpi/lam/Makefile.am b/src/plugins/mpi/lam/Makefile.am index 5b71327ba0386f2d7a363cbaa5f731d4e3ddeb41..d9e6af44d25e85bf258eba68255dc3a61839b39e 100644 --- a/src/plugins/mpi/lam/Makefile.am +++ b/src/plugins/mpi/lam/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_lam.la diff --git a/src/plugins/mpi/mpich1_p4/Makefile.am b/src/plugins/mpi/mpich1_p4/Makefile.am index b0344b998bdd1f4990b5ab44ca43a49436eca09f..ae22d173de251b40f3f55e719fb3f6196cfd2059 100644 --- a/src/plugins/mpi/mpich1_p4/Makefile.am +++ b/src/plugins/mpi/mpich1_p4/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mpich1_p4.la diff --git a/src/plugins/mpi/mpich1_shmem/Makefile.am b/src/plugins/mpi/mpich1_shmem/Makefile.am index 63000a35f1a3cad2dc2e1c5ef14ea5d4d8ff59ea..489e5f2f7c519b4c78f0072b31cfe59374099bd4 100644 --- a/src/plugins/mpi/mpich1_shmem/Makefile.am +++ b/src/plugins/mpi/mpich1_shmem/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mpich1_shmem.la diff --git a/src/plugins/mpi/mpichgm/Makefile.am b/src/plugins/mpi/mpichgm/Makefile.am index 5db34be7885f8f13330b9bfd62d804387cc463fc..cbeb0964c97b13bd1728e1629e452bda99753e42 100644 --- a/src/plugins/mpi/mpichgm/Makefile.am +++ b/src/plugins/mpi/mpichgm/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mpichgm.la diff --git a/src/plugins/mpi/mpichmx/Makefile.am b/src/plugins/mpi/mpichmx/Makefile.am index 42bfd8727e41d73565b89cde19fba34a36477b29..47a2611c3c83ace5854e25ad6b97a820c914c420 100644 --- a/src/plugins/mpi/mpichmx/Makefile.am +++ b/src/plugins/mpi/mpichmx/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mpichmx.la diff --git a/src/plugins/mpi/mvapich/Makefile.am b/src/plugins/mpi/mvapich/Makefile.am index 05fb7c5ec20c8d77f1f6c51defc97f157f4e40f1..1a0ab1c84e80be4060a5dd385c52155511027665 100644 --- a/src/plugins/mpi/mvapich/Makefile.am +++ b/src/plugins/mpi/mvapich/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mvapich.la diff --git a/src/plugins/mpi/none/Makefile.am b/src/plugins/mpi/none/Makefile.am index 005df962e6bd43ab4f459de9963c87743ffa86ce..2b4ace0f397b651087d94e7cf5f8c1a213022fac 100644 --- a/src/plugins/mpi/none/Makefile.am +++ b/src/plugins/mpi/none/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_none.la diff --git a/src/plugins/mpi/openmpi/Makefile.am b/src/plugins/mpi/openmpi/Makefile.am index 44d705345b904f62b9a2f7de77d51dd18cfa3f30..ea0a0d3d7b320427949bd203ff93517454f219c6 100644 --- a/src/plugins/mpi/openmpi/Makefile.am +++ b/src/plugins/mpi/openmpi/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_openmpi.la diff --git a/src/plugins/mpi/pmi2/Makefile.am b/src/plugins/mpi/pmi2/Makefile.am index f14adb673f9d175272edfdafca4603622418c9d8..d18513490093d5d064dfbf8aea60d4a6844eac9b 100644 --- a/src/plugins/mpi/pmi2/Makefile.am +++ b/src/plugins/mpi/pmi2/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_pmi2.la diff --git a/src/plugins/preempt/partition_prio/Makefile.am b/src/plugins/preempt/partition_prio/Makefile.am index 9053dc56097690a9a8a3f23e84e55b3b7e2e457a..8c69124fe3f40ce5b4c5281de528cb00c4f7e1f4 100644 --- a/src/plugins/preempt/partition_prio/Makefile.am +++ b/src/plugins/preempt/partition_prio/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = preempt_partition_prio.la diff --git a/src/plugins/preempt/qos/Makefile.am b/src/plugins/preempt/qos/Makefile.am index 9ed16cd4ee07af8db18d746e79cbd34fcb3f1a90..77d712bd5cb52604f770dd236af0d1566aa2d08e 100644 --- a/src/plugins/preempt/qos/Makefile.am +++ b/src/plugins/preempt/qos/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = preempt_qos.la diff --git a/src/plugins/priority/basic/Makefile.am b/src/plugins/priority/basic/Makefile.am index cd7b44668af0244b136bc528e28aa84eb3a7c55d..a9005771736c9694ffc964fd27b14da38d60f678 100644 --- a/src/plugins/priority/basic/Makefile.am +++ b/src/plugins/priority/basic/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = priority_basic.la diff --git a/src/plugins/priority/multifactor/Makefile.am b/src/plugins/priority/multifactor/Makefile.am index 52783a1b9f7502a33b8d76270dbe78716dd1c73d..8ccb9eba4d47939b7434118f2ab86fc9d8a02657 100644 --- a/src/plugins/priority/multifactor/Makefile.am +++ b/src/plugins/priority/multifactor/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = priority_multifactor.la diff --git a/src/plugins/proctrack/aix/Makefile.am b/src/plugins/proctrack/aix/Makefile.am index e0ffda3bf20b1be2e25d3cc6b49c8e64eb46e865..3e820cf40fe7f81b6b54379aa0b534f4ac1a561f 100644 --- a/src/plugins/proctrack/aix/Makefile.am +++ b/src/plugins/proctrack/aix/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -Wl,-bI:$(PROCTRACKDIR)/proctrackext.exp\ -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_aix.la diff --git a/src/plugins/proctrack/cgroup/Makefile.am b/src/plugins/proctrack/cgroup/Makefile.am index bed4f1339d22e80734157a010c663781ca1dfc2e..7012a6c443ea9e80598219d87689844d72079fea 100644 --- a/src/plugins/proctrack/cgroup/Makefile.am +++ b/src/plugins/proctrack/cgroup/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_cgroup.la diff --git a/src/plugins/proctrack/linuxproc/Makefile.am b/src/plugins/proctrack/linuxproc/Makefile.am index bb07731f0f23fb23c221a6b0635d7d3b9cf85ef4..6e350d6c91fa0e640d72cbb99c5bbd2f0380ea64 100644 --- a/src/plugins/proctrack/linuxproc/Makefile.am +++ b/src/plugins/proctrack/linuxproc/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_linuxproc.la diff --git a/src/plugins/proctrack/lua/Makefile.am b/src/plugins/proctrack/lua/Makefile.am index 0a6496c101358e0dbbe9c55342c9def3d43d353f..c9fd3d0ba3e61d8863d91ead10999d74085f427b 100644 --- a/src/plugins/proctrack/lua/Makefile.am +++ b/src/plugins/proctrack/lua/Makefile.am @@ -2,10 +2,10 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" +AM_CPPFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" \ + -I$(top_srcdir) -I$(top_srcdir)/src/common $(lua_CFLAGS) PLUGIN_FLAGS = - -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(lua_CFLAGS) pkglib_LTLIBRARIES = proctrack_lua.la proctrack_lua_la_SOURCES = proctrack_lua.c diff --git a/src/plugins/proctrack/pgid/Makefile.am b/src/plugins/proctrack/pgid/Makefile.am index 2624070de39c9dafc7bec020892f162330215b59..49d9a92777853a3af304fd3cd06ddc548a149343 100644 --- a/src/plugins/proctrack/pgid/Makefile.am +++ b/src/plugins/proctrack/pgid/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_pgid.la diff --git a/src/plugins/proctrack/sgi_job/Makefile.am b/src/plugins/proctrack/sgi_job/Makefile.am index 3fddd6068a6dc8cd10c0779d6a4eeb0f7b02d9da..5c04974b8625ebc95cec6b936bb48f8f78f658bd 100644 --- a/src/plugins/proctrack/sgi_job/Makefile.am +++ b/src/plugins/proctrack/sgi_job/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = - -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_sgi_job.la diff --git a/src/plugins/sched/backfill/Makefile.am b/src/plugins/sched/backfill/Makefile.am index 88998e6a6a2be49319b41c043c8f1b3e9c464b58..baa9d6f7237ba11db1c76439132e73ed28a561b5 100644 --- a/src/plugins/sched/backfill/Makefile.am +++ b/src/plugins/sched/backfill/Makefile.am @@ -6,7 +6,7 @@ AM_CXXFLAGS = -fexceptions PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_backfill.la diff --git a/src/plugins/sched/builtin/Makefile.am b/src/plugins/sched/builtin/Makefile.am index faf4f0a682540b92a7b874849782cba256f87f0e..1f22326c81a51818295581d42fb5087bfe9ca773 100644 --- a/src/plugins/sched/builtin/Makefile.am +++ b/src/plugins/sched/builtin/Makefile.am @@ -6,7 +6,7 @@ AM_CXXFLAGS = -fexceptions PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_builtin.la diff --git a/src/plugins/sched/hold/Makefile.am b/src/plugins/sched/hold/Makefile.am index d03a995481dda85ed36b972d12ccb31ab2a58fef..fcdb0e23f3a85748e666923c4d6ecd8448f5cdcc 100644 --- a/src/plugins/sched/hold/Makefile.am +++ b/src/plugins/sched/hold/Makefile.am @@ -6,7 +6,7 @@ AM_CXXFLAGS = -fexceptions PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_hold.la diff --git a/src/plugins/sched/wiki/Makefile.am b/src/plugins/sched/wiki/Makefile.am index 3864a3b790e4f5c069340ae2c85fa2443cbb7a82..87653145e19d465ffca112bcb3cd688c8d720ed0 100644 --- a/src/plugins/sched/wiki/Makefile.am +++ b/src/plugins/sched/wiki/Makefile.am @@ -6,7 +6,7 @@ AM_CXXFLAGS = -fexceptions PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_wiki.la diff --git a/src/plugins/sched/wiki2/Makefile.am b/src/plugins/sched/wiki2/Makefile.am index c5c708c9d54d53dfaf81f55a225eaf37a985dcb1..86c81b5fafefa284b92cead04129ef68fb1f11df 100644 --- a/src/plugins/sched/wiki2/Makefile.am +++ b/src/plugins/sched/wiki2/Makefile.am @@ -6,7 +6,7 @@ AM_CXXFLAGS = -fexceptions PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_wiki2.la diff --git a/src/plugins/select/bluegene/Makefile.am b/src/plugins/select/bluegene/Makefile.am index 0a88eeb5b0cc60e52fed923af2e1426040aee604..42ca88b6c576a05e0d10f663bd4986759f8a3a33 100644 --- a/src/plugins/select/bluegene/Makefile.am +++ b/src/plugins/select/bluegene/Makefile.am @@ -5,7 +5,7 @@ CLEANFILES = core.* PLUGIN_FLAGS = -module -avoid-version --export-dynamic -lm -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) pkglib_LTLIBRARIES = select_bluegene.la diff --git a/src/plugins/select/bluegene/ba/Makefile.am b/src/plugins/select/bluegene/ba/Makefile.am index eefc6446eaef5be96c5b3f8b8eb87e6ae5d7990f..bf42e1e051b2a5c0c13841c1a421dae8e1ae7644 100644 --- a/src/plugins/select/bluegene/ba/Makefile.am +++ b/src/plugins/select/bluegene/ba/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) # making a .la diff --git a/src/plugins/select/bluegene/ba_bgq/Makefile.am b/src/plugins/select/bluegene/ba_bgq/Makefile.am index 8de43dce09fb4b80830362a866fe05cf3d6487fd..43473ec235d00a86f0d7069f4253ffd172e1946a 100644 --- a/src/plugins/select/bluegene/ba_bgq/Makefile.am +++ b/src/plugins/select/bluegene/ba_bgq/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) # making a .la diff --git a/src/plugins/select/bluegene/bl/Makefile.am b/src/plugins/select/bluegene/bl/Makefile.am index 5ad4bccdaf9dadc277a2f38d2d4c1a5233a0d2f0..b65c8b4616bde1b405c073d19e1c79d874297456 100644 --- a/src/plugins/select/bluegene/bl/Makefile.am +++ b/src/plugins/select/bluegene/bl/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) # making a .la diff --git a/src/plugins/select/bluegene/bl_bgq/Makefile.am b/src/plugins/select/bluegene/bl_bgq/Makefile.am index 041336610a2b601504df998d530a43f61dccd2f1..346bd147c864190bb54fa56af5c0d0fb1ae89dcb 100644 --- a/src/plugins/select/bluegene/bl_bgq/Makefile.am +++ b/src/plugins/select/bluegene/bl_bgq/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) # making a .la diff --git a/src/plugins/select/bluegene/sfree/Makefile.am b/src/plugins/select/bluegene/sfree/Makefile.am index 6eaa11187c51038992d07e88e7bd0a685ebbb883..5bb2dc4572c3376b2083b201128e100d7749693a 100644 --- a/src/plugins/select/bluegene/sfree/Makefile.am +++ b/src/plugins/select/bluegene/sfree/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) sbin_PROGRAMS = sfree diff --git a/src/plugins/select/cons_res/Makefile.am b/src/plugins/select/cons_res/Makefile.am index 9f708cae68d898053ef6ac24a45e2ea17e86cf55..06a86eb545d3bab1b69f9eb213eeac7fbae85eed 100644 --- a/src/plugins/select/cons_res/Makefile.am +++ b/src/plugins/select/cons_res/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = select_cons_res.la diff --git a/src/plugins/select/cray/Makefile.am b/src/plugins/select/cray/Makefile.am index 1cc1205a8c0b8f9166c067119f8b8c4cfdec20b5..db5a9d8cdd82a6869d3b83e525de9613d1e1d6ba 100644 --- a/src/plugins/select/cray/Makefile.am +++ b/src/plugins/select/cray/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. pkglib_LTLIBRARIES = select_cray.la diff --git a/src/plugins/select/cray/libalps/Makefile.am b/src/plugins/select/cray/libalps/Makefile.am index b63239895204118fca7e7e85a9b03e5caec77c81..69d40f1f2c2cbe01d021ef101f9cf7eec1e3c9ed 100644 --- a/src/plugins/select/cray/libalps/Makefile.am +++ b/src/plugins/select/cray/libalps/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. -I../ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. -I../ noinst_LTLIBRARIES = libalps.la diff --git a/src/plugins/select/cray/libemulate/Makefile.am b/src/plugins/select/cray/libemulate/Makefile.am index 3e769a6aa10eab82ff6fefeb8792447131e642a3..ddcd3cfd3335ea0aab0959b86168207e751d84c9 100644 --- a/src/plugins/select/cray/libemulate/Makefile.am +++ b/src/plugins/select/cray/libemulate/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. -I../ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. -I../ noinst_LTLIBRARIES = libalps.la diff --git a/src/plugins/select/linear/Makefile.am b/src/plugins/select/linear/Makefile.am index e5178e38701069b0bed146b1c5eabfdd998c74f6..644b0b1eefc3aef29f581f8f954c0bed5a1d834e 100644 --- a/src/plugins/select/linear/Makefile.am +++ b/src/plugins/select/linear/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = select_linear.la diff --git a/src/plugins/select/serial/Makefile.am b/src/plugins/select/serial/Makefile.am index 5ebea9d033cf89d0c448bb362bd3389b5299a137..c43d6d3b105ddb951c6402282009a6843ce53709 100644 --- a/src/plugins/select/serial/Makefile.am +++ b/src/plugins/select/serial/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = select_serial.la diff --git a/src/plugins/switch/none/Makefile.am b/src/plugins/switch/none/Makefile.am index b9423c7693f11bbb0df9ee3d37d23de3330045e7..9dc0e293f8d82ae35e389dbfcb6116def6ab6004 100644 --- a/src/plugins/switch/none/Makefile.am +++ b/src/plugins/switch/none/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = switch_none.la diff --git a/src/plugins/switch/nrt/Makefile.am b/src/plugins/switch/nrt/Makefile.am index 07622fd9e44ee4fab30390e1abff38a4472f58f1..af9b810c8a67de268ed188183a6b10da928d7bc9 100644 --- a/src/plugins/switch/nrt/Makefile.am +++ b/src/plugins/switch/nrt/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(NRT_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(NRT_CPPFLAGS) SWITCH_NRT_LA_SOURCES = \ diff --git a/src/plugins/switch/nrt/libpermapi/Makefile.am b/src/plugins/switch/nrt/libpermapi/Makefile.am index 94ff6bf450ca2a040a190e5bc8016f6654baf8e0..353289d26b14d187b0105fac253007c4586551ed 100644 --- a/src/plugins/switch/nrt/libpermapi/Makefile.am +++ b/src/plugins/switch/nrt/libpermapi/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common \ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common \ -I$(top_srcdir)/src/srun/libsrun $(NRT_CPPFLAGS) # making a .la diff --git a/src/plugins/task/affinity/Makefile.am b/src/plugins/task/affinity/Makefile.am index bc2ab1b937b89bb99a045afd1f9b29cd4491a050..1a60237a56de9f5007094e4698643a03367e29a8 100644 --- a/src/plugins/task/affinity/Makefile.am +++ b/src/plugins/task/affinity/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common if HAVE_SCHED_SETAFFINITY pkglib_LTLIBRARIES = task_affinity.la diff --git a/src/plugins/task/cgroup/Makefile.am b/src/plugins/task/cgroup/Makefile.am index 1813b9a4f3e4b2548d7eee33ec6cce3e087bfd30..b9937815c9f03b294c5cbf44f1b9da7e17694f7f 100644 --- a/src/plugins/task/cgroup/Makefile.am +++ b/src/plugins/task/cgroup/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = task_cgroup.la diff --git a/src/plugins/task/none/Makefile.am b/src/plugins/task/none/Makefile.am index 1c43397fd85845b03acc4490b4817fe0648806c6..5163bf6557b18ef9f2808e728536ab7f1eca1220 100644 --- a/src/plugins/task/none/Makefile.am +++ b/src/plugins/task/none/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = task_none.la diff --git a/src/plugins/topology/3d_torus/Makefile.am b/src/plugins/topology/3d_torus/Makefile.am index 7c200a27b3f3af790b9a32f26e803d13b7b2b200..c820d405540840ca7309d4f04bf15a4fa1effe65 100644 --- a/src/plugins/topology/3d_torus/Makefile.am +++ b/src/plugins/topology/3d_torus/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = topology_3d_torus.la diff --git a/src/plugins/topology/node_rank/Makefile.am b/src/plugins/topology/node_rank/Makefile.am index 022e66f4991040c3b8f141b02c6c97ca51d0a152..08f9b5829e9d2af0b9e2ec416bc7c7f94883a4db 100644 --- a/src/plugins/topology/node_rank/Makefile.am +++ b/src/plugins/topology/node_rank/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = topology_node_rank.la diff --git a/src/plugins/topology/none/Makefile.am b/src/plugins/topology/none/Makefile.am index 7934a690aadb5854d20b0ee2c3435ff4b63afefc..fdd40acd8f8b1700d398c97adaaec325b541388e 100644 --- a/src/plugins/topology/none/Makefile.am +++ b/src/plugins/topology/none/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = topology_none.la diff --git a/src/plugins/topology/tree/Makefile.am b/src/plugins/topology/tree/Makefile.am index a08f7ded871ca0841b8dd1c5bdfa9ae3cb384842..19d7ec317366b5c871f0fa94570afb8cf03e9858 100644 --- a/src/plugins/topology/tree/Makefile.am +++ b/src/plugins/topology/tree/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = topology_tree.la diff --git a/src/sacct/Makefile.am b/src/sacct/Makefile.am index 7acfcb86704c491d755ece97fed43b7854772465..d22d76ce36f2e6d0bed80f9a49b64e165b76d623 100644 --- a/src/sacct/Makefile.am +++ b/src/sacct/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) bin_PROGRAMS = sacct diff --git a/src/sacctmgr/Makefile.am b/src/sacctmgr/Makefile.am index 9a887d4e6fe7120c44d472aac8bb5e3f5764748d..ca694b674548aba2581202f8e7cd761ba993d8da 100644 --- a/src/sacctmgr/Makefile.am +++ b/src/sacctmgr/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) bin_PROGRAMS = sacctmgr diff --git a/src/salloc/Makefile.am b/src/salloc/Makefile.am index 885818538a15507441699f6f34d04257853ff28b..3f795540da860d18519dd4555367e2ca08496c20 100644 --- a/src/salloc/Makefile.am +++ b/src/salloc/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = salloc diff --git a/src/sattach/Makefile.am b/src/sattach/Makefile.am index 4ca5a0b3f3ce39192e54182d01d409d349263357..59edc23dd097da7065937ec960f615906c098236 100644 --- a/src/sattach/Makefile.am +++ b/src/sattach/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) bin_PROGRAMS = sattach diff --git a/src/sbatch/Makefile.am b/src/sbatch/Makefile.am index 929c22bb3c3a2e08a424bf0a7f70f5dbbfc13baf..02bc1109e72aaeabe2f503b178ac58061eb9914e 100644 --- a/src/sbatch/Makefile.am +++ b/src/sbatch/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) bin_PROGRAMS = sbatch diff --git a/src/sbcast/Makefile.am b/src/sbcast/Makefile.am index 166f66f80e68bcb1a06f8168d60da6b968eb8683..f52394f489185f12f2e5bb7b56a56792f4cd360a 100644 --- a/src/sbcast/Makefile.am +++ b/src/sbcast/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = sbcast sbcast_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) -lm diff --git a/src/scancel/Makefile.am b/src/scancel/Makefile.am index 7bd9beef046d4f259d66c080755d447757028490..e4d6514a8930a206b8bc733c48b69ef9fc169562 100644 --- a/src/scancel/Makefile.am +++ b/src/scancel/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) bin_PROGRAMS = scancel diff --git a/src/scontrol/Makefile.am b/src/scontrol/Makefile.am index 316506270abcff645aacefca3d3ee11316aa92e5..22e0132a6b1ec4a6f95b4729f1f292ccc3b9f636 100644 --- a/src/scontrol/Makefile.am +++ b/src/scontrol/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = scontrol diff --git a/src/sdiag/Makefile.am b/src/sdiag/Makefile.am index 4b1a92c796271687ad31bcfe79531156c69a9293..f9c9726dd453f3770b897b18d770cf176fa727c1 100644 --- a/src/sdiag/Makefile.am +++ b/src/sdiag/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = sdiag sdiag_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) diff --git a/src/sinfo/Makefile.am b/src/sinfo/Makefile.am index aef1c160efb69feed1c086e13eab05e05311f0d6..63ea14ea25e64717fb38f5e4418bdc28f8ebda62 100644 --- a/src/sinfo/Makefile.am +++ b/src/sinfo/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = sinfo sinfo_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) diff --git a/src/slurmctld/Makefile.am b/src/slurmctld/Makefile.am index 7d759dc65798ff6ae21ca38419107f7f0bd523cb..addd296c5f1674e003e32ac2ee5a9409dd08dcb1 100644 --- a/src/slurmctld/Makefile.am +++ b/src/slurmctld/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) # noinst_LTLIBRARIES = libslurmctld.la # libslurmctld_la_LDFLAGS = $(LIB_LDFLAGS) -module --export-dynamic diff --git a/src/slurmd/common/Makefile.am b/src/slurmd/common/Makefile.am index dda570360c7755a03957b8cd940c69f8ed1a56e1..f94e694b7dc2fcf6fe8454ed6c433d587fdd786e 100644 --- a/src/slurmd/common/Makefile.am +++ b/src/slurmd/common/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) # making a .la diff --git a/src/slurmd/slurmd/Makefile.am b/src/slurmd/slurmd/Makefile.am index 55d629a126b8e25bde4f98bc3c1c98dfc425117d..c7c5f3324744b0903779924264ad98b2ca4a14f9 100644 --- a/src/slurmd/slurmd/Makefile.am +++ b/src/slurmd/slurmd/Makefile.am @@ -5,8 +5,8 @@ AUTOMAKE_OPTIONS = foreign sbin_PROGRAMS = slurmd -AM_CPPFLAGS = -DLIBSLURM_SO=\"$(libdir)/libslurm.so\" -INCLUDES = -I$(top_srcdir) $(HWLOC_CPPFLAGS) +AM_CPPFLAGS = -DLIBSLURM_SO=\"$(libdir)/libslurm.so\" \ + -I$(top_srcdir) $(HWLOC_CPPFLAGS) slurmd_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ diff --git a/src/slurmd/slurmstepd/Makefile.am b/src/slurmd/slurmstepd/Makefile.am index c6bb1d3a4bdacdccf55e6917fa4cfeabc96dd1d5..fa662cbb53bf228788e51bfe3056ca6f2293d620 100644 --- a/src/slurmd/slurmstepd/Makefile.am +++ b/src/slurmd/slurmstepd/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign sbin_PROGRAMS = slurmstepd -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) slurmstepd_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ diff --git a/src/slurmdbd/Makefile.am b/src/slurmdbd/Makefile.am index caac3a1e10cbfc2118a77d3cefe4ed1db1a12eac..bfd3ea7bdba330ca4165713e401ae4ebabdbb770 100644 --- a/src/slurmdbd/Makefile.am +++ b/src/slurmdbd/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) sbin_PROGRAMS = slurmdbd diff --git a/src/smap/Makefile.am b/src/smap/Makefile.am index 4b8ff3c6535a806c8a3209e7342c883480a02a3a..b89c64bb93410eea6af1ec01ae0c488dc834b2cb 100644 --- a/src/smap/Makefile.am +++ b/src/smap/Makefile.am @@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = foreign LIBS=$(NCURSES) -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) if BUILD_SMAP diff --git a/src/sprio/Makefile.am b/src/sprio/Makefile.am index c7d76bd21439500ee405438bb03651b18fa2aba3..3c55c9df2ee9d878761e737af2ca966f97cbdfd0 100644 --- a/src/sprio/Makefile.am +++ b/src/sprio/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) bin_PROGRAMS = sprio diff --git a/src/squeue/Makefile.am b/src/squeue/Makefile.am index 9ce4fbcf6dee05b7bed49cc5de6786993ecf9d7c..9a0dfba13372480f55f59b59aafdc1dc1b59b819 100644 --- a/src/squeue/Makefile.am +++ b/src/squeue/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) bin_PROGRAMS = squeue diff --git a/src/sreport/Makefile.am b/src/sreport/Makefile.am index d648f745e9270792993b3ab12a8cd90d3ff3c245..a7de403075d3114f114d8b36bf8c9206102d8d09 100644 --- a/src/sreport/Makefile.am +++ b/src/sreport/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) bin_PROGRAMS = sreport diff --git a/src/srun/Makefile.am b/src/srun/Makefile.am index 6cf3e306f7b593e88b77c40e436cca959b487ef6..64ed081936a90239a431b8310c27b5e8fe84de96 100644 --- a/src/srun/Makefile.am +++ b/src/srun/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = libsrun AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun bin_PROGRAMS = srun diff --git a/src/srun/libsrun/Makefile.am b/src/srun/libsrun/Makefile.am index ca7144c5c0f0067bdaf2ef5831329068b850a6c3..4011cf4ebb085b2e8c1a781f88c821b14f7e7cf6 100644 --- a/src/srun/libsrun/Makefile.am +++ b/src/srun/libsrun/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun noinst_LTLIBRARIES = libsrun.la diff --git a/src/srun_cr/Makefile.am b/src/srun_cr/Makefile.am index cd296570db235f50aa18a4961bff7cf3b243022d..f4e5fd7106563be73087e68a00c6eb05388a4214 100644 --- a/src/srun_cr/Makefile.am +++ b/src/srun_cr/Makefile.am @@ -5,7 +5,7 @@ CLEANFILES = core.* if WITH_BLCR -INCLUDES = -I$(top_srcdir) $(BLCR_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) $(BLCR_CPPFLAGS) bin_PROGRAMS = srun_cr diff --git a/src/sshare/Makefile.am b/src/sshare/Makefile.am index 59c3d566e76af5d2ca8c28c1377df3e38ec88de1..15ab8489bdddf2bf6bb1dd1a601360043c5d992b 100644 --- a/src/sshare/Makefile.am +++ b/src/sshare/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) bin_PROGRAMS = sshare diff --git a/src/sstat/Makefile.am b/src/sstat/Makefile.am index e84a6aeaef55ea72cc53130784c5391678e660ab..9ab534a08f0621d8e0b83d34691db3ee21e39cf2 100644 --- a/src/sstat/Makefile.am +++ b/src/sstat/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) bin_PROGRAMS = sstat diff --git a/src/strigger/Makefile.am b/src/strigger/Makefile.am index d8816ac5fc9f30aa84586dd51da83bb19eeb8108..7871e0bd459323aca337f9050fce8b1673550f2a 100644 --- a/src/strigger/Makefile.am +++ b/src/strigger/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = strigger strigger_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) diff --git a/src/sview/Makefile.am b/src/sview/Makefile.am index 4a6b611d1cad5ef1a082ca2b537f5c98ac7cc620..3b36046da60658a0ef3ee22efbf53a6f5bc0c02c 100644 --- a/src/sview/Makefile.am +++ b/src/sview/Makefile.am @@ -3,7 +3,7 @@ # Makefile for sview AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) if BUILD_SVIEW diff --git a/testsuite/slurm_unit/api/Makefile.am b/testsuite/slurm_unit/api/Makefile.am index 3914183e0c5ce9aa20ac7a528b8b47f5969c9c44..a46654bb4b12c7e63651be262b30224caa5c46bd 100644 --- a/testsuite/slurm_unit/api/Makefile.am +++ b/testsuite/slurm_unit/api/Makefile.am @@ -7,7 +7,7 @@ check_PROGRAMS = $(TESTS) TESTS = \ api-test -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common LDADD = $(top_builddir)/src/common/libcommon.la \ $(top_builddir)/src/api/libslurm.la diff --git a/testsuite/slurm_unit/api/manual/Makefile.am b/testsuite/slurm_unit/api/manual/Makefile.am index 6933b6cd68ad3f608c5af77314c7adef1894abca..5b7a878630b9812d10691d6faa39eab383505828 100644 --- a/testsuite/slurm_unit/api/manual/Makefile.am +++ b/testsuite/slurm_unit/api/manual/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) LDADD = $(top_builddir)/src/api/libslurm.la check_PROGRAMS = \ cancel-tst \ diff --git a/testsuite/slurm_unit/common/Makefile.am b/testsuite/slurm_unit/common/Makefile.am index 6316190d9a7f50ad33f39b24789ae904c83454cf..875e53b1bbb070b2474824bb31371ae5e1b64b39 100644 --- a/testsuite/slurm_unit/common/Makefile.am +++ b/testsuite/slurm_unit/common/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign -INCLUDES = -I$(top_srcdir) $(HWLOC_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) $(HWLOC_CPPFLAGS) LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) $(HWLOC_LIBS) check_PROGRAMS = \