api: remove deprecated odp.h header

Remove deprecated odp.h header file which has been replaced by odp_api.h.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Jere Leppänen <jere.leppanen@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>

8 files changed, 6 insertions, 30 deletions

diff --git a/helper/chksum.c b/helper/chksum.c
index 8421db7e8..0ac07393b 100644
--- a/helper/chksum.c
+++ b/helper/chksum.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/ip.h>
 #include <odp/helper/udp.h>
 #include <odp/helper/sctp.h>
diff --git a/helper/include/odp/helper/threads.h b/helper/include/odp/helper/threads.h
index f16626abf..cfde92830 100644
--- a/helper/include/odp/helper/threads.h
+++ b/helper/include/odp/helper/threads.h
@@ -11,7 +11,7 @@
  *
  * ODP Linux helper API
  *
- * This file is an optional helper to odp.h APIs. These functions are provided
+ * This file is an optional helper to ODP APIs. These functions are provided
  * to ease common setups in a Linux system. User is free to implement the same
  * setups in otherways (not via this API).
  */
diff --git a/include/Makefile.am b/include/Makefile.am
index d47765831..3c050abab 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,5 +1,4 @@
 include_HEADERS = \
-		  odp.h \
 		  odp_api.h
 
 odpincludedir= $(includedir)/odp
diff --git a/include/odp.h b/include/odp.h
deleted file mode 100644
index 022464804..000000000
--- a/include/odp.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * All rights reserved
- *
- * SPDX-License-Identifier:     BSD-3-Clause
- */
-
-/**
- * @file
- *
- * WARNING: THIS FILE IS DEPRECATED AND WILL BE REMOVED!!!
- * ODP APPLICATIONS SHOULD NOW INCLUDE odp_api.h INSTEAD.
- *
- * This file is here to ease the transition period but will be removed.
- * This change has been made to enable the creation of other ODP interfaces.
- *
- */
-
-#ifndef ODP_H_
-#define ODP_H_
-
-#include <odp_api.h>
-
-#endif
diff --git a/platform/linux-generic/test/pktio_ipc/ipc_common.h b/platform/linux-generic/test/pktio_ipc/ipc_common.h
index 64ce64325..b2b469553 100644
--- a/platform/linux-generic/test/pktio_ipc/ipc_common.h
+++ b/platform/linux-generic/test/pktio_ipc/ipc_common.h
@@ -20,7 +20,7 @@
 #include <signal.h>
 #include <sys/wait.h>
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/odph_api.h>
 
 /** @def SHM_PKT_POOL_SIZE
diff --git a/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c
index ca28c805c..3b4ba819c 100644
--- a/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c
+++ b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <linux/limits.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c b/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c
index 2aaa70ac2..4b7af3736 100644
--- a/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c
+++ b/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <linux/limits.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c
index 7a05ebf17..a8ab25b4e 100644
--- a/test/validation/api/timer/timer.c
+++ b/test/validation/api/timer/timer.c
@@ -11,7 +11,7 @@
 #endif
 
 #include <time.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/odph_api.h>
 #include "odp_cunit_common.h"