diff options
| author | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-07-03 14:12:30 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-07-03 14:12:30 +0300 |
| commit | 7f4ad12cb88f187db26e2d9f97dfd543ec35efc8 (patch) | |
| tree | df0d0a5a6d53df8c41a28ca881ca4ad315681930 /example | |
| parent | b16c3dd9e9cf90197217ab1fff3425b454f9c80c (diff) | |
| parent | 624ef9dfacc5b76513fce70dcd6fbe300a8cc419 (diff) | |
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Conflicts:
helper/linux.c
test/validation/pool/pool.c
Diffstat (limited to 'example')
| -rw-r--r-- | example/classifier/Makefile.am | 2 | ||||
| -rw-r--r-- | example/generator/Makefile.am | 2 | ||||
| -rw-r--r-- | example/ipsec/Makefile.am | 2 | ||||
| -rw-r--r-- | example/packet/Makefile.am | 2 | ||||
| -rw-r--r-- | example/timer/Makefile.am | 2 |
5 files changed, 5 insertions, 5 deletions
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 |