Add $(EXEEXT) to all binary generated so platform can easily configure
the binaries extension and use the LOG_COMPILER features of automake.
This should have no visible effect unless EXEEXT is set by the configure

Signed-off-by: Nicolas Morey-Chaisemartin <nmo...@kalray.eu>
---
 configure.ac                      |  1 +
 example/classifier/Makefile.am    |  2 +-
 example/generator/Makefile.am     |  2 +-
 example/ipsec/Makefile.am         |  2 +-
 example/packet/Makefile.am        |  2 +-
 example/timer/Makefile.am         |  2 +-
 helper/test/Makefile.am           |  6 +++---
 test/miscellaneous/Makefile.am    |  4 ++--
 test/performance/Makefile.am      |  6 +++---
 test/validation/Makefile.am       | 36 ++++++++++++++++++------------------
 test/validation/pktio/Makefile.am |  2 +-
 11 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/configure.ac b/configure.ac
index de7de50..04df88a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -322,6 +322,7 @@ AC_SUBST([AM_CFLAGS])
 AC_SUBST([CFLAGS])
 AC_SUBST([AM_LDFLAGS])
 AC_SUBST([LDFLAGS])
+AC_SUBST([EXEEXT])
 
 AC_OUTPUT
 AC_MSG_RESULT([
diff --git a/example/classifier/Makefile.am b/example/classifier/Makefile.am
index 938f094..0c66e14 100644
--- a/example/classifier/Makefile.am
+++ b/example/classifier/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/example/Makefile.inc
 
-bin_PROGRAMS = odp_classifier
+bin_PROGRAMS = odp_classifier$(EXEEXT)
 odp_classifier_LDFLAGS = $(AM_LDFLAGS) -static
 odp_classifier_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example
 
diff --git a/example/generator/Makefile.am b/example/generator/Makefile.am
index fcb5965..49a7497 100644
--- a/example/generator/Makefile.am
+++ b/example/generator/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/example/Makefile.inc
 
-bin_PROGRAMS = odp_generator
+bin_PROGRAMS = odp_generator$(EXEEXT)
 odp_generator_LDFLAGS = $(AM_LDFLAGS) -static
 odp_generator_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example
 
diff --git a/example/ipsec/Makefile.am b/example/ipsec/Makefile.am
index 0194f1b..c82ea0a 100644
--- a/example/ipsec/Makefile.am
+++ b/example/ipsec/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/example/Makefile.inc
 
-bin_PROGRAMS = odp_ipsec
+bin_PROGRAMS = odp_ipsec$(EXEEXT)
 odp_ipsec_LDFLAGS = $(AM_LDFLAGS) -static
 odp_ipsec_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example
 
diff --git a/example/packet/Makefile.am b/example/packet/Makefile.am
index a36e29a..a811234 100644
--- a/example/packet/Makefile.am
+++ b/example/packet/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/example/Makefile.inc
 
-bin_PROGRAMS = odp_pktio
+bin_PROGRAMS = odp_pktio$(EXEEXT)
 odp_pktio_LDFLAGS = $(AM_LDFLAGS) -static
 odp_pktio_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example
 
diff --git a/example/timer/Makefile.am b/example/timer/Makefile.am
index 04d51c4..fcb67a9 100644
--- a/example/timer/Makefile.am
+++ b/example/timer/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/example/Makefile.inc
 
-bin_PROGRAMS = odp_timer_test
+bin_PROGRAMS = odp_timer_test$(EXEEXT)
 odp_timer_test_LDFLAGS = $(AM_LDFLAGS) -static
 odp_timer_test_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example
 
diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am
index ec8d2c7..9ac82eb 100644
--- a/helper/test/Makefile.am
+++ b/helper/test/Makefile.am
@@ -5,9 +5,9 @@ AM_LDFLAGS += -static
 
 TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} TEST_DIR=${builddir}
 
-EXECUTABLES = odp_chksum \
-              odp_thread \
-              odp_process
+EXECUTABLES = odp_chksum$(EXEEXT) \
+              odp_thread$(EXEEXT) \
+              odp_process$(EXEEXT)
 
 COMPILE_ONLY =
 
diff --git a/test/miscellaneous/Makefile.am b/test/miscellaneous/Makefile.am
index 863643c..7d8cf35 100644
--- a/test/miscellaneous/Makefile.am
+++ b/test/miscellaneous/Makefile.am
@@ -1,8 +1,8 @@
 include $(top_srcdir)/test/Makefile.inc
 
 if test_cpp
-bin_PROGRAMS =  odp_api_from_cpp
-TESTS = odp_api_from_cpp
+bin_PROGRAMS =  odp_api_from_cpp$(EXEEXT)
+TESTS = odp_api_from_cpp$(EXEEXT)
 endif
 
 odp_api_from_cpp_CXXFLAGS = $(AM_CXXFLAGS)
diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am
index f128756..fc37305 100644
--- a/test/performance/Makefile.am
+++ b/test/performance/Makefile.am
@@ -2,10 +2,10 @@ include $(top_srcdir)/test/Makefile.inc
 
 TESTS_ENVIRONMENT = TEST_DIR=${builddir} ODP_PLATFORM=${with_platform}
 
-EXECUTABLES = odp_atomic odp_pktio_perf
+EXECUTABLES = odp_atomic$(EXEEXT) odp_pktio_perf$(EXEEXT)
 
-COMPILE_ONLY = odp_l2fwd \
-              odp_scheduling
+COMPILE_ONLY = odp_l2fwd$(EXEEXT) \
+              odp_scheduling$(EXEEXT)
 
 TESTSCRIPTS = odp_l2fwd_run \
              odp_scheduling_run
diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am
index 6968301..e784c27 100644
--- a/test/validation/Makefile.am
+++ b/test/validation/Makefile.am
@@ -4,24 +4,24 @@ include $(top_srcdir)/test/Makefile.inc
 AM_CFLAGS += -I$(srcdir)/common
 AM_LDFLAGS += -static
 
-EXECUTABLES = odp_buffer \
-             odp_classification \
-             odp_cpumask \
-             odp_crypto \
-             odp_init \
-             odp_init_abort \
-             odp_init_log \
-             odp_packet \
-             odp_pool \
-             odp_queue \
-             odp_random \
-             odp_scheduler \
-             odp_shared_memory \
-             odp_synchronizers \
-             odp_time \
-             odp_timer \
-             odp_thread \
-             odp_ver_abt_log_dbg
+EXECUTABLES = odp_buffer$(EXEEXT) \
+             odp_classification$(EXEEXT) \
+             odp_cpumask$(EXEEXT) \
+             odp_crypto$(EXEEXT) \
+             odp_init$(EXEEXT) \
+             odp_init_abort$(EXEEXT) \
+             odp_init_log$(EXEEXT) \
+             odp_packet$(EXEEXT) \
+             odp_pool$(EXEEXT) \
+             odp_queue$(EXEEXT) \
+             odp_random$(EXEEXT) \
+             odp_scheduler$(EXEEXT) \
+             odp_shared_memory$(EXEEXT) \
+             odp_synchronizers$(EXEEXT) \
+             odp_time$(EXEEXT) \
+             odp_timer$(EXEEXT) \
+             odp_thread$(EXEEXT) \
+             odp_ver_abt_log_dbg$(EXEEXT)
 
 if test_vald
 TESTS = $(EXECUTABLES)
diff --git a/test/validation/pktio/Makefile.am 
b/test/validation/pktio/Makefile.am
index 1d1a0d9..0ba9b0b 100644
--- a/test/validation/pktio/Makefile.am
+++ b/test/validation/pktio/Makefile.am
@@ -3,6 +3,6 @@ include ../Makefile.inc
 noinst_LIBRARIES = libpktio.a
 libpktio_a_SOURCES = pktio.c
 
-bin_PROGRAMS = pktio_main
+bin_PROGRAMS = pktio_main$(EXEEXT)
 dist_pktio_main_SOURCES = pktio_main.c
 pktio_main_LDADD = libpktio.a $(LIBCUNIT_COMMON) $(LIBODP)
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp

Reply via email to