diff --git a/contribs/pam/Makefile.am b/contribs/pam/Makefile.am index 799c7e63d26d7dbb72f4a7739470ff215b7721cf..01e8121e68c39fd8f9644b11827b2330e276f127 100644 --- a/contribs/pam/Makefile.am +++ b/contribs/pam/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -fPIC -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -fPIC -I$(top_srcdir) -I$(top_srcdir)/src/common PLUGIN_FLAGS = -module --export-dynamic -avoid-version pkglibdir = $(PAM_DIR) diff --git a/contribs/pam/Makefile.in b/contribs/pam/Makefile.in index f3b50600361bc61ea950e2a81eb5c80cbd05c0a8..7890648bbe0ae76245cfb6257d2728eba1ab364e 100644 --- a/contribs/pam/Makefile.in +++ b/contribs/pam/Makefile.in @@ -399,7 +399,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -fPIC -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -fPIC -I$(top_srcdir) -I$(top_srcdir)/src/common PLUGIN_FLAGS = -module --export-dynamic -avoid-version @HAVE_PAM_FALSE@pam_lib = @HAVE_PAM_TRUE@pam_lib = pam_slurm.la diff --git a/contribs/perlapi/libslurm/Makefile.am b/contribs/perlapi/libslurm/Makefile.am index 5cad2a733abd6364ba1310bb27737be530da1c24..94aa20221c87b22df1bfff7cd5c929253178b536 100644 --- a/contribs/perlapi/libslurm/Makefile.am +++ b/contribs/perlapi/libslurm/Makefile.am @@ -149,7 +149,7 @@ distclean-generic: done; \ fi -AM_CPPFLAGS = \ +AM_CFLAGS = \ -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir) \ -I$(top_builddir) \ diff --git a/contribs/perlapi/libslurm/Makefile.in b/contribs/perlapi/libslurm/Makefile.in index 243f2b2d0b08ba7d5b80397aa25a8cba291a98d6..7b72980aa1108d4be66d35e4016e6d1066abaec5 100644 --- a/contribs/perlapi/libslurm/Makefile.in +++ b/contribs/perlapi/libslurm/Makefile.in @@ -371,7 +371,7 @@ perl_sources = \ test_sources = \ $(perl_dir)/t/00-use.t -AM_CPPFLAGS = \ +AM_CFLAGS = \ -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir) \ -I$(top_builddir) \ diff --git a/contribs/perlapi/libslurmdb/Makefile.am b/contribs/perlapi/libslurmdb/Makefile.am index 7119a15832b5363af5e81e5bf055000c7decc89f..19e8dec261c8fd5d5378b3d1796a4922363f4797 100644 --- a/contribs/perlapi/libslurmdb/Makefile.am +++ b/contribs/perlapi/libslurmdb/Makefile.am @@ -81,7 +81,7 @@ distclean-generic: done; \ fi -AM_CPPFLAGS = \ +AM_CFLAGS = \ -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir) \ -I$(top_builddir) \ diff --git a/contribs/perlapi/libslurmdb/Makefile.in b/contribs/perlapi/libslurmdb/Makefile.in index 2ec146697eb9fb0fdbabe44f6501c6c5676ea2ad..501346f97b25fc0feb2cff1f41477fd108f53676 100644 --- a/contribs/perlapi/libslurmdb/Makefile.in +++ b/contribs/perlapi/libslurmdb/Makefile.in @@ -351,7 +351,7 @@ perl_sources = \ $(perl_dir)/slurmdb-perl.h \ $(perl_dir)/cluster.c -AM_CPPFLAGS = \ +AM_CFLAGS = \ -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir) \ -I$(top_builddir) \ diff --git a/src/api/Makefile.am b/src/api/Makefile.am index f5ef0ff0064cc4fe7f7ee934c9aa926ce26259db..eb7d0b33986b352422456afbacffc62363ed4585 100644 --- a/src/api/Makefile.am +++ b/src/api/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) if WITH_GNU_LD VERSION_SCRIPT = \ diff --git a/src/api/Makefile.in b/src/api/Makefile.in index dac933a0c1f6d855a9f4b34d15044eb73002ba38..db4715b63da93768a11d995de1b19da1ce086e75 100644 --- a/src/api/Makefile.in +++ b/src/api/Makefile.in @@ -423,7 +423,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) @WITH_GNU_LD_TRUE@VERSION_SCRIPT = \ @WITH_GNU_LD_TRUE@ version.map diff --git a/src/common/Makefile.am b/src/common/Makefile.am index a0d6325328c0d2b84193f2ac67043e05e5311df7..67d3cdc89ffb18b9fd6bf71ea58fedfe351f7a6c 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 -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) $(HWLOC_CPPFLAGS) +AM_CFLAGS = -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/common/Makefile.in b/src/common/Makefile.in index 4ed97919defed977c74321f3801e0b60edd89456..fa227d40f6764fb29c78fc4e9eedc76289f2ce99 100644 --- a/src/common/Makefile.in +++ b/src/common/Makefile.in @@ -478,7 +478,7 @@ AUTOMAKE_OPTIONS = foreign @HAVE_UNSETENV_TRUE@build_unsetenv_src = @HAVE_UNSETENV_FALSE@extra_unsetenv_src = @HAVE_UNSETENV_TRUE@extra_unsetenv_src = unsetenv.c unsetenv.h -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) $(HWLOC_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) $(HWLOC_CPPFLAGS) noinst_LTLIBRARIES = \ libcommon.la \ libdaemonize.la \ diff --git a/src/database/Makefile.am b/src/database/Makefile.am index 46bcf4636e03c1a1a597ecaaeb2421f4a1ac387d..059bc1e6b630dd52f0790a3bc313a6a9068e4d8a 100644 --- a/src/database/Makefile.am +++ b/src/database/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common if WITH_MYSQL MYSQL_LIB = libslurm_mysql.la diff --git a/src/database/Makefile.in b/src/database/Makefile.in index cf7d16c0cf7b07d53f34f36c5550b5dc63e8e7f6..3eacd0b55f45bf9fcd062fd87ce4a09bdb7ad6b9 100644 --- a/src/database/Makefile.in +++ b/src/database/Makefile.in @@ -391,7 +391,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common @WITH_MYSQL_FALSE@MYSQL_LIB = @WITH_MYSQL_TRUE@MYSQL_LIB = libslurm_mysql.la @WITH_MYSQL_TRUE@libslurm_mysql_la_SOURCES = mysql_common.c mysql_common.h diff --git a/src/db_api/Makefile.am b/src/db_api/Makefile.am index 246a6c6c670ce976f15e68ba9052f9c8a2d52969..0163c1118ebd62777c9dfb0f51ab6696c605ed24 100644 --- a/src/db_api/Makefile.am +++ b/src/db_api/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) if WITH_GNU_LD VERSION_SCRIPT = \ diff --git a/src/db_api/Makefile.in b/src/db_api/Makefile.in index f90538a0b19401a3cbc005378ba791d19496cc34..0d4e20d78af83bd077777fa1b97efa6402de1560 100644 --- a/src/db_api/Makefile.in +++ b/src/db_api/Makefile.in @@ -407,7 +407,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) @WITH_GNU_LD_TRUE@VERSION_SCRIPT = \ @WITH_GNU_LD_TRUE@ version.map diff --git a/src/plugins/accounting_storage/common/Makefile.am b/src/plugins/accounting_storage/common/Makefile.am index 53a6071dece8195ef82609c4715ccb1f57ea3be6..e3d8836742cc07d3caaaa38813e0aa0b49b03369 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.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) # making a .la diff --git a/src/plugins/accounting_storage/common/Makefile.in b/src/plugins/accounting_storage/common/Makefile.in index 8ff501cc24e7a64b28a3c3e55dedb84764ec8d48..54049766448648943716a46e93841155d4eb98a9 100644 --- a/src/plugins/accounting_storage/common/Makefile.in +++ b/src/plugins/accounting_storage/common/Makefile.in @@ -363,7 +363,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) # making a .la noinst_LTLIBRARIES = libaccounting_storage_common.la diff --git a/src/plugins/accounting_storage/filetxt/Makefile.am b/src/plugins/accounting_storage/filetxt/Makefile.am index 72a37a48a935371ef8edd9855f3bfee7a1c6000b..d474b9dbc048c0093ced935fc738e9757bd1db65 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = accounting_storage_filetxt.la diff --git a/src/plugins/accounting_storage/filetxt/Makefile.in b/src/plugins/accounting_storage/filetxt/Makefile.in index 02579544b984d64e51988d7da1bda78f50453cad..47cb33fbccdfc0bc123a41432cd51eb7f48bfed7 100644 --- a/src/plugins/accounting_storage/filetxt/Makefile.in +++ b/src/plugins/accounting_storage/filetxt/Makefile.in @@ -396,7 +396,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = accounting_storage_filetxt.la accounting_storage_filetxt_la_SOURCES = accounting_storage_filetxt.c \ filetxt_jobacct_process.c filetxt_jobacct_process.h diff --git a/src/plugins/accounting_storage/mysql/Makefile.am b/src/plugins/accounting_storage/mysql/Makefile.am index d7cfbb3784ebfee9c27d5f27c31914f75acd63d1..23616916b34105f645d5535ede5fb515056ccd6b 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -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/mysql/Makefile.in b/src/plugins/accounting_storage/mysql/Makefile.in index 293840e3fab61de331f6c52073ddcacf45a3c710..cb185693a8f6081af277be36baa556680a33d7a4 100644 --- a/src/plugins/accounting_storage/mysql/Makefile.in +++ b/src/plugins/accounting_storage/mysql/Makefile.in @@ -446,7 +446,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -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 \ as_mysql_archive.c as_mysql_archive.h \ diff --git a/src/plugins/accounting_storage/none/Makefile.am b/src/plugins/accounting_storage/none/Makefile.am index a6da95f3338a206709becdef4b66432c2d29036d..31e8cf26779cbb6dde1b1ab2de4f81026122b456 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = accounting_storage_none.la diff --git a/src/plugins/accounting_storage/none/Makefile.in b/src/plugins/accounting_storage/none/Makefile.in index e42930b6bb508730761845c62ef78e8bc446be78..0416589443e2c0587242c0c59a13eee69013b518 100644 --- a/src/plugins/accounting_storage/none/Makefile.in +++ b/src/plugins/accounting_storage/none/Makefile.in @@ -395,7 +395,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = accounting_storage_none.la accounting_storage_none_la_SOURCES = accounting_storage_none.c accounting_storage_none_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) diff --git a/src/plugins/accounting_storage/pgsql/Makefile.am b/src/plugins/accounting_storage/pgsql/Makefile.am index b77f560c800f8d826ef7636a64d30ea5d52f7895..47f1d2e63184c9cbec5f58b936b8611169a933b2 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -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/pgsql/Makefile.in b/src/plugins/accounting_storage/pgsql/Makefile.in index ff00ace77404399c652ea877fb76f17a28e649b3..d2bf3f00730d0dc6ee59d6e7ce33c54373866439 100644 --- a/src/plugins/accounting_storage/pgsql/Makefile.in +++ b/src/plugins/accounting_storage/pgsql/Makefile.in @@ -441,7 +441,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -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 \ as_pg_acct.c as_pg_acct.h \ diff --git a/src/plugins/accounting_storage/slurmdbd/Makefile.am b/src/plugins/accounting_storage/slurmdbd/Makefile.am index 8f5b20855aba8b697f2161c9f716fc9dc0731cb6..42f2f547957c477d18929e05f9b92066a3ca20f3 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = accounting_storage_slurmdbd.la diff --git a/src/plugins/accounting_storage/slurmdbd/Makefile.in b/src/plugins/accounting_storage/slurmdbd/Makefile.in index e3f17349d320c0956e152b0f451dd0b4ac9654aa..c01106cca9527ccd7e0b689de29595020cdb2489 100644 --- a/src/plugins/accounting_storage/slurmdbd/Makefile.in +++ b/src/plugins/accounting_storage/slurmdbd/Makefile.in @@ -396,7 +396,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = accounting_storage_slurmdbd.la # Null job completion logging plugin. diff --git a/src/plugins/acct_gather_energy/ipmi/Makefile.am b/src/plugins/acct_gather_energy/ipmi/Makefile.am index 7ec336c4604ae37f79c6ce5088c311d3e7bf3187..faf1e6bad06cd5d8b9ce93b30117c382e7e623c9 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(FREEIPMI_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(FREEIPMI_CPPFLAGS) if BUILD_IPMI diff --git a/src/plugins/acct_gather_energy/ipmi/Makefile.in b/src/plugins/acct_gather_energy/ipmi/Makefile.in index d50e3ac3b44b55cb82dc73a39e215e51c0a3573a..50eb7aa569702e42351d4105844bdcbd7491baeb 100644 --- a/src/plugins/acct_gather_energy/ipmi/Makefile.in +++ b/src/plugins/acct_gather_energy/ipmi/Makefile.in @@ -411,7 +411,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(FREEIPMI_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(FREEIPMI_CPPFLAGS) @BUILD_IPMI_TRUE@PLUGIN_FLAGS = -module -avoid-version --export-dynamic @BUILD_IPMI_TRUE@pkglib_LTLIBRARIES = acct_gather_energy_ipmi.la diff --git a/src/plugins/acct_gather_energy/none/Makefile.am b/src/plugins/acct_gather_energy/none/Makefile.am index 337661fd8145829dec2322448b665617a0e11e4f..510861852bb71e28d5dc4b1ce294f395f54b477e 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_energy_none.la diff --git a/src/plugins/acct_gather_energy/none/Makefile.in b/src/plugins/acct_gather_energy/none/Makefile.in index 9e9190344c79d8281a0a1f884bc93c08c73e1c42..03f9665b9f6b174e720ccd1374cbcd57002be1cb 100644 --- a/src/plugins/acct_gather_energy/none/Makefile.in +++ b/src/plugins/acct_gather_energy/none/Makefile.in @@ -395,7 +395,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_energy_none.la # Null job completion logging plugin. diff --git a/src/plugins/acct_gather_energy/rapl/Makefile.am b/src/plugins/acct_gather_energy/rapl/Makefile.am index e13073a80373601db8ad33c096ed49333ff753a5..4b9effb36a42edc67a25623f135fa6602ed87bff 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_energy_rapl.la diff --git a/src/plugins/acct_gather_energy/rapl/Makefile.in b/src/plugins/acct_gather_energy/rapl/Makefile.in index d7b7c435c4ae470e18af165c4bd3ff00846a7fbb..3b6faff7c81dec1e2e4ba544730b1beba5903c70 100644 --- a/src/plugins/acct_gather_energy/rapl/Makefile.in +++ b/src/plugins/acct_gather_energy/rapl/Makefile.in @@ -395,7 +395,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_energy_rapl.la # cpu/core energy accounting plugin. diff --git a/src/plugins/acct_gather_filesystem/lustre/Makefile.am b/src/plugins/acct_gather_filesystem/lustre/Makefile.am index 529727eedb9779f12a6dd01d6c77056c92cd796f..3c4176d28ba333e2e702d5f3805ce5da0996b0cd 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common PLUGIN_FLAGS = -module -avoid-version --export-dynamic diff --git a/src/plugins/acct_gather_filesystem/lustre/Makefile.in b/src/plugins/acct_gather_filesystem/lustre/Makefile.in index d1e95201b6a6acf12eb7decdb948134f6c2493fd..55782d33487f263bcd4a8dd60fd88545d43666c6 100644 --- a/src/plugins/acct_gather_filesystem/lustre/Makefile.in +++ b/src/plugins/acct_gather_filesystem/lustre/Makefile.in @@ -398,7 +398,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common PLUGIN_FLAGS = -module -avoid-version --export-dynamic pkglib_LTLIBRARIES = acct_gather_filesystem_lustre.la diff --git a/src/plugins/acct_gather_filesystem/none/Makefile.am b/src/plugins/acct_gather_filesystem/none/Makefile.am index 007d84d340a8ab6df66f17cb3770f53e0b0c259a..65f608b17d2c686f31708dfe89064d7d6e10f829 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_filesystem_none.la diff --git a/src/plugins/acct_gather_filesystem/none/Makefile.in b/src/plugins/acct_gather_filesystem/none/Makefile.in index aa4d0866cad721171ac015fd9ac218f2e01a51dc..7336eea440840787b80bae7bbc7f7b3fdb702082 100644 --- a/src/plugins/acct_gather_filesystem/none/Makefile.in +++ b/src/plugins/acct_gather_filesystem/none/Makefile.in @@ -396,7 +396,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_filesystem_none.la # Null job completion logging plugin. diff --git a/src/plugins/acct_gather_infiniband/none/Makefile.am b/src/plugins/acct_gather_infiniband/none/Makefile.am index 69d851fcbf6427d6e06e2b3698659e0bca7eb75a..b6d30b1df086f6c7c39cbddcf82dbd18b733a506 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_infiniband_none.la diff --git a/src/plugins/acct_gather_infiniband/none/Makefile.in b/src/plugins/acct_gather_infiniband/none/Makefile.in index 2523f46c88e885e51f379201c140d16326f70792..377f06017a0d996fde0676293a5543384cd60d48 100644 --- a/src/plugins/acct_gather_infiniband/none/Makefile.in +++ b/src/plugins/acct_gather_infiniband/none/Makefile.in @@ -396,7 +396,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_infiniband_none.la # Null job completion logging plugin. diff --git a/src/plugins/acct_gather_infiniband/ofed/Makefile.am b/src/plugins/acct_gather_infiniband/ofed/Makefile.am index e54c46623378df7c5ef7ce68ce7b3c3590eb68a1..66dd2ffe604533ef16f993590845e9cd13d5bf22 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common if BUILD_OFED diff --git a/src/plugins/acct_gather_infiniband/ofed/Makefile.in b/src/plugins/acct_gather_infiniband/ofed/Makefile.in index 324b45854c930eb19a651c8c86d488858740a355..141f2f789b5da48bd033ba1ac862c4c72a8609cd 100644 --- a/src/plugins/acct_gather_infiniband/ofed/Makefile.in +++ b/src/plugins/acct_gather_infiniband/ofed/Makefile.in @@ -407,7 +407,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common @BUILD_OFED_TRUE@PLUGIN_FLAGS = -module -avoid-version --export-dynamic @BUILD_OFED_TRUE@pkglib_LTLIBRARIES = acct_gather_infiniband_ofed.la diff --git a/src/plugins/acct_gather_profile/hdf5/Makefile.am b/src/plugins/acct_gather_profile/hdf5/Makefile.am index 0d3d6f7df53e5864c76f4600ef9b658e2ad23322..196a07e8b496a393411f9f728c2e076616aa8828 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. -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) # cpu/core energy accounting plugin. HDF5_SOURCES = acct_gather_profile_hdf5.c diff --git a/src/plugins/acct_gather_profile/hdf5/Makefile.in b/src/plugins/acct_gather_profile/hdf5/Makefile.in index 4823438b265f6b70b0cd01fa62448a0af1e33599..62299c4aea0638873cb6c7a2d666458ae8101b15 100644 --- a/src/plugins/acct_gather_profile/hdf5/Makefile.in +++ b/src/plugins/acct_gather_profile/hdf5/Makefile.in @@ -462,7 +462,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. -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -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 9d3ac00725feac5b9b452d84e80e66c6abc07fd8..67a6c4a7e770ee57e3255683fea135839d3e484b 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. -AM_CPPFLAGS = -I$(top_srcdir) -I../ +AM_CFLAGS = -I$(top_srcdir) -I../ SHDF5_SOURCES = sh5util.c diff --git a/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in b/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in index 801859c2c0b0c27960fe842d68abbe8e8c8721b5..a0205238b0c1d33db68af073f197a859168ee1c2 100644 --- a/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in +++ b/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in @@ -377,7 +377,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. -AM_CPPFLAGS = -I$(top_srcdir) -I../ +AM_CFLAGS = -I$(top_srcdir) -I../ SHDF5_SOURCES = sh5util.c @BUILD_HDF5_TRUE@sh5util_SOURCES = $(SHDF5_SOURCES) @BUILD_HDF5_TRUE@sh5util_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) \ diff --git a/src/plugins/acct_gather_profile/none/Makefile.am b/src/plugins/acct_gather_profile/none/Makefile.am index 451caab506970b442d6ebe0355439d456b6f6744..287f0a6367b03fe2179c53a530160184ef48ec9a 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_profile_none.la diff --git a/src/plugins/acct_gather_profile/none/Makefile.in b/src/plugins/acct_gather_profile/none/Makefile.in index 671ed7d3fce2ef28ffd0596b50aa1a7e2371a6fa..fca9927180241ff1c5bedb0c7a23853bf501cc3b 100644 --- a/src/plugins/acct_gather_profile/none/Makefile.in +++ b/src/plugins/acct_gather_profile/none/Makefile.in @@ -395,7 +395,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = acct_gather_profile_none.la # Null job completion logging plugin. diff --git a/src/plugins/auth/authd/Makefile.am b/src/plugins/auth/authd/Makefile.am index 7e44d89547608e94d4f9b766bb746da7db734653..ed42affb58df842e81b61f55bca57c4cc3bfde50 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -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/authd/Makefile.in b/src/plugins/auth/authd/Makefile.in index c069c375c246de954fab93d43f6cc7e1a8fb7689..0db76e4d54b82325c94b124d2423fc66be69e347 100644 --- a/src/plugins/auth/authd/Makefile.in +++ b/src/plugins/auth/authd/Makefile.in @@ -394,7 +394,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common # Add your plugin to this line, following the naming conventions. @WITH_AUTHD_TRUE@AUTHD = auth_authd.la diff --git a/src/plugins/auth/munge/Makefile.am b/src/plugins/auth/munge/Makefile.am index ebf4c04b6574386426b21bb8ec92f57e1fe2c27c..71b2cdc42548fda69a15dc4f22d5c6c7a469f26a 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(MUNGE_CPPFLAGS) +AM_CFLAGS = -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/munge/Makefile.in b/src/plugins/auth/munge/Makefile.in index d0163896da1e131d547003da1843c12778b043b6..239a88dd6f5cfb7a2f8a039da6fe8878c945aaa5 100644 --- a/src/plugins/auth/munge/Makefile.in +++ b/src/plugins/auth/munge/Makefile.in @@ -395,7 +395,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(MUNGE_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(MUNGE_CPPFLAGS) # Add your plugin to this line, following the naming conventions. @WITH_MUNGE_TRUE@MUNGE = auth_munge.la diff --git a/src/plugins/auth/none/Makefile.am b/src/plugins/auth/none/Makefile.am index 8a59782895487089280599f88c95c8da53eb3b05..2b3dac902004eb4d7bcf716fd319b26142d6e969 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = auth_none.la diff --git a/src/plugins/auth/none/Makefile.in b/src/plugins/auth/none/Makefile.in index cdd593edd1a251d9f76db680c93fed2aa7068aa7..cac6a875864ad371885bfb3a2e845469a01b6b45 100644 --- a/src/plugins/auth/none/Makefile.in +++ b/src/plugins/auth/none/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = auth_none.la # Null authentication plugin. diff --git a/src/plugins/checkpoint/aix/Makefile.am b/src/plugins/checkpoint/aix/Makefile.am index 514efc76500d6c89441308bfe826f21f2874647a..d7f52ec822f28780b2edf4eb6b56fa12ba489617 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common # AIX checkpoint plugin. if HAVE_AIX diff --git a/src/plugins/checkpoint/aix/Makefile.in b/src/plugins/checkpoint/aix/Makefile.in index 0eaa193b1b60ab62fff70ddfebf68e4641ddcb17..b6107e7ad9654d939114fd424b0abb101d4fb936 100644 --- a/src/plugins/checkpoint/aix/Makefile.in +++ b/src/plugins/checkpoint/aix/Makefile.in @@ -398,7 +398,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common # AIX checkpoint plugin. @HAVE_AIX_TRUE@pkglib_LTLIBRARIES = checkpoint_aix.la diff --git a/src/plugins/checkpoint/blcr/Makefile.am b/src/plugins/checkpoint/blcr/Makefile.am index 5059996a2564ddb520950bd001cb9c44b24d2972..7e05301529ffccfe1c56214dcf29a60f01687af0 100644 --- a/src/plugins/checkpoint/blcr/Makefile.am +++ b/src/plugins/checkpoint/blcr/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \ +AM_CFLAGS = -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \ -I$(top_srcdir) -I$(top_srcdir)/src/common PLUGIN_FLAGS = -module -avoid-version --export-dynamic diff --git a/src/plugins/checkpoint/blcr/Makefile.in b/src/plugins/checkpoint/blcr/Makefile.in index 0c53b407417a8b8ab40d249164acac7f617ca922..60174277c801217f432bc16f9416cd1543cb3759 100644 --- a/src/plugins/checkpoint/blcr/Makefile.in +++ b/src/plugins/checkpoint/blcr/Makefile.in @@ -403,7 +403,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \ +AM_CFLAGS = -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \ -I$(top_srcdir) -I$(top_srcdir)/src/common PLUGIN_FLAGS = -module -avoid-version --export-dynamic diff --git a/src/plugins/checkpoint/none/Makefile.am b/src/plugins/checkpoint/none/Makefile.am index bb4cd44805fcfcef0209327e1e1c31627038fdaa..9e45a117145ea1f0f89976f153cb4e91b07b5eed 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = checkpoint_none.la diff --git a/src/plugins/checkpoint/none/Makefile.in b/src/plugins/checkpoint/none/Makefile.in index f4a0d6f0c9531bde64abcc23020b406244f6f6e0..e8efa8a1b493ed5005cf0e9b0fddc97d450f2781 100644 --- a/src/plugins/checkpoint/none/Makefile.in +++ b/src/plugins/checkpoint/none/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = checkpoint_none.la # Null checkpoint plugin. diff --git a/src/plugins/checkpoint/ompi/Makefile.am b/src/plugins/checkpoint/ompi/Makefile.am index 29ad130db935c0d4b487419eea08e11ed4699c23..6fadf650eab2609522cb9f18f39e386b361a8e15 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = checkpoint_ompi.la diff --git a/src/plugins/checkpoint/ompi/Makefile.in b/src/plugins/checkpoint/ompi/Makefile.in index ffc7f91e803eab454b68c42134d8fdbf63259632..67c3d65b5d57715652ba6cce9a8173283be00a79 100644 --- a/src/plugins/checkpoint/ompi/Makefile.in +++ b/src/plugins/checkpoint/ompi/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = checkpoint_ompi.la # OpenMPI checkpoint plugin. diff --git a/src/plugins/checkpoint/poe/Makefile.am b/src/plugins/checkpoint/poe/Makefile.am index 4e631728fbf77da997f21cd1ab6fe2454f0dd323..82083783062e8b9f8ab58d3c02f94044f27ebb07 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common # POE checkpoint plugin. if DONT_BUILD diff --git a/src/plugins/checkpoint/poe/Makefile.in b/src/plugins/checkpoint/poe/Makefile.in index c042f2d9b4cec2034d5833d74ee7dac3d94eb487..6230e525e798a3b2ee4b3caee6be61a9aac764c5 100644 --- a/src/plugins/checkpoint/poe/Makefile.in +++ b/src/plugins/checkpoint/poe/Makefile.in @@ -398,7 +398,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common # POE checkpoint plugin. # if HAVE_NRT diff --git a/src/plugins/crypto/munge/Makefile.am b/src/plugins/crypto/munge/Makefile.am index c4a9bee49ac7fa7b799b3afa4e9c56c75a1307c8..d6099899106e1fb0d69ebe12122d206b903cf581 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(MUNGE_CPPFLAGS) +AM_CFLAGS = -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/munge/Makefile.in b/src/plugins/crypto/munge/Makefile.in index e6cd146a5bd25cae09a30e982926ef47701c6fb7..6279005d47174026a8aecb976fb788709087794a 100644 --- a/src/plugins/crypto/munge/Makefile.in +++ b/src/plugins/crypto/munge/Makefile.in @@ -395,7 +395,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(MUNGE_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(MUNGE_CPPFLAGS) # Add your plugin to this line, following the naming conventions. @WITH_MUNGE_TRUE@MUNGE = crypto_munge.la diff --git a/src/plugins/crypto/openssl/Makefile.am b/src/plugins/crypto/openssl/Makefile.am index b997cae66a799a19522f1748ba77b8812535c83d..a6a79157b5183e3e227b7cc72e446117044b1e72 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 -AM_CPPFLAGS = -I$(top_srcdir) $(SSL_CPPFLAGS) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) $(SSL_CPPFLAGS) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = $(openssl_lib) diff --git a/src/plugins/crypto/openssl/Makefile.in b/src/plugins/crypto/openssl/Makefile.in index bb9d4439fa58c8bbb6698b39fa023bbe04d69df1..a2801a9df84b8bb252bccd7d75d16c0fbde85874 100644 --- a/src/plugins/crypto/openssl/Makefile.in +++ b/src/plugins/crypto/openssl/Makefile.in @@ -402,7 +402,7 @@ AUTOMAKE_OPTIONS = foreign @HAVE_OPENSSL_FALSE@openssl_lib = @HAVE_OPENSSL_TRUE@openssl_lib = crypto_openssl.la PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) $(SSL_CPPFLAGS) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) $(SSL_CPPFLAGS) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = $(openssl_lib) @HAVE_OPENSSL_TRUE@crypto_openssl_la_SOURCES = crypto_openssl.c @HAVE_OPENSSL_TRUE@crypto_openssl_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(SSL_LDFLAGS) diff --git a/src/plugins/ext_sensors/none/Makefile.am b/src/plugins/ext_sensors/none/Makefile.am index adac0555c8e029bb2d3b52cdcabce3a4d884c663..1abeaae942bb8cf4d54953716dac69490ae1d5a8 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = ext_sensors_none.la diff --git a/src/plugins/ext_sensors/none/Makefile.in b/src/plugins/ext_sensors/none/Makefile.in index 1fdc6efe8ccd0263878eeeca1e1ffd7998843aed..9fdad8fcfb4d46ab68b8ec1b3ff2f7842475093c 100644 --- a/src/plugins/ext_sensors/none/Makefile.in +++ b/src/plugins/ext_sensors/none/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = ext_sensors_none.la # Null job completion logging plugin. diff --git a/src/plugins/ext_sensors/rrd/Makefile.am b/src/plugins/ext_sensors/rrd/Makefile.am index c8c25b14d26e1e02b21133987314856ed2854d31..cbad62508625cb6e2758204e3c3c08dda4afa43f 100644 --- a/src/plugins/ext_sensors/rrd/Makefile.am +++ b/src/plugins/ext_sensors/rrd/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(RRDTOOL_CPPFLAGS) +AM_CFLAGS = -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/ext_sensors/rrd/Makefile.in b/src/plugins/ext_sensors/rrd/Makefile.in index f7f565f84b0e910bce95793f4aad02266961f089..456d5295e3dc9b2ddec7652338da21b0a19fba46 100644 --- a/src/plugins/ext_sensors/rrd/Makefile.in +++ b/src/plugins/ext_sensors/rrd/Makefile.in @@ -401,7 +401,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(RRDTOOL_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(RRDTOOL_CPPFLAGS) @BUILD_RRD_TRUE@PLUGIN_FLAGS = -module -avoid-version --export-dynamic @BUILD_RRD_TRUE@pkglib_LTLIBRARIES = ext_sensors_rrd.la diff --git a/src/plugins/gres/gpu/Makefile.am b/src/plugins/gres/gpu/Makefile.am index 8b8196b69ab1ff80f8be6c2b2b6440221fcfbeb9..af3338c6f7c96b48198d4c2209ca214c383d5fb9 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) pkglib_LTLIBRARIES = gres_gpu.la diff --git a/src/plugins/gres/gpu/Makefile.in b/src/plugins/gres/gpu/Makefile.in index 1346e37ecb0b49274c1ccfdb731a4c470037ed62..8ecc34cbd62dc581f4c867327092c88d8589e0e1 100644 --- a/src/plugins/gres/gpu/Makefile.in +++ b/src/plugins/gres/gpu/Makefile.in @@ -394,7 +394,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) pkglib_LTLIBRARIES = gres_gpu.la # Gres GPU plugin. diff --git a/src/plugins/gres/mic/Makefile.am b/src/plugins/gres/mic/Makefile.am index cfad49e4a020fb06098676218527760e1bfa2451..ae6418b0b779a1e47b60bff5e603082ceb308cd8 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) pkglib_LTLIBRARIES = gres_mic.la diff --git a/src/plugins/gres/mic/Makefile.in b/src/plugins/gres/mic/Makefile.in index a87c7319b4af26b05ff818d3e6ad12511e617d52..a2d924355713f99bda33172733674ca59d3cfa28 100644 --- a/src/plugins/gres/mic/Makefile.in +++ b/src/plugins/gres/mic/Makefile.in @@ -394,7 +394,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) pkglib_LTLIBRARIES = gres_mic.la # Gres MIC plugin. diff --git a/src/plugins/gres/nic/Makefile.am b/src/plugins/gres/nic/Makefile.am index 674ed3abf0cf16d512c387bb65909dc56052eb72..f38a8bb48e1bd2c0b7451a258e599d5f0dc4558f 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) pkglib_LTLIBRARIES = gres_nic.la diff --git a/src/plugins/gres/nic/Makefile.in b/src/plugins/gres/nic/Makefile.in index 63ca8cdd84c07139e47dc93d5ec0dd56bf1d589a..06200d258eec949f48e7bd36bfb314d5a483e085 100644 --- a/src/plugins/gres/nic/Makefile.in +++ b/src/plugins/gres/nic/Makefile.in @@ -394,7 +394,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS) pkglib_LTLIBRARIES = gres_nic.la # Gres NIC plugin. diff --git a/src/plugins/job_submit/all_partitions/Makefile.am b/src/plugins/job_submit/all_partitions/Makefile.am index e1f56a1664c6e900d443eac3e5faf6387367961a..596c273930e5d28ab8a2fd7eb76ea86d384ff207 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_all_partitions.la diff --git a/src/plugins/job_submit/all_partitions/Makefile.in b/src/plugins/job_submit/all_partitions/Makefile.in index 924f37e1da1d240543faff41d16b0dfa2aad63bf..54031ad6906ea9b4061f254fc4c275c5c308ff76 100644 --- a/src/plugins/job_submit/all_partitions/Makefile.in +++ b/src/plugins/job_submit/all_partitions/Makefile.in @@ -396,7 +396,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_all_partitions.la # Job submit all_partitions plugin. diff --git a/src/plugins/job_submit/cnode/Makefile.am b/src/plugins/job_submit/cnode/Makefile.am index 0a0e897a9e9e2b3ef36acfbf21f4417386fa554b..5de912a9fb3814afa691e7f348d350104041f064 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_cnode.la diff --git a/src/plugins/job_submit/cnode/Makefile.in b/src/plugins/job_submit/cnode/Makefile.in index 92934ce95896c2ec2e36982c168c3b38fc564520..489a44fe7a81345930342f120323f27415f029e9 100644 --- a/src/plugins/job_submit/cnode/Makefile.in +++ b/src/plugins/job_submit/cnode/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_cnode.la # Job submit cnode plugin. diff --git a/src/plugins/job_submit/defaults/Makefile.am b/src/plugins/job_submit/defaults/Makefile.am index e7182cf8fc5340acf1c53fdc3b4b62bd0455b4df..a69ae77af34bbd253c347c8e1bb3d92c80fd9d0d 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_defaults.la diff --git a/src/plugins/job_submit/defaults/Makefile.in b/src/plugins/job_submit/defaults/Makefile.in index 80b2ec89cd9bca8083215016c9bf8b867a45be21..2d378cebe0b84593e3ac73fc4f815ee1d98e916b 100644 --- a/src/plugins/job_submit/defaults/Makefile.in +++ b/src/plugins/job_submit/defaults/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_defaults.la # Job submit defaults plugin. diff --git a/src/plugins/job_submit/logging/Makefile.am b/src/plugins/job_submit/logging/Makefile.am index 0326d1220482a06b46211d014a5a908ab95465e0..52c5c94869bb7198e91edb3d7f4763933974c999 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_logging.la diff --git a/src/plugins/job_submit/logging/Makefile.in b/src/plugins/job_submit/logging/Makefile.in index 0be02b4f0b71ef0ee0d9dc12c8f8a2a64dca9a26..3ac613ad711f0dbb66c467810ace67c9664700bd 100644 --- a/src/plugins/job_submit/logging/Makefile.in +++ b/src/plugins/job_submit/logging/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_logging.la # Job submit logging plugin. diff --git a/src/plugins/job_submit/lua/Makefile.am b/src/plugins/job_submit/lua/Makefile.am index 2a94e23d64a5826fcb4cf6f0c3e411cb4178b658..a45b90f83ad7920236822549dd191d20f86362c6 100644 --- a/src/plugins/job_submit/lua/Makefile.am +++ b/src/plugins/job_submit/lua/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" \ +AM_CFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" \ -I$(top_srcdir) -I$(top_srcdir)/src/common $(lua_CFLAGS) PLUGIN_FLAGS = -module -avoid-version --export-dynamic diff --git a/src/plugins/job_submit/lua/Makefile.in b/src/plugins/job_submit/lua/Makefile.in index 7b18011ac97f87e5f4dff27ebbf5946d1603713c..7ae93e2c333324d7165fd99c8210778af6578cd9 100644 --- a/src/plugins/job_submit/lua/Makefile.in +++ b/src/plugins/job_submit/lua/Makefile.in @@ -397,7 +397,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" \ +AM_CFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" \ -I$(top_srcdir) -I$(top_srcdir)/src/common $(lua_CFLAGS) PLUGIN_FLAGS = -module -avoid-version --export-dynamic diff --git a/src/plugins/job_submit/partition/Makefile.am b/src/plugins/job_submit/partition/Makefile.am index c6aef859c1070ce260118f8887db7fa546188ae9..151a17ef2e87f41d4d8da9d5c8460dfceebf9e0a 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_partition.la diff --git a/src/plugins/job_submit/partition/Makefile.in b/src/plugins/job_submit/partition/Makefile.in index 7618683ac2fd2393e884c7af9b9bf1f4998851fa..9fc0912a6b72d06939a14e34acb18c76ed943ead 100644 --- a/src/plugins/job_submit/partition/Makefile.in +++ b/src/plugins/job_submit/partition/Makefile.in @@ -394,7 +394,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = job_submit_partition.la # Job submit partition plugin. diff --git a/src/plugins/jobacct_gather/aix/Makefile.am b/src/plugins/jobacct_gather/aix/Makefile.am index 1a9ccc3f1464c859888686b0424f889ff9469c72..aad3599379732d4fbc1e9716cc88032640a2b97f 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobacct_gather_aix.la diff --git a/src/plugins/jobacct_gather/aix/Makefile.in b/src/plugins/jobacct_gather/aix/Makefile.in index 5e1dad1d83a7539e6fbc8831db830197c40309f5..177bd5793af9fa67d29e1b52fde7f49ba7f0e4d3 100644 --- a/src/plugins/jobacct_gather/aix/Makefile.in +++ b/src/plugins/jobacct_gather/aix/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobacct_gather_aix.la # Null job completion logging plugin. diff --git a/src/plugins/jobacct_gather/cgroup/Makefile.am b/src/plugins/jobacct_gather/cgroup/Makefile.am index 50a6e0c859c339550ed2ee14edd4b0d16a2d24a1..d7d0499bc3982a6ed9a7f11c2cca8162a3cbab71 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobacct_gather_cgroup.la diff --git a/src/plugins/jobacct_gather/cgroup/Makefile.in b/src/plugins/jobacct_gather/cgroup/Makefile.in index af1ce262c4877c9f16af02eaeb998997633b200a..22a7638a4d0edc9396a0346cfa156d74b0c5ad70 100644 --- a/src/plugins/jobacct_gather/cgroup/Makefile.in +++ b/src/plugins/jobacct_gather/cgroup/Makefile.in @@ -396,7 +396,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobacct_gather_cgroup.la # Null job completion logging plugin. diff --git a/src/plugins/jobacct_gather/linux/Makefile.am b/src/plugins/jobacct_gather/linux/Makefile.am index a8ae60858b87871e737f5aed749274012a6bf144..a83c800eed94a134c0fcfab08b81b5c3c85d0578 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobacct_gather_linux.la diff --git a/src/plugins/jobacct_gather/linux/Makefile.in b/src/plugins/jobacct_gather/linux/Makefile.in index 849f03366882dc1eb9ebb696f1a886bfa7af58b6..7dfbf959c740aca28d36d35ac5e5b1f452e71c06 100644 --- a/src/plugins/jobacct_gather/linux/Makefile.in +++ b/src/plugins/jobacct_gather/linux/Makefile.in @@ -394,7 +394,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobacct_gather_linux.la # Null job completion logging plugin. diff --git a/src/plugins/jobacct_gather/none/Makefile.am b/src/plugins/jobacct_gather/none/Makefile.am index 412fdf81e46fad193839beccff65caa0daf474c8..ded2238d082611f8b1220374ccbb64ab4942b25d 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobacct_gather_none.la diff --git a/src/plugins/jobacct_gather/none/Makefile.in b/src/plugins/jobacct_gather/none/Makefile.in index 2fae83bd03783e1843e6087c1d88ec8fd657eb47..6de1ffc30b818e1bb1560a87c88b0c67c95f4599 100644 --- a/src/plugins/jobacct_gather/none/Makefile.in +++ b/src/plugins/jobacct_gather/none/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobacct_gather_none.la # Null job completion logging plugin. diff --git a/src/plugins/jobcomp/filetxt/Makefile.am b/src/plugins/jobcomp/filetxt/Makefile.am index aff5faddcd91ea683c19d4dc897c74418c69c961..48f183ccec4439212a4f9fcac7595aa901f6e8e9 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobcomp_filetxt.la diff --git a/src/plugins/jobcomp/filetxt/Makefile.in b/src/plugins/jobcomp/filetxt/Makefile.in index 0b14d866f750de244bc7fbf84587421499fa0980..75118d5d2cf08a74b2f2cbd5af27e7183989e8e4 100644 --- a/src/plugins/jobcomp/filetxt/Makefile.in +++ b/src/plugins/jobcomp/filetxt/Makefile.in @@ -394,7 +394,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobcomp_filetxt.la # Text file job completion logging plugin. diff --git a/src/plugins/jobcomp/mysql/Makefile.am b/src/plugins/jobcomp/mysql/Makefile.am index 962b9fe6944de7c2a8959299c3fd59a5236e073e..e05a4e0c4328cc713ad886589ca017bb535d18d3 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common if WITH_MYSQL pkglib_LTLIBRARIES = jobcomp_mysql.la diff --git a/src/plugins/jobcomp/mysql/Makefile.in b/src/plugins/jobcomp/mysql/Makefile.in index 672606829c55ea605ce7acc935373d976cfbd5b6..f5c97e738bd1c1c7bc4ad9cba2b4e0119225c683 100644 --- a/src/plugins/jobcomp/mysql/Makefile.in +++ b/src/plugins/jobcomp/mysql/Makefile.in @@ -402,7 +402,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common @WITH_MYSQL_TRUE@pkglib_LTLIBRARIES = jobcomp_mysql.la # Mysql storage plugin. diff --git a/src/plugins/jobcomp/none/Makefile.am b/src/plugins/jobcomp/none/Makefile.am index 82ed6f232ca21d9ca7aa570b0cd95cc546e67d25..dd4cdd8fee2c52878a9db7b0f3876adbddb69d90 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobcomp_none.la diff --git a/src/plugins/jobcomp/none/Makefile.in b/src/plugins/jobcomp/none/Makefile.in index 778f14e71d1192f096e1a99590cdfd51efbcf34d..8ebd06707964c58a160e64fea9a04988941b4c9b 100644 --- a/src/plugins/jobcomp/none/Makefile.in +++ b/src/plugins/jobcomp/none/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobcomp_none.la # Null job completion logging plugin. diff --git a/src/plugins/jobcomp/pgsql/Makefile.am b/src/plugins/jobcomp/pgsql/Makefile.am index 9ea9e3724ac1f0cce6170d10964b2dd28888e84f..02ba675088cbb322b7bdd948058aeab4e4040341 100644 --- a/src/plugins/jobcomp/pgsql/Makefile.am +++ b/src/plugins/jobcomp/pgsql/Makefile.am @@ -1,6 +1,6 @@ # Makefile for jobcomp/pgsql plugin -AM_CPPFLAGS = $(PGSQL_CFLAGS) \ +AM_CFLAGS = $(PGSQL_CFLAGS) \ -I$(top_srcdir) -I$(top_srcdir)/src/common AUTOMAKE_OPTIONS = foreign diff --git a/src/plugins/jobcomp/pgsql/Makefile.in b/src/plugins/jobcomp/pgsql/Makefile.in index 1f2b0e64f02f0fbcd8ad7cb9be157a5be9d5b2b0..07a19bc5ef876b602473d9cabc742fddc16ee31f 100644 --- a/src/plugins/jobcomp/pgsql/Makefile.in +++ b/src/plugins/jobcomp/pgsql/Makefile.in @@ -400,7 +400,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CPPFLAGS = $(PGSQL_CFLAGS) \ +AM_CFLAGS = $(PGSQL_CFLAGS) \ -I$(top_srcdir) -I$(top_srcdir)/src/common AUTOMAKE_OPTIONS = foreign diff --git a/src/plugins/jobcomp/script/Makefile.am b/src/plugins/jobcomp/script/Makefile.am index c6f1f953fb8f0bbeef34cd42d602b90750d7daae..1581c5b35634f7b8e70d97e9559effe41651f408 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobcomp_script.la diff --git a/src/plugins/jobcomp/script/Makefile.in b/src/plugins/jobcomp/script/Makefile.in index ff9b592bd4759a63695b42b66657ac2038cd5b7d..b6be4daa4c153a8a4f286153a5c39a3fa9e0a409 100644 --- a/src/plugins/jobcomp/script/Makefile.in +++ b/src/plugins/jobcomp/script/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = jobcomp_script.la # Text file job completion logging plugin. diff --git a/src/plugins/launch/aprun/Makefile.am b/src/plugins/launch/aprun/Makefile.am index 4de9130db4f2697af7341e6635ecfb7074ed075f..eec5c8e90e97ddc466aab0244a8db726cc6bd619 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = launch_aprun.la diff --git a/src/plugins/launch/aprun/Makefile.in b/src/plugins/launch/aprun/Makefile.in index 6ccade1174bf14e496b8cfe16e4da7e7b9677e4a..d7cc76daaf9a76957d946c24964ec2ed750022cb 100644 --- a/src/plugins/launch/aprun/Makefile.in +++ b/src/plugins/launch/aprun/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = launch_aprun.la launch_aprun_la_SOURCES = launch_aprun.c launch_aprun_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) diff --git a/src/plugins/launch/poe/Makefile.am b/src/plugins/launch/poe/Makefile.am index fa20600b3c10058c86dd34ee629d365f51426c9f..8f75ca183e2bd5eac28e59392e47809d00da99d0 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = launch_poe.la diff --git a/src/plugins/launch/poe/Makefile.in b/src/plugins/launch/poe/Makefile.in index 18e2a571b9d609869988f7cbcf7f82e48b5b5951..0745982c6d656f6ab1b4011a1f954de3b486b5e3 100644 --- a/src/plugins/launch/poe/Makefile.in +++ b/src/plugins/launch/poe/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = launch_poe.la launch_poe_la_SOURCES = launch_poe.c launch_poe_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) diff --git a/src/plugins/launch/runjob/Makefile.am b/src/plugins/launch/runjob/Makefile.am index 9812e8a57df13c7c51df1ebd574ab131204a023f..4b42c5f7adbfe92524bf10508fcb0a385d5df343 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) pkglib_LTLIBRARIES = launch_runjob.la diff --git a/src/plugins/launch/runjob/Makefile.in b/src/plugins/launch/runjob/Makefile.in index b7a3e5b2ec13050c32989b3c6ba2139f61baafd0..f22e21eb78d29a026ef300d2c6e9510afdc2e5e5 100644 --- a/src/plugins/launch/runjob/Makefile.in +++ b/src/plugins/launch/runjob/Makefile.in @@ -406,7 +406,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) pkglib_LTLIBRARIES = launch_runjob.la launch_runjob_la_SOURCES = launch_runjob.c $(am__append_1) # because totalview needs the libraries on load we link in srun and not here. diff --git a/src/plugins/launch/slurm/Makefile.am b/src/plugins/launch/slurm/Makefile.am index cd585bdc4ed86424839f430c72d8b28052f0e7d6..ef69669e58cb37eb056674f6d1854362302b0c35 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = launch_slurm.la diff --git a/src/plugins/launch/slurm/Makefile.in b/src/plugins/launch/slurm/Makefile.in index ae27355b9a9012067e69b8e7f30b71ad1c5cb84b..72f80713adfd3acff05c7dd09975884bc9e19003 100644 --- a/src/plugins/launch/slurm/Makefile.in +++ b/src/plugins/launch/slurm/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = launch_slurm.la launch_slurm_la_SOURCES = launch_slurm.c task_state.c launch_slurm_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) diff --git a/src/plugins/mpi/lam/Makefile.am b/src/plugins/mpi/lam/Makefile.am index d9e6af44d25e85bf258eba68255dc3a61839b39e..3776345cb16c8b84240d21680fbce162bdbd30e2 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_lam.la diff --git a/src/plugins/mpi/lam/Makefile.in b/src/plugins/mpi/lam/Makefile.in index d352b61da99ad01ce1771687480f855bd96aa906..cd11d8ba06a68f1523ea323eb4737ae929985b0d 100644 --- a/src/plugins/mpi/lam/Makefile.in +++ b/src/plugins/mpi/lam/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_lam.la mpi_lam_la_SOURCES = mpi_lam.c lam.h mpi_lam_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) diff --git a/src/plugins/mpi/mpich1_p4/Makefile.am b/src/plugins/mpi/mpich1_p4/Makefile.am index ae22d173de251b40f3f55e719fb3f6196cfd2059..067ea305cbec4f56a870adab7d567c14406f5bf7 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mpich1_p4.la diff --git a/src/plugins/mpi/mpich1_p4/Makefile.in b/src/plugins/mpi/mpich1_p4/Makefile.in index dda43cfec47706af72c77f1210fd5aebb47c3240..28b646fb8220b08759968cf455ed0e08fbd3615c 100644 --- a/src/plugins/mpi/mpich1_p4/Makefile.in +++ b/src/plugins/mpi/mpich1_p4/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mpich1_p4.la # Null MPI plugin. diff --git a/src/plugins/mpi/mpich1_shmem/Makefile.am b/src/plugins/mpi/mpich1_shmem/Makefile.am index 489e5f2f7c519b4c78f0072b31cfe59374099bd4..7e4445760cfa0f0e199aa9f9dfb749d6e61230fb 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mpich1_shmem.la diff --git a/src/plugins/mpi/mpich1_shmem/Makefile.in b/src/plugins/mpi/mpich1_shmem/Makefile.in index 2aefce1f11612ee1d40a16a6d9cfbdcc2fb55b42..890bc1bf4454ed7d1fd172e11946e678136fb267 100644 --- a/src/plugins/mpi/mpich1_shmem/Makefile.in +++ b/src/plugins/mpi/mpich1_shmem/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mpich1_shmem.la mpi_mpich1_shmem_la_SOURCES = mpich1_shmem.c mpi_mpich1_shmem_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) diff --git a/src/plugins/mpi/mpichgm/Makefile.am b/src/plugins/mpi/mpichgm/Makefile.am index cbeb0964c97b13bd1728e1629e452bda99753e42..da9809f534c040793fdbbb6a3387ce5cff840643 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mpichgm.la diff --git a/src/plugins/mpi/mpichgm/Makefile.in b/src/plugins/mpi/mpichgm/Makefile.in index bcf76adb8595844784c1426681d4e433dedbdd3a..e6bed16f73c1ab089d7a2d5c6fab59e148317ed6 100644 --- a/src/plugins/mpi/mpichgm/Makefile.in +++ b/src/plugins/mpi/mpichgm/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mpichgm.la # Null switch plugin. diff --git a/src/plugins/mpi/mpichmx/Makefile.am b/src/plugins/mpi/mpichmx/Makefile.am index 47a2611c3c83ace5854e25ad6b97a820c914c420..76a6ad4ea5e6b0175933921d4de652e0bde38241 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mpichmx.la diff --git a/src/plugins/mpi/mpichmx/Makefile.in b/src/plugins/mpi/mpichmx/Makefile.in index 1ae568e0440be97d4afc5888dc6ff160faa3c671..d3d95931fb278394d5c29d87287856d7c1125ea1 100644 --- a/src/plugins/mpi/mpichmx/Makefile.in +++ b/src/plugins/mpi/mpichmx/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mpichmx.la # Null switch plugin. diff --git a/src/plugins/mpi/mvapich/Makefile.am b/src/plugins/mpi/mvapich/Makefile.am index 1a0ab1c84e80be4060a5dd385c52155511027665..59e8fd519002b5b6d71f19260e9ec068885f2028 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mvapich.la diff --git a/src/plugins/mpi/mvapich/Makefile.in b/src/plugins/mpi/mvapich/Makefile.in index d8be66308625f21fff3637c943bb905cb0167ab4..92c418bfc0346c93b10fb6e980ded2a4495ddf99 100644 --- a/src/plugins/mpi/mvapich/Makefile.in +++ b/src/plugins/mpi/mvapich/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_mvapich.la mpi_mvapich_la_SOURCES = mpi_mvapich.c mvapich.c mvapich.h\ $(top_srcdir)/src/common/mpi.h diff --git a/src/plugins/mpi/none/Makefile.am b/src/plugins/mpi/none/Makefile.am index 2b4ace0f397b651087d94e7cf5f8c1a213022fac..db1fdaa0b97f175aee2a2a9b44497c60f71dc9ae 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_none.la diff --git a/src/plugins/mpi/none/Makefile.in b/src/plugins/mpi/none/Makefile.in index 986eba648fb0c5fd34ccb28b11570edbbdd2bc9e..8413c858fd0d11396c574ee31c1f0b101197dc25 100644 --- a/src/plugins/mpi/none/Makefile.in +++ b/src/plugins/mpi/none/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_none.la # Null MPI plugin. diff --git a/src/plugins/mpi/openmpi/Makefile.am b/src/plugins/mpi/openmpi/Makefile.am index ea0a0d3d7b320427949bd203ff93517454f219c6..4a32f42804dd95199200b372a8cdfc0e503ad8d1 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_openmpi.la diff --git a/src/plugins/mpi/openmpi/Makefile.in b/src/plugins/mpi/openmpi/Makefile.in index 32cda487a40fdaba8384f009227c587cffd272e6..6b74151d6339934b2ad50ca4bf3618829e6cd292 100644 --- a/src/plugins/mpi/openmpi/Makefile.in +++ b/src/plugins/mpi/openmpi/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_openmpi.la # OpenMPI MPI plugin. diff --git a/src/plugins/mpi/pmi2/Makefile.am b/src/plugins/mpi/pmi2/Makefile.am index d18513490093d5d064dfbf8aea60d4a6844eac9b..f1f0f2feb6cf1853843286299c50b6b375d3721e 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_pmi2.la diff --git a/src/plugins/mpi/pmi2/Makefile.in b/src/plugins/mpi/pmi2/Makefile.in index 21c825df9e228f82b04a9e3eab70b879af16b08e..9f56dc41a613f69eafca3f3746285096fea09436 100644 --- a/src/plugins/mpi/pmi2/Makefile.in +++ b/src/plugins/mpi/pmi2/Makefile.in @@ -395,7 +395,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = mpi_pmi2.la mpi_pmi2_la_SOURCES = mpi_pmi2.c \ agent.c agent.h \ diff --git a/src/plugins/preempt/partition_prio/Makefile.am b/src/plugins/preempt/partition_prio/Makefile.am index 8c69124fe3f40ce5b4c5281de528cb00c4f7e1f4..f4e94c2c2f9b85e743c35c71f1bd4bda4b304f31 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = preempt_partition_prio.la diff --git a/src/plugins/preempt/partition_prio/Makefile.in b/src/plugins/preempt/partition_prio/Makefile.in index 8d14ac96e7ca35e7b3d793848725bdfc1a3aada1..8b7e71bd464f5cfb2377b8271aefb695bfcc7f8c 100644 --- a/src/plugins/preempt/partition_prio/Makefile.in +++ b/src/plugins/preempt/partition_prio/Makefile.in @@ -395,7 +395,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = preempt_partition_prio.la preempt_partition_prio_la_SOURCES = preempt_partition_prio.c preempt_partition_prio_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) diff --git a/src/plugins/preempt/qos/Makefile.am b/src/plugins/preempt/qos/Makefile.am index 77d712bd5cb52604f770dd236af0d1566aa2d08e..16660374115d15c5fa3b0ad917218f6f3e854bb8 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = preempt_qos.la diff --git a/src/plugins/preempt/qos/Makefile.in b/src/plugins/preempt/qos/Makefile.in index cb86d8b16d77d8bbed9e12abdbd454034f3c1b38..f89e97d48cd8dce82cbf9d924dcd94ecabcf1630 100644 --- a/src/plugins/preempt/qos/Makefile.in +++ b/src/plugins/preempt/qos/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = preempt_qos.la preempt_qos_la_SOURCES = preempt_qos.c preempt_qos_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) diff --git a/src/plugins/priority/basic/Makefile.am b/src/plugins/priority/basic/Makefile.am index a9005771736c9694ffc964fd27b14da38d60f678..fb0b40b3d3378f34a862dbfc396f9afc6b186feb 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = priority_basic.la diff --git a/src/plugins/priority/basic/Makefile.in b/src/plugins/priority/basic/Makefile.in index a0bbbabab947ff339c70b0182c1e3d112899e100..6bf91630bf59b3901cd9dd9ad6925b942cd97299 100644 --- a/src/plugins/priority/basic/Makefile.in +++ b/src/plugins/priority/basic/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = priority_basic.la # basic priority logging plugin. diff --git a/src/plugins/priority/multifactor/Makefile.am b/src/plugins/priority/multifactor/Makefile.am index 8ccb9eba4d47939b7434118f2ab86fc9d8a02657..bc6b51eab047fcc37c5746656e920b566eae18b9 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = priority_multifactor.la diff --git a/src/plugins/priority/multifactor/Makefile.in b/src/plugins/priority/multifactor/Makefile.in index 1229e485a2b1058d7397668084bf5fbba9e81f5a..cba62953bfa1f39a9e710676466b841ef6633ad6 100644 --- a/src/plugins/priority/multifactor/Makefile.in +++ b/src/plugins/priority/multifactor/Makefile.in @@ -394,7 +394,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = priority_multifactor.la # Null priority logging plugin. diff --git a/src/plugins/proctrack/aix/Makefile.am b/src/plugins/proctrack/aix/Makefile.am index 3e820cf40fe7f81b6b54379aa0b534f4ac1a561f..722f4f5ca29fe42b17b8864665145b44b1a7cd63 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_aix.la diff --git a/src/plugins/proctrack/aix/Makefile.in b/src/plugins/proctrack/aix/Makefile.in index bb6746b427b89de27ed5fec8481fd1c7be32743b..3ab025e2d037e7b8a74473824520367fb5d37ec4 100644 --- a/src/plugins/proctrack/aix/Makefile.in +++ b/src/plugins/proctrack/aix/Makefile.in @@ -395,7 +395,7 @@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -Wl,-bI:$(PROCTRACKDIR)/proctrackext.exp\ -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_aix.la # AIX process tracking kernel extension plugin. diff --git a/src/plugins/proctrack/cgroup/Makefile.am b/src/plugins/proctrack/cgroup/Makefile.am index 7012a6c443ea9e80598219d87689844d72079fea..3a2573066bac4b45feae19f69755c972e572ea77 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_cgroup.la diff --git a/src/plugins/proctrack/cgroup/Makefile.in b/src/plugins/proctrack/cgroup/Makefile.in index d4de0fbd798ce5fd2f615d89da3c763ae90cb809..d40e6dfc123a20732fb4de3b2625eea808440050 100644 --- a/src/plugins/proctrack/cgroup/Makefile.in +++ b/src/plugins/proctrack/cgroup/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_cgroup.la # Process group ID process tracking plugin. diff --git a/src/plugins/proctrack/linuxproc/Makefile.am b/src/plugins/proctrack/linuxproc/Makefile.am index 6e350d6c91fa0e640d72cbb99c5bbd2f0380ea64..94d9156961e38f3a64a9f2e775245471db4d44bb 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_linuxproc.la diff --git a/src/plugins/proctrack/linuxproc/Makefile.in b/src/plugins/proctrack/linuxproc/Makefile.in index 81b222c314b499b4732ca811b36b1ad2f05ef8f4..246a3ffa7b27b5c2bea40c2e1abc6f83077bde81 100644 --- a/src/plugins/proctrack/linuxproc/Makefile.in +++ b/src/plugins/proctrack/linuxproc/Makefile.in @@ -394,7 +394,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_linuxproc.la # Process group ID process tracking plugin. diff --git a/src/plugins/proctrack/lua/Makefile.am b/src/plugins/proctrack/lua/Makefile.am index c9fd3d0ba3e61d8863d91ead10999d74085f427b..5573fd72bd771c76d2e15e83f7071143f2dd9251 100644 --- a/src/plugins/proctrack/lua/Makefile.am +++ b/src/plugins/proctrack/lua/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" \ +AM_CFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" \ -I$(top_srcdir) -I$(top_srcdir)/src/common $(lua_CFLAGS) PLUGIN_FLAGS = - -module -avoid-version --export-dynamic diff --git a/src/plugins/proctrack/lua/Makefile.in b/src/plugins/proctrack/lua/Makefile.in index 3ec2c23fec65de230199061e41c531113fa67753..fe7a774b8bc8290472ae8185a401572329c31a27 100644 --- a/src/plugins/proctrack/lua/Makefile.in +++ b/src/plugins/proctrack/lua/Makefile.in @@ -392,7 +392,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" \ +AM_CFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" \ -I$(top_srcdir) -I$(top_srcdir)/src/common $(lua_CFLAGS) PLUGIN_FLAGS = - -module -avoid-version --export-dynamic diff --git a/src/plugins/proctrack/pgid/Makefile.am b/src/plugins/proctrack/pgid/Makefile.am index 49d9a92777853a3af304fd3cd06ddc548a149343..7e447d54caeea73357de26a73cfb531454a40b3d 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_pgid.la diff --git a/src/plugins/proctrack/pgid/Makefile.in b/src/plugins/proctrack/pgid/Makefile.in index f711761954c6999aacd6acf606d59ac2acba906a..d66752c03a39e9f6fe3c213be68cf13bd0083217 100644 --- a/src/plugins/proctrack/pgid/Makefile.in +++ b/src/plugins/proctrack/pgid/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_pgid.la # Process group ID process tracking plugin. diff --git a/src/plugins/proctrack/sgi_job/Makefile.am b/src/plugins/proctrack/sgi_job/Makefile.am index 5c04974b8625ebc95cec6b936bb48f8f78f658bd..dd06ab16a296c967ab0957b0d43f491d93b69091 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_sgi_job.la diff --git a/src/plugins/proctrack/sgi_job/Makefile.in b/src/plugins/proctrack/sgi_job/Makefile.in index 956a456f9cba7c4139daaa6bc0a999b380c6cd9a..7e3128005943ff4d9b2426783cd1ef286184b666 100644 --- a/src/plugins/proctrack/sgi_job/Makefile.in +++ b/src/plugins/proctrack/sgi_job/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = - -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = proctrack_sgi_job.la proctrack_sgi_job_la_SOURCES = proctrack_sgi_job.c proctrack_sgi_job_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(OTHER_FLAGS) diff --git a/src/plugins/sched/backfill/Makefile.am b/src/plugins/sched/backfill/Makefile.am index baa9d6f7237ba11db1c76439132e73ed28a561b5..f6bc6f58e817284fad61dca90fb7fcb1a4ec7ec8 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_backfill.la diff --git a/src/plugins/sched/backfill/Makefile.in b/src/plugins/sched/backfill/Makefile.in index 3c644f0d062d8a787914a42b0464b0600d46b159..4bffdafaaca95511049ddb2313fcc97c0d914f26 100644 --- a/src/plugins/sched/backfill/Makefile.in +++ b/src/plugins/sched/backfill/Makefile.in @@ -394,7 +394,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign AM_CXXFLAGS = -fexceptions PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_backfill.la sched_backfill_la_SOURCES = backfill_wrapper.c \ backfill.c \ diff --git a/src/plugins/sched/builtin/Makefile.am b/src/plugins/sched/builtin/Makefile.am index 1f22326c81a51818295581d42fb5087bfe9ca773..3233c1cd8eb857ccbd964619cd604d3f253557a8 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_builtin.la diff --git a/src/plugins/sched/builtin/Makefile.in b/src/plugins/sched/builtin/Makefile.in index 5b32e7a7361f1234cb853394204fde41ca4958fc..d1ae2f170f22b82003ff5defbdc907f7533f51f7 100644 --- a/src/plugins/sched/builtin/Makefile.in +++ b/src/plugins/sched/builtin/Makefile.in @@ -394,7 +394,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign AM_CXXFLAGS = -fexceptions PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_builtin.la sched_builtin_la_SOURCES = \ builtin_wrapper.c \ diff --git a/src/plugins/sched/hold/Makefile.am b/src/plugins/sched/hold/Makefile.am index fcdb0e23f3a85748e666923c4d6ecd8448f5cdcc..64e91a322490e2deb0c042b40ae08967da54418c 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_hold.la diff --git a/src/plugins/sched/hold/Makefile.in b/src/plugins/sched/hold/Makefile.in index 9acd2fda50ec419053a06c0563f455dd19760f94..ae7eeaf4d9cc4b238f2212a7d12c8a36ddbf93bd 100644 --- a/src/plugins/sched/hold/Makefile.in +++ b/src/plugins/sched/hold/Makefile.in @@ -394,7 +394,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign AM_CXXFLAGS = -fexceptions PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_hold.la sched_hold_la_SOURCES = hold_wrapper.c sched_hold_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) diff --git a/src/plugins/sched/wiki/Makefile.am b/src/plugins/sched/wiki/Makefile.am index 87653145e19d465ffca112bcb3cd688c8d720ed0..d376baa75b16395d24c1e2df025b8d988a6da2a6 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_wiki.la diff --git a/src/plugins/sched/wiki/Makefile.in b/src/plugins/sched/wiki/Makefile.in index 5e882464b8d8d8c2603309930b19dfbc530568e2..27945adf48893e294bfc793714a11ce5f31ce12f 100644 --- a/src/plugins/sched/wiki/Makefile.in +++ b/src/plugins/sched/wiki/Makefile.in @@ -396,7 +396,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign AM_CXXFLAGS = -fexceptions PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_wiki.la sched_wiki_la_SOURCES = \ cancel_job.c \ diff --git a/src/plugins/sched/wiki2/Makefile.am b/src/plugins/sched/wiki2/Makefile.am index 86c81b5fafefa284b92cead04129ef68fb1f11df..8fff343e3e4f5bf237ac176d523cc2667cd7ef50 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_wiki2.la diff --git a/src/plugins/sched/wiki2/Makefile.in b/src/plugins/sched/wiki2/Makefile.in index b0eb33be1b536fb4586c71639d4a1f3a9ddbe351..0ac3c5c7f49d34c2b6f372e04fe304048dbe7c1d 100644 --- a/src/plugins/sched/wiki2/Makefile.in +++ b/src/plugins/sched/wiki2/Makefile.in @@ -399,7 +399,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign AM_CXXFLAGS = -fexceptions PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = sched_wiki2.la sched_wiki2_la_SOURCES = \ cancel_job.c \ diff --git a/src/plugins/select/bluegene/Makefile.am b/src/plugins/select/bluegene/Makefile.am index 42ca88b6c576a05e0d10f663bd4986759f8a3a33..cf02dc4ba0c9f9956ccbaa5d0b44bc88bc39cbf0 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) pkglib_LTLIBRARIES = select_bluegene.la diff --git a/src/plugins/select/bluegene/Makefile.in b/src/plugins/select/bluegene/Makefile.in index 617fd82eb6aa88e1a3068145bac32d4e59206268..9807bafe0f93dbf31a7baace248dcd42e8b7a5b0 100644 --- a/src/plugins/select/bluegene/Makefile.in +++ b/src/plugins/select/bluegene/Makefile.in @@ -558,7 +558,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* PLUGIN_FLAGS = -module -avoid-version --export-dynamic -lm -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) pkglib_LTLIBRARIES = select_bluegene.la $(am__append_2) \ $(am__append_3) $(am__append_5) noinst_LTLIBRARIES = libba_common.la libconfigure_api.la diff --git a/src/plugins/select/bluegene/ba/Makefile.am b/src/plugins/select/bluegene/ba/Makefile.am index bf42e1e051b2a5c0c13841c1a421dae8e1ae7644..f34a71eebd71a54f1145152230f850214012398a 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.* -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) # making a .la diff --git a/src/plugins/select/bluegene/ba/Makefile.in b/src/plugins/select/bluegene/ba/Makefile.in index 47c1b56e7b14d4640426d8daba25ffaa9b0fb710..582664222a313e4bd26d4e324ebe2073510707e6 100644 --- a/src/plugins/select/bluegene/ba/Makefile.in +++ b/src/plugins/select/bluegene/ba/Makefile.in @@ -377,7 +377,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) # making a .la noinst_LTLIBRARIES = libblock_allocator.la diff --git a/src/plugins/select/bluegene/ba_bgq/Makefile.am b/src/plugins/select/bluegene/ba_bgq/Makefile.am index 43473ec235d00a86f0d7069f4253ffd172e1946a..52b32dd59a9966329f00b8ede2a258e5818d680f 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.* -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) # making a .la diff --git a/src/plugins/select/bluegene/ba_bgq/Makefile.in b/src/plugins/select/bluegene/ba_bgq/Makefile.in index 5fffee0ea0c4f1902c1232adc53c70d9a5c095dc..ee165238f4b191cc76da1b96b3301a62d52b3ac7 100644 --- a/src/plugins/select/bluegene/ba_bgq/Makefile.in +++ b/src/plugins/select/bluegene/ba_bgq/Makefile.in @@ -387,7 +387,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) # making a .la noinst_LTLIBRARIES = libblock_allocator.la diff --git a/src/plugins/select/bluegene/bl/Makefile.am b/src/plugins/select/bluegene/bl/Makefile.am index b65c8b4616bde1b405c073d19e1c79d874297456..9aa7cc305b0cbaa65090ead98c6f1144551ea8a3 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.* -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) # making a .la diff --git a/src/plugins/select/bluegene/bl/Makefile.in b/src/plugins/select/bluegene/bl/Makefile.in index 97f12ad9dd91a01e64bbfb942007a1d57c90b4b8..f459eccc119eb37b07fff8d913414f36764fb0f6 100644 --- a/src/plugins/select/bluegene/bl/Makefile.in +++ b/src/plugins/select/bluegene/bl/Makefile.in @@ -366,7 +366,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) # making a .la noinst_LTLIBRARIES = libbridge_linker.la diff --git a/src/plugins/select/bluegene/bl_bgq/Makefile.am b/src/plugins/select/bluegene/bl_bgq/Makefile.am index 346bd147c864190bb54fa56af5c0d0fb1ae89dcb..6cb19946627c943ef64e32dbf04059a296e3efd0 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.* -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) # making a .la diff --git a/src/plugins/select/bluegene/bl_bgq/Makefile.in b/src/plugins/select/bluegene/bl_bgq/Makefile.in index 043864de7006ffb57efc3a4c7b1fe8890a77520e..3f463299aac47f5fafe0fd2632998adbf7efe16e 100644 --- a/src/plugins/select/bluegene/bl_bgq/Makefile.in +++ b/src/plugins/select/bluegene/bl_bgq/Makefile.in @@ -375,7 +375,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) # making a .la noinst_LTLIBRARIES = libbridge_linker.la diff --git a/src/plugins/select/bluegene/sfree/Makefile.am b/src/plugins/select/bluegene/sfree/Makefile.am index 5bb2dc4572c3376b2083b201128e100d7749693a..607d7e7d7bd6b4c4e8a64c4a236cb3fb4af3e429 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.* -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) sbin_PROGRAMS = sfree diff --git a/src/plugins/select/bluegene/sfree/Makefile.in b/src/plugins/select/bluegene/sfree/Makefile.in index 9c61fe7e0ea3604d1ba9df0f544825fbab951dd0..5ab066a3d3d9cfdede9b6fcb3b8e2e80c9d58ea9 100644 --- a/src/plugins/select/bluegene/sfree/Makefile.in +++ b/src/plugins/select/bluegene/sfree/Makefile.in @@ -369,7 +369,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES) sfree_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) sfree_SOURCES = sfree.c sfree.h opts.c sfree_LDFLAGS = -export-dynamic -lm $(CMD_LDFLAGS) \ diff --git a/src/plugins/select/cons_res/Makefile.am b/src/plugins/select/cons_res/Makefile.am index 06a86eb545d3bab1b69f9eb213eeac7fbae85eed..140e0f2d5b4857a9243fd4cc7dbf37e63bb510a1 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = select_cons_res.la diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in index 14f1e5992524df03d6a2343ba09c2390419a232f..eb39b9c17676588fafeb18d5423be0eb4b810d64 100644 --- a/src/plugins/select/cons_res/Makefile.in +++ b/src/plugins/select/cons_res/Makefile.in @@ -394,7 +394,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = select_cons_res.la # Consumable resources node selection plugin. diff --git a/src/plugins/select/cray/Makefile.am b/src/plugins/select/cray/Makefile.am index db5a9d8cdd82a6869d3b83e525de9613d1e1d6ba..d62c124f20779906fda8e17e258b2f7ffff2925f 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. pkglib_LTLIBRARIES = select_cray.la diff --git a/src/plugins/select/cray/Makefile.in b/src/plugins/select/cray/Makefile.in index e26b9423874350565182affe28eabe2aea7efe38..4cdd628443ef850709cdf5b73b85fd5a8a6564d5 100644 --- a/src/plugins/select/cray/Makefile.in +++ b/src/plugins/select/cray/Makefile.in @@ -440,7 +440,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. pkglib_LTLIBRARIES = select_cray.la # Cray node selection plugin. diff --git a/src/plugins/select/cray/libalps/Makefile.am b/src/plugins/select/cray/libalps/Makefile.am index 69d40f1f2c2cbe01d021ef101f9cf7eec1e3c9ed..923c9d2d2ed3db56194b263086caa3a1cbf3eb56 100644 --- a/src/plugins/select/cray/libalps/Makefile.am +++ b/src/plugins/select/cray/libalps/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. -I../ +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. -I../ noinst_LTLIBRARIES = libalps.la diff --git a/src/plugins/select/cray/libalps/Makefile.in b/src/plugins/select/cray/libalps/Makefile.in index 9ea4c8aa70c7bd4654a3b4acff4226641dfac076..21d1302e74ca3f72e4f6821898a4ee453dc63e5f 100644 --- a/src/plugins/select/cray/libalps/Makefile.in +++ b/src/plugins/select/cray/libalps/Makefile.in @@ -373,7 +373,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. -I../ +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. -I../ noinst_LTLIBRARIES = libalps.la libalps_la_SOURCES = \ ../basil_alps.h \ diff --git a/src/plugins/select/cray/libemulate/Makefile.am b/src/plugins/select/cray/libemulate/Makefile.am index ddcd3cfd3335ea0aab0959b86168207e751d84c9..682f4e8899dde4c7dd70d418d21c496a1255bfc9 100644 --- a/src/plugins/select/cray/libemulate/Makefile.am +++ b/src/plugins/select/cray/libemulate/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. -I../ +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. -I../ noinst_LTLIBRARIES = libalps.la diff --git a/src/plugins/select/cray/libemulate/Makefile.in b/src/plugins/select/cray/libemulate/Makefile.in index 153c7879ddf993e4f1eeb238ce1c41796b3cd1c7..8f053596c46861a34ba524b3687bbdee75ada188 100644 --- a/src/plugins/select/cray/libemulate/Makefile.in +++ b/src/plugins/select/cray/libemulate/Makefile.in @@ -366,7 +366,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. -I../ +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common -I. -I../ noinst_LTLIBRARIES = libalps.la libalps_la_SOURCES = \ ../basil_alps.h \ diff --git a/src/plugins/select/linear/Makefile.am b/src/plugins/select/linear/Makefile.am index 644b0b1eefc3aef29f581f8f954c0bed5a1d834e..92f4bf6e483e492645cddd058478b9f8d665f73e 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = select_linear.la diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in index 8582734abd0163e28900c3148740073633e1d9bf..1a6c18f3171f9bf50245fd314d7f9844e30dbdd4 100644 --- a/src/plugins/select/linear/Makefile.in +++ b/src/plugins/select/linear/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = select_linear.la # Linear node selection plugin. diff --git a/src/plugins/select/serial/Makefile.am b/src/plugins/select/serial/Makefile.am index c43d6d3b105ddb951c6402282009a6843ce53709..a838521e831891ff6606c6411a440dd2a596603f 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = select_serial.la diff --git a/src/plugins/select/serial/Makefile.in b/src/plugins/select/serial/Makefile.in index d10fdd769083751ad7b7ffe58e110e3841f86078..8af34757f6951e637073f0fcd84026c10fa4797d 100644 --- a/src/plugins/select/serial/Makefile.in +++ b/src/plugins/select/serial/Makefile.in @@ -394,7 +394,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = select_serial.la # serial job resource selection plugin. diff --git a/src/plugins/slurmctld/dynalloc/Makefile.am b/src/plugins/slurmctld/dynalloc/Makefile.am index 691891b1684373a9a9ccee16e34a5d93e8889557..3165259dae3fd0d1b0915af1a760881cb1e49993 100644 --- a/src/plugins/slurmctld/dynalloc/Makefile.am +++ b/src/plugins/slurmctld/dynalloc/Makefile.am @@ -6,7 +6,7 @@ AM_CXXFLAGS = -fexceptions PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common AS_DYNALLOC_SOURCES = \ allocate.c \ diff --git a/src/plugins/slurmctld/dynalloc/Makefile.in b/src/plugins/slurmctld/dynalloc/Makefile.in index 6edeae02273a4ee04445fc95e48bca0262ab23fc..5e5bc17ab85c2c7ed2f6b3e053952dec9e2e6980 100644 --- a/src/plugins/slurmctld/dynalloc/Makefile.in +++ b/src/plugins/slurmctld/dynalloc/Makefile.in @@ -409,7 +409,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign AM_CXXFLAGS = -fexceptions PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common AS_DYNALLOC_SOURCES = \ allocate.c \ allocate.h \ diff --git a/src/plugins/switch/none/Makefile.am b/src/plugins/switch/none/Makefile.am index 9dc0e293f8d82ae35e389dbfcb6116def6ab6004..beb2bdd42755072f620a25e5018664ef5d9a6c18 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = switch_none.la diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in index c88cff2619b1e9aecb223f6cf596f7386550e7d6..88576bc5a3da1c84cafc88c6278c0b189ccd35a6 100644 --- a/src/plugins/switch/none/Makefile.in +++ b/src/plugins/switch/none/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = switch_none.la # Null switch plugin. diff --git a/src/plugins/switch/nrt/Makefile.am b/src/plugins/switch/nrt/Makefile.am index af9b810c8a67de268ed188183a6b10da928d7bc9..37ed96788c5b5470899eab8b53221f6f7584d1af 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(NRT_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(NRT_CPPFLAGS) SWITCH_NRT_LA_SOURCES = \ diff --git a/src/plugins/switch/nrt/Makefile.in b/src/plugins/switch/nrt/Makefile.in index 8e6bdfd2bda3b6326cd8c5605b37e8d6ba111c39..3d2ffc49b86c36c5b5af22c88ed0d069128c8e0d 100644 --- a/src/plugins/switch/nrt/Makefile.in +++ b/src/plugins/switch/nrt/Makefile.in @@ -438,7 +438,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(NRT_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(NRT_CPPFLAGS) SWITCH_NRT_LA_SOURCES = \ nrt.c \ nrt_keys.h \ diff --git a/src/plugins/switch/nrt/libpermapi/Makefile.am b/src/plugins/switch/nrt/libpermapi/Makefile.am index 353289d26b14d187b0105fac253007c4586551ed..2b856e7c15fb36165f7d43b39f8b0a9261813360 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common \ +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common \ -I$(top_srcdir)/src/srun/libsrun $(NRT_CPPFLAGS) # making a .la diff --git a/src/plugins/switch/nrt/libpermapi/Makefile.in b/src/plugins/switch/nrt/libpermapi/Makefile.in index 6a1bf18c7fc753feddaa50c26b5fa106b45782eb..be77adbd06283eae6646a1c0b6efc1d694cc56ee 100644 --- a/src/plugins/switch/nrt/libpermapi/Makefile.in +++ b/src/plugins/switch/nrt/libpermapi/Makefile.in @@ -395,7 +395,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common \ +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common \ -I$(top_srcdir)/src/srun/libsrun $(NRT_CPPFLAGS) diff --git a/src/plugins/task/affinity/Makefile.am b/src/plugins/task/affinity/Makefile.am index 1a60237a56de9f5007094e4698643a03367e29a8..5c8336124793ebde907736b8344ef5f171e0a163 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common if HAVE_SCHED_SETAFFINITY pkglib_LTLIBRARIES = task_affinity.la diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in index 1cfffe066616de0a4a55430b9de8838f8f360ff8..4684c3b41e1134f8e72c6ac3d6b974d5a2d88a7f 100644 --- a/src/plugins/task/affinity/Makefile.in +++ b/src/plugins/task/affinity/Makefile.in @@ -405,7 +405,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common @HAVE_SCHED_SETAFFINITY_FALSE@pkglib_LTLIBRARIES = @HAVE_SCHED_SETAFFINITY_TRUE@pkglib_LTLIBRARIES = task_affinity.la @HAVE_SCHED_SETAFFINITY_TRUE@task_affinity_la_SOURCES = \ diff --git a/src/plugins/task/cgroup/Makefile.am b/src/plugins/task/cgroup/Makefile.am index b9937815c9f03b294c5cbf44f1b9da7e17694f7f..ea78d554895da63eedb4ee2de830fe5be909352e 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = task_cgroup.la diff --git a/src/plugins/task/cgroup/Makefile.in b/src/plugins/task/cgroup/Makefile.in index 00ddb90fa9a0542c5f46e980e746cd382f4baea2..08412a553b6b080ff82242a9340b2c496417f19f 100644 --- a/src/plugins/task/cgroup/Makefile.in +++ b/src/plugins/task/cgroup/Makefile.in @@ -396,7 +396,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = task_cgroup.la # cgroup task plugin. diff --git a/src/plugins/task/none/Makefile.am b/src/plugins/task/none/Makefile.am index 5163bf6557b18ef9f2808e728536ab7f1eca1220..1bfa2e50ec2392a2c54e458d98e750e4e82b2fec 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = task_none.la diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in index 682a63fcd9b961fb30b065b49cc24ebaa994ed26..fcaabd73a359d09eb1515651bed99242816ec3d3 100644 --- a/src/plugins/task/none/Makefile.in +++ b/src/plugins/task/none/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = task_none.la # Null task plugin. diff --git a/src/plugins/topology/3d_torus/Makefile.am b/src/plugins/topology/3d_torus/Makefile.am index c820d405540840ca7309d4f04bf15a4fa1effe65..c8d7c473f5104d596cd87df161bf26dca4d10e43 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = topology_3d_torus.la diff --git a/src/plugins/topology/3d_torus/Makefile.in b/src/plugins/topology/3d_torus/Makefile.in index 84d10f8be582f1894b82b142a66034f27235f988..a1c8b5ad48d51022c4e0d39be61470dd1977accf 100644 --- a/src/plugins/topology/3d_torus/Makefile.in +++ b/src/plugins/topology/3d_torus/Makefile.in @@ -394,7 +394,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = topology_3d_torus.la # 3d_torus topology plugin. diff --git a/src/plugins/topology/node_rank/Makefile.am b/src/plugins/topology/node_rank/Makefile.am index 08f9b5829e9d2af0b9e2ec416bc7c7f94883a4db..93f11c79b3180839b2a3f581846b78e0b96fe8d5 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = topology_node_rank.la diff --git a/src/plugins/topology/node_rank/Makefile.in b/src/plugins/topology/node_rank/Makefile.in index c2345d669dbe2f05de5c0d89cd512618c3abfc94..0ead85ebffad3f6bf1f9a79ac18948e8b1947c5f 100644 --- a/src/plugins/topology/node_rank/Makefile.in +++ b/src/plugins/topology/node_rank/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = topology_node_rank.la # Null topology plugin. diff --git a/src/plugins/topology/none/Makefile.am b/src/plugins/topology/none/Makefile.am index fdd40acd8f8b1700d398c97adaaec325b541388e..409c3e03aa2f86928a814945d0a8196759515cf7 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = topology_none.la diff --git a/src/plugins/topology/none/Makefile.in b/src/plugins/topology/none/Makefile.in index c24a4f80f40d950081aa4390c578bb50ae0e081c..15f29b925eac40972560d399b6950c3acdfc17f3 100644 --- a/src/plugins/topology/none/Makefile.in +++ b/src/plugins/topology/none/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = topology_none.la # Null topology plugin. diff --git a/src/plugins/topology/tree/Makefile.am b/src/plugins/topology/tree/Makefile.am index 19d7ec317366b5c871f0fa94570afb8cf03e9858..6a3e65eb156e664826e7c5c3d8745d115256f73b 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = topology_tree.la diff --git a/src/plugins/topology/tree/Makefile.in b/src/plugins/topology/tree/Makefile.in index 05848815250da2c94f345c1891a5fc55c00f96a1..1a5e56c288b3a39659bb58d1014e0754a035ddba 100644 --- a/src/plugins/topology/tree/Makefile.in +++ b/src/plugins/topology/tree/Makefile.in @@ -393,7 +393,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign PLUGIN_FLAGS = -module -avoid-version --export-dynamic -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = topology_tree.la # Null topology plugin. diff --git a/src/sacct/Makefile.am b/src/sacct/Makefile.am index d22d76ce36f2e6d0bed80f9a49b64e165b76d623..acc8a347f5b6a4162333391da4cb086d0639a9c5 100644 --- a/src/sacct/Makefile.am +++ b/src/sacct/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) bin_PROGRAMS = sacct diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in index afa9a3068225ec3de93bc1818763fe9ec99671d9..0d0bae9633971a941548fc44f01f7382d94fdea8 100644 --- a/src/sacct/Makefile.in +++ b/src/sacct/Makefile.in @@ -373,7 +373,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) sacct_LDADD = $(top_builddir)/src/db_api/libslurmdb.o $(DL_LIBS) sacct_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) \ $(HWLOC_LDFLAGS) $(HWLOC_LIBS) diff --git a/src/sacctmgr/Makefile.am b/src/sacctmgr/Makefile.am index ca694b674548aba2581202f8e7cd761ba993d8da..a07e59a9adedf2775e7310254be8a316106cb384 100644 --- a/src/sacctmgr/Makefile.am +++ b/src/sacctmgr/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) bin_PROGRAMS = sacctmgr diff --git a/src/sacctmgr/Makefile.in b/src/sacctmgr/Makefile.in index 2bafbe4e0d6993fdaaf8ea8c297b52b8e257bb4c..76420bd462b5caa982406d7d8a88c60abdd8b65a 100644 --- a/src/sacctmgr/Makefile.in +++ b/src/sacctmgr/Makefile.in @@ -376,7 +376,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) sacctmgr_LDADD = $(top_builddir)/src/db_api/libslurmdb.o $(DL_LIBS) \ $(READLINE_LIBS) diff --git a/src/salloc/Makefile.am b/src/salloc/Makefile.am index 3f795540da860d18519dd4555367e2ca08496c20..4bcf9c6950ce1832de4e9f130e4014bc7f446869 100644 --- a/src/salloc/Makefile.am +++ b/src/salloc/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = salloc diff --git a/src/salloc/Makefile.in b/src/salloc/Makefile.in index 602392e49e800a1848ac64220d3a5ea434198e21..6fee9294ca05edef054eb788ca276bc9bc0691cd 100644 --- a/src/salloc/Makefile.in +++ b/src/salloc/Makefile.in @@ -371,7 +371,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) salloc_SOURCES = salloc.c salloc.h opt.c opt.h convenience_libs = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) salloc_LDADD = $(convenience_libs) $(am__append_1) diff --git a/src/sattach/Makefile.am b/src/sattach/Makefile.am index 59edc23dd097da7065937ec960f615906c098236..53109d762be87ebfbfd51d7efa6cd8d6325e2481 100644 --- a/src/sattach/Makefile.am +++ b/src/sattach/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) bin_PROGRAMS = sattach diff --git a/src/sattach/Makefile.in b/src/sattach/Makefile.in index 89f41ca8a46b3daa54c2af25065fe74537caba2b..b9dc226bdeecdfd0886ebcfbc22c2ad042ec22ae 100644 --- a/src/sattach/Makefile.in +++ b/src/sattach/Makefile.in @@ -370,7 +370,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) sattach_SOURCES = \ attach.c attach.h \ opt.c opt.h \ diff --git a/src/sbatch/Makefile.am b/src/sbatch/Makefile.am index 02bc1109e72aaeabe2f503b178ac58061eb9914e..9b5a031529687b2cbf6d490e871800d9845367b3 100644 --- a/src/sbatch/Makefile.am +++ b/src/sbatch/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) bin_PROGRAMS = sbatch diff --git a/src/sbatch/Makefile.in b/src/sbatch/Makefile.in index 0737bf3a8f96c3ab386ff330f4fe8a0d02dfb60e..fa376daa19fe81f6bf6bf2eda98d4da31e9a6a40 100644 --- a/src/sbatch/Makefile.in +++ b/src/sbatch/Makefile.in @@ -371,7 +371,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) sbatch_SOURCES = sbatch.c mult_cluster.c mult_cluster.h opt.c opt.h convenience_libs = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) sbatch_LDADD = $(convenience_libs) diff --git a/src/sbcast/Makefile.am b/src/sbcast/Makefile.am index f52394f489185f12f2e5bb7b56a56792f4cd360a..083f26990092ece92985bf4dcdb4d87b096d1c1e 100644 --- a/src/sbcast/Makefile.am +++ b/src/sbcast/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = sbcast sbcast_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) -lm diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in index cc704478548ffdb58f79c5e710003890cde388e7..8456367151899706585c83842a4c50c01c0a1213 100644 --- a/src/sbcast/Makefile.in +++ b/src/sbcast/Makefile.in @@ -372,7 +372,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) sbcast_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) -lm noinst_HEADERS = sbcast.h sbcast_SOURCES = agent.c sbcast.c opts.c diff --git a/src/scancel/Makefile.am b/src/scancel/Makefile.am index e4d6514a8930a206b8bc733c48b69ef9fc169562..9ab1f4724b01001188f7a8fea67acefa28425e64 100644 --- a/src/scancel/Makefile.am +++ b/src/scancel/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) bin_PROGRAMS = scancel diff --git a/src/scancel/Makefile.in b/src/scancel/Makefile.in index 15e034432c4183819cb57c550f4409f6b372c2a7..f01fa4c843378e1f669b67a7269f3eecbd6277a6 100644 --- a/src/scancel/Makefile.in +++ b/src/scancel/Makefile.in @@ -371,7 +371,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) scancel_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) noinst_HEADERS = scancel.h scancel_SOURCES = scancel.c opt.c diff --git a/src/scontrol/Makefile.am b/src/scontrol/Makefile.am index 22e0132a6b1ec4a6f95b4729f1f292ccc3b9f636..8de5924c4bd19cd5eaa426b5be03675757ba6dc2 100644 --- a/src/scontrol/Makefile.am +++ b/src/scontrol/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = scontrol diff --git a/src/scontrol/Makefile.in b/src/scontrol/Makefile.in index fa77796e8f3055fa8d81a0483e4cbe65941f35dc..8e5188c8019895cec64c7ae16ec60388ec335b4d 100644 --- a/src/scontrol/Makefile.in +++ b/src/scontrol/Makefile.in @@ -373,7 +373,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) scontrol_SOURCES = \ create_res.c \ info_block.c \ diff --git a/src/sdiag/Makefile.am b/src/sdiag/Makefile.am index f9c9726dd453f3770b897b18d770cf176fa727c1..93702cf02e989ba5da35dae376add8cde8b9b295 100644 --- a/src/sdiag/Makefile.am +++ b/src/sdiag/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = sdiag sdiag_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) diff --git a/src/sdiag/Makefile.in b/src/sdiag/Makefile.in index 0d6442f3ea001191f0477a5588d66b80ea79aa38..a0e762214e53245ed3a75c5d5301368ac8fa9567 100644 --- a/src/sdiag/Makefile.in +++ b/src/sdiag/Makefile.in @@ -369,7 +369,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) sdiag_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) sdiag_SOURCES = sdiag.c opts.c sdiag_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) \ diff --git a/src/sinfo/Makefile.am b/src/sinfo/Makefile.am index 63ea14ea25e64717fb38f5e4418bdc28f8ebda62..9a00a5e7b3938219326165b023b26701281454f7 100644 --- a/src/sinfo/Makefile.am +++ b/src/sinfo/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = sinfo sinfo_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) diff --git a/src/sinfo/Makefile.in b/src/sinfo/Makefile.in index 4bb647275e264dbeae954bc180438f72b13247bd..5a43fa4accfc1268b033b77ab5c47ca2a42efc97 100644 --- a/src/sinfo/Makefile.in +++ b/src/sinfo/Makefile.in @@ -373,7 +373,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) sinfo_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) noinst_HEADERS = sinfo.h print.h sinfo_SOURCES = sinfo.c opts.c print.c sort.c diff --git a/src/slurmctld/Makefile.am b/src/slurmctld/Makefile.am index addd296c5f1674e003e32ac2ee5a9409dd08dcb1..6be0ac4f39ce35d3cdad6757550f0d4a48d65672 100644 --- a/src/slurmctld/Makefile.am +++ b/src/slurmctld/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) # noinst_LTLIBRARIES = libslurmctld.la # libslurmctld_la_LDFLAGS = $(LIB_LDFLAGS) -module --export-dynamic diff --git a/src/slurmctld/Makefile.in b/src/slurmctld/Makefile.in index df20075d6778dd7c67b8b7fbed76b5ef39f91068..b324693340480f3f4b140f3d1a2d7819f8f7aee5 100644 --- a/src/slurmctld/Makefile.in +++ b/src/slurmctld/Makefile.in @@ -381,7 +381,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -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 f94e694b7dc2fcf6fe8454ed6c433d587fdd786e..b2f88f2b053fba1288bb0a075ab1b7a378cf9f10 100644 --- a/src/slurmd/common/Makefile.am +++ b/src/slurmd/common/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) # making a .la diff --git a/src/slurmd/common/Makefile.in b/src/slurmd/common/Makefile.in index 5eaecbb2c8bd8cc693eb11e5fb81ac5f20e4f865..8606031eb63247cb6272a32bab957c070fd4a997 100644 --- a/src/slurmd/common/Makefile.in +++ b/src/slurmd/common/Makefile.in @@ -363,7 +363,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) # making a .la noinst_LTLIBRARIES = libslurmd_common.la diff --git a/src/slurmd/slurmd/Makefile.am b/src/slurmd/slurmd/Makefile.am index c7c5f3324744b0903779924264ad98b2ca4a14f9..c494b187276d6f1d4df739cea13b49bd430961b1 100644 --- a/src/slurmd/slurmd/Makefile.am +++ b/src/slurmd/slurmd/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign sbin_PROGRAMS = slurmd -AM_CPPFLAGS = -DLIBSLURM_SO=\"$(libdir)/libslurm.so\" \ +AM_CFLAGS = -DLIBSLURM_SO=\"$(libdir)/libslurm.so\" \ -I$(top_srcdir) $(HWLOC_CPPFLAGS) slurmd_LDADD = \ diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in index 8e66c8699770d93c1b6e615dc4dc91c4739f303d..554fcfd1a262dd4ca2e5f8ab3b5b00851114ca9c 100644 --- a/src/slurmd/slurmd/Makefile.in +++ b/src/slurmd/slurmd/Makefile.in @@ -373,7 +373,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -DLIBSLURM_SO=\"$(libdir)/libslurm.so\" \ +AM_CFLAGS = -DLIBSLURM_SO=\"$(libdir)/libslurm.so\" \ -I$(top_srcdir) $(HWLOC_CPPFLAGS) slurmd_LDADD = \ diff --git a/src/slurmd/slurmstepd/Makefile.am b/src/slurmd/slurmstepd/Makefile.am index fa662cbb53bf228788e51bfe3056ca6f2293d620..3ecdf2b19d88ffa5b944465589a279590953f7e6 100644 --- a/src/slurmd/slurmstepd/Makefile.am +++ b/src/slurmd/slurmstepd/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign sbin_PROGRAMS = slurmstepd -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) slurmstepd_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in index 99fa0a934b7d79a4e3531fa474fe071023b33dfd..0f3124623b7097398a7455ba581d20bb806dac23 100644 --- a/src/slurmd/slurmstepd/Makefile.in +++ b/src/slurmd/slurmstepd/Makefile.in @@ -375,7 +375,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) slurmstepd_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ $(top_builddir)/src/api/libslurm.o $(DL_LIBS) \ diff --git a/src/slurmdbd/Makefile.am b/src/slurmdbd/Makefile.am index bfd3ea7bdba330ca4165713e401ae4ebabdbb770..78fc37522184decb52ed9878c9e15a435627aea2 100644 --- a/src/slurmdbd/Makefile.am +++ b/src/slurmdbd/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) sbin_PROGRAMS = slurmdbd diff --git a/src/slurmdbd/Makefile.in b/src/slurmdbd/Makefile.in index 7276b1527710ab68ae23083aa6316abe98a43e83..4480332dc6f806f35282ab90f751a7fe1309b538 100644 --- a/src/slurmdbd/Makefile.in +++ b/src/slurmdbd/Makefile.in @@ -372,7 +372,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) slurmdbd_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ $(top_builddir)/src/api/libslurm.o $(DL_LIBS) diff --git a/src/smap/Makefile.am b/src/smap/Makefile.am index b89c64bb93410eea6af1ec01ae0c488dc834b2cb..08c190c2417bbe6aafd0d2d6d19aad801c4ed692 100644 --- a/src/smap/Makefile.am +++ b/src/smap/Makefile.am @@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = foreign LIBS=$(NCURSES) -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) if BUILD_SMAP diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in index 7304c6c6c2f35e328cf218611f5aa93b8a9f434c..6e9d6213432ee6aef8d63ec1be24e71b69acc3e3 100644 --- a/src/smap/Makefile.in +++ b/src/smap/Makefile.in @@ -391,7 +391,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) @BUILD_SMAP_TRUE@noinst_HEADERS = smap.h @BUILD_SMAP_TRUE@smap_SOURCES = smap.c job_functions.c \ @BUILD_SMAP_TRUE@ partition_functions.c grid_functions.c \ diff --git a/src/sprio/Makefile.am b/src/sprio/Makefile.am index 3c55c9df2ee9d878761e737af2ca966f97cbdfd0..bb53e84286ebd0035faa14b9d35ca981f6d6f1d5 100644 --- a/src/sprio/Makefile.am +++ b/src/sprio/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) bin_PROGRAMS = sprio diff --git a/src/sprio/Makefile.in b/src/sprio/Makefile.in index 402a321c961476e2369a23380215e3ffeacca760..9f717302782358d0fa9e9a778c1338d6b5089e95 100644 --- a/src/sprio/Makefile.in +++ b/src/sprio/Makefile.in @@ -372,7 +372,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) sprio_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) noinst_HEADERS = sprio.h print.h sprio_SOURCES = sprio.c print.c opts.c diff --git a/src/squeue/Makefile.am b/src/squeue/Makefile.am index 9a0dfba13372480f55f59b59aafdc1dc1b59b819..7dea1928d1ab660d4bf44b952a185e8ded2f1962 100644 --- a/src/squeue/Makefile.am +++ b/src/squeue/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) bin_PROGRAMS = squeue diff --git a/src/squeue/Makefile.in b/src/squeue/Makefile.in index faaa06efb3d53285d33810d71356046f75decd52..712ee1ce07dc2bfda9a3635cdf3edaa32c148dc7 100644 --- a/src/squeue/Makefile.in +++ b/src/squeue/Makefile.in @@ -373,7 +373,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) squeue_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) noinst_HEADERS = squeue.h print.h squeue_SOURCES = squeue.c print.c opts.c sort.c diff --git a/src/sreport/Makefile.am b/src/sreport/Makefile.am index a7de403075d3114f114d8b36bf8c9206102d8d09..fd7c73416fec1c0b9f1899a6bc0789c0cd5a08c5 100644 --- a/src/sreport/Makefile.am +++ b/src/sreport/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) bin_PROGRAMS = sreport diff --git a/src/sreport/Makefile.in b/src/sreport/Makefile.in index 7890b4c2fd4668c167135913aabb1ad80aafddac..c0e4811b787c47b65670b366570db89b697b69ab 100644 --- a/src/sreport/Makefile.in +++ b/src/sreport/Makefile.in @@ -371,7 +371,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) sreport_SOURCES = \ sreport.c sreport.h \ cluster_reports.c cluster_reports.h \ diff --git a/src/srun/Makefile.am b/src/srun/Makefile.am index 64ed081936a90239a431b8310c27b5e8fe84de96..6d0861041904b3297cad25e56925250d9b8c0e8c 100644 --- a/src/srun/Makefile.am +++ b/src/srun/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = libsrun AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun bin_PROGRAMS = srun diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in index 635280b70a0bbb22eea350d79a2ce0e82604c6f3..5e2607f8bd95bce1b802798936db6528ffdae460 100644 --- a/src/srun/Makefile.in +++ b/src/srun/Makefile.in @@ -412,7 +412,7 @@ top_srcdir = @top_srcdir@ SUBDIRS = libsrun AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun convenience_libs = $(top_builddir)/src/srun/libsrun/libsrun.la \ $(top_builddir)/src/api/libslurm.o diff --git a/src/srun/libsrun/Makefile.am b/src/srun/libsrun/Makefile.am index 4011cf4ebb085b2e8c1a781f88c821b14f7e7cf6..95ebd167b6d13ffec63c619777becb1b5b508331 100644 --- a/src/srun/libsrun/Makefile.am +++ b/src/srun/libsrun/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun noinst_LTLIBRARIES = libsrun.la diff --git a/src/srun/libsrun/Makefile.in b/src/srun/libsrun/Makefile.in index a46b02e2ee16d45f69f8b96b4d28132f5db484c2..cc37adb2f5008f192bd544386e6809b5841cb751 100644 --- a/src/srun/libsrun/Makefile.in +++ b/src/srun/libsrun/Makefile.in @@ -367,7 +367,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun noinst_LTLIBRARIES = libsrun.la libsrun_la_SOURCES = \ allocate.c allocate.h \ diff --git a/src/srun_cr/Makefile.am b/src/srun_cr/Makefile.am index f4e5fd7106563be73087e68a00c6eb05388a4214..c8c6956ab8f8dc0d360448e4075eaa2aa761e69b 100644 --- a/src/srun_cr/Makefile.am +++ b/src/srun_cr/Makefile.am @@ -5,7 +5,7 @@ CLEANFILES = core.* if WITH_BLCR -AM_CPPFLAGS = -I$(top_srcdir) $(BLCR_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) $(BLCR_CPPFLAGS) bin_PROGRAMS = srun_cr diff --git a/src/srun_cr/Makefile.in b/src/srun_cr/Makefile.in index 3e6f6892d17055dca131c5ea72c70b5e2e71ee55..ea9ca223411f25d20ec9897a50f34ed479634b57 100644 --- a/src/srun_cr/Makefile.in +++ b/src/srun_cr/Makefile.in @@ -375,7 +375,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -@WITH_BLCR_TRUE@AM_CPPFLAGS = -I$(top_srcdir) $(BLCR_CPPFLAGS) +@WITH_BLCR_TRUE@AM_CFLAGS = -I$(top_srcdir) $(BLCR_CPPFLAGS) @WITH_BLCR_TRUE@srun_cr_SOURCES = srun_cr.c @WITH_BLCR_TRUE@convenience_libs = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) @WITH_BLCR_TRUE@srun_cr_LDADD = $(convenience_libs) $(BLCR_LIBS) diff --git a/src/sshare/Makefile.am b/src/sshare/Makefile.am index 15ab8489bdddf2bf6bb1dd1a601360043c5d992b..3cc279f6080e60f45eee101328b198dfd264ac29 100644 --- a/src/sshare/Makefile.am +++ b/src/sshare/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) bin_PROGRAMS = sshare diff --git a/src/sshare/Makefile.in b/src/sshare/Makefile.in index a3932a534156392e9058b64118df3b13d25080c3..3ac6ff6c49b35ba1b71472532f4178b3d4823961 100644 --- a/src/sshare/Makefile.in +++ b/src/sshare/Makefile.in @@ -369,7 +369,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) sshare_LDADD = \ $(top_builddir)/src/api/libslurm.o $(DL_LIBS) -lm \ $(READLINE_LIBS) diff --git a/src/sstat/Makefile.am b/src/sstat/Makefile.am index 9ab534a08f0621d8e0b83d34691db3ee21e39cf2..782040c3d822e8cec732156bbab54b35c96767d5 100644 --- a/src/sstat/Makefile.am +++ b/src/sstat/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) bin_PROGRAMS = sstat diff --git a/src/sstat/Makefile.in b/src/sstat/Makefile.in index fe09b3bb9977d005d3897417e23787140766c658..9805202009dd31e02bdc9ce8e3639fdf9a989e3c 100644 --- a/src/sstat/Makefile.in +++ b/src/sstat/Makefile.in @@ -369,7 +369,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) sstat_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) sstat_SOURCES = \ options.c \ diff --git a/src/strigger/Makefile.am b/src/strigger/Makefile.am index 7871e0bd459323aca337f9050fce8b1673550f2a..1b05221d5f4415dadb4c72191d8b7a0c98783dd9 100644 --- a/src/strigger/Makefile.am +++ b/src/strigger/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = strigger strigger_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) diff --git a/src/strigger/Makefile.in b/src/strigger/Makefile.in index e3373d18ac4ef6f5c65d5b035066dc4189c35315..539270d56135781b690869fc47c00350c0cedd6e 100644 --- a/src/strigger/Makefile.in +++ b/src/strigger/Makefile.in @@ -372,7 +372,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) strigger_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) noinst_HEADERS = strigger.h strigger_SOURCES = strigger.c opts.c diff --git a/src/sview/Makefile.am b/src/sview/Makefile.am index 3b36046da60658a0ef3ee22efbf53a6f5bc0c02c..97036418d8bcded63ebf73053486a3bbff2868c6 100644 --- a/src/sview/Makefile.am +++ b/src/sview/Makefile.am @@ -3,7 +3,7 @@ # Makefile for sview AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) if BUILD_SVIEW diff --git a/src/sview/Makefile.in b/src/sview/Makefile.in index fbacf9cdf411d9b52c630cf79a1e4e1d74380380..250af556a1c34b011e6f02e2769f0cfdcafb7754 100644 --- a/src/sview/Makefile.in +++ b/src/sview/Makefile.in @@ -397,7 +397,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) +AM_CFLAGS = -I$(top_srcdir) $(BG_INCLUDES) @BUILD_SVIEW_TRUE@sview_LDADD = $(top_builddir)/src/db_api/libslurmdb.o $(DL_LIBS) @BUILD_SVIEW_TRUE@noinst_HEADERS = sview.h @BUILD_SVIEW_TRUE@sview_SOURCES = sview.c popups.c grid.c part_info.c job_info.c \ diff --git a/testsuite/slurm_unit/api/Makefile.am b/testsuite/slurm_unit/api/Makefile.am index a46654bb4b12c7e63651be262b30224caa5c46bd..4958a80cd54030cecd5c55d1c7d6c8a0e762488e 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 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -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/Makefile.in b/testsuite/slurm_unit/api/Makefile.in index b1449b90f8f9f92caa6ee16b3574a43df3c9204b..87c49d29a198c4a98835e7f05404ad460545d84d 100644 --- a/testsuite/slurm_unit/api/Makefile.in +++ b/testsuite/slurm_unit/api/Makefile.in @@ -403,7 +403,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign SUBDIRS = manual -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common +AM_CFLAGS = -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 5b7a878630b9812d10691d6faa39eab383505828..3b00279c88dba182cd942db7fd8e03c773f56d98 100644 --- a/testsuite/slurm_unit/api/manual/Makefile.am +++ b/testsuite/slurm_unit/api/manual/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) LDADD = $(top_builddir)/src/api/libslurm.la check_PROGRAMS = \ cancel-tst \ diff --git a/testsuite/slurm_unit/api/manual/Makefile.in b/testsuite/slurm_unit/api/manual/Makefile.in index a98f7665e40552eeed2290da53abc53f88028511..aeeece3f3df71e32427558d14d3d2ea7c10f37eb 100644 --- a/testsuite/slurm_unit/api/manual/Makefile.in +++ b/testsuite/slurm_unit/api/manual/Makefile.in @@ -394,7 +394,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -I$(top_srcdir) LDADD = $(top_builddir)/src/api/libslurm.la all: all-am diff --git a/testsuite/slurm_unit/common/Makefile.am b/testsuite/slurm_unit/common/Makefile.am index 875e53b1bbb070b2474824bb31371ae5e1b64b39..6c79b050d6868325758ba2ae31ec0c68cb3ad6b7 100644 --- a/testsuite/slurm_unit/common/Makefile.am +++ b/testsuite/slurm_unit/common/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(HWLOC_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) $(HWLOC_CPPFLAGS) LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) $(HWLOC_LIBS) check_PROGRAMS = \ diff --git a/testsuite/slurm_unit/common/Makefile.in b/testsuite/slurm_unit/common/Makefile.in index 36cc51d1ca9f116f61f31aa3544a2cdbede6fa99..1662d0ca8c3f94d69b2f30806128ba5a2f1466fb 100644 --- a/testsuite/slurm_unit/common/Makefile.in +++ b/testsuite/slurm_unit/common/Makefile.in @@ -396,7 +396,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(HWLOC_CPPFLAGS) +AM_CFLAGS = -I$(top_srcdir) $(HWLOC_CPPFLAGS) LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) $(HWLOC_LIBS) @HAVE_CHECK_TRUE@MYCFLAGS = @CHECK_CFLAGS@ -Wall -ansi -pedantic \ @HAVE_CHECK_TRUE@ -std=c99 -D_ISO99_SOURCE \