Merge branch '3.36' into ipc-next

[ipc/ipcdev.git] / qnx / Makefile

diff --git a/qnx/Makefile b/qnx/Makefile
index 327bc68f9a868377e2ace5a69faebaa64cb82bab..4e808ce899987ce329b7141a19d968a8c5e837ca 100644 (file)
--- a/qnx/Makefile
+++ b/qnx/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, Texas Instruments Incorporated
+# Copyright (c) 2013-2015, Texas Instruments Incorporated
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -30,41 +30,51 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-ifeq ("$(PLATFORM)","omap5432")
-    SYSLINK_PLATFORM=omap5430
-    TILER_PLATFORM=omap5430
-else ifeq ("$(PLATFORM)","vayu")
-    SYSLINK_PLATFORM=$(PLATFORM)
-    TILER_PLATFORM=$(PLATFORM)
+ifeq ("$(PLATFORM)","OMAP54XX")
+    IPC_PLATFORM=omap5430
+else ifeq ("$(PLATFORM)","DRA7XX")
+    IPC_PLATFORM=vayu
+else ifeq ("$(PLATFORM)","")
+    $(error Empty PLATFORM variable.  Did you forget to set in it products.mak?)
+else
+    $(error Unsupported platform: $(PLATFORM))
 endif
 
 all:  utils ipc3x_dev libs tests
 
 libs: ipc3x_dev
-       @cd src/api; make install
-       @cd src/mm; make install
+       @cd src/api; make IPC_PLATFORM=$(IPC_PLATFORM)
+       @cd src/mm; make
 
 utils:
-       @cd src/utils; make install
+       @cd src/utils; make
 
 tests: libs
        @cd src/tests; make
 
 ipc3x_dev: utils
        @cd src/ipc3x_dev; \
-            make SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) TILER_PLATFORM=$(TILER_PLATFORM) SMP=1 VIRTIO=$(BUILD_FOR_VIRTIO)
+            make IPC_PLATFORM=$(IPC_PLATFORM) SMP=1 QNX_CFLAGS=$(QNX_CFLAGS)
 
 install:
-       @cd src/ipc3x_dev; make SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) \
-               TILER_PLATFORM=$(TILER_PLATFORM) SMP=1 VIRTIO=$(BUILD_FOR_VIRTIO) USE_INSTALL_ROOT=1 \
+       @cd src/ipc3x_dev; make IPC_PLATFORM=$(IPC_PLATFORM) \
+               SMP=1 USE_INSTALL_ROOT=1 \
                INSTALL_ROOT_nto=$(DESTDIR) install
+       @cd src/mm; make USE_INSTALL_ROOT=1 DESTDIR=$(DESTDIR) \
+               INSTALL_ROOT_nto=$(DESTDIR) install
+       @cd src/api; make USE_INSTALL_ROOT=1 DESTDIR=$(DESTDIR) \
+                INSTALL_ROOT_nto=$(DESTDIR) install
+       @cd src/utils; make USE_INSTALL_ROOT=1 DESTDIR=$(DESTDIR) \
+                INSTALL_ROOT_nto=$(DESTDIR) install
        @cd src/tests; make USE_INSTALL_ROOT=1 DESTDIR=$(DESTDIR) \
+               IPC_PLATFORM=$(IPC_PLATFORM) \
                INSTALL_ROOT_nto=$(DESTDIR) install
 
+
 clean:
        @cd src/api; make clean
        @cd src/mm; make clean
        @cd src/utils; make clean
        @cd src/tests; make clean
        @cd src/ipc3x_dev; \
-            make clean SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) TILER_PLATFORM=$(TILER_PLATFORM) SMP=1 VIRTIO=$(BUILD_FOR_VIRTIO)
+       make clean IPC_PLATFORM=$(IPC_PLATFORM) SMP=1