Properly free previously allocated file path string and other minor cleanup

[ipc/ipcdev.git] / ipc-qnx.mak

diff --git a/ipc-qnx.mak b/ipc-qnx.mak
index ca23b37bdd6e87253b8611a48fe59da7755bcfc8..a903d7c4908268e5d2ed731e6017aaaa407fbd10 100644 (file)
--- a/ipc-qnx.mak
+++ b/ipc-qnx.mak
@@ -1,5 +1,5 @@
 #
-#   Copyright (c) 2012-2013, Texas Instruments Incorporated
+#   Copyright (c) 2012-2014, Texas Instruments Incorporated
 #
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
@@ -31,22 +31,15 @@
 #  ======== ipc-qnx.mak ========
 #
 
-#
-# Where to export the binaries
-#
-DESTDIR ?= <UNDEFINED>
-
 include ./products.mak
 
 # Setup QNX paths
 ifneq ($(wildcard $(QNX_INSTALL_DIR)),)
     QNX_PATH := $(QNX_INSTALL_DIR)/host/linux/x86/usr/bin
-    QNX_PATH := $(QNX_PATH):$(QNX_INSTALL_DIR)/host/linux/x86/bin
-    QNX_PATH := $(QNX_PATH):$(QNX_INSTALL_DIR)/host/linux/x86/sbin
-    QNX_PATH := $(QNX_PATH):$(QNX_INSTALL_DIR)/host/linux/x86/usr/sbin
-    QNX_PATH := $(QNX_PATH):$(QNX_INSTALL_DIR)/linux/x86/usr/photon/appbuilder
+    QNX_PATH := $(QNX_PATH):$(QNX_INSTALL_DIR)/.qnx/bin
+    QNX_PATH := $(QNX_PATH):$(QNX_INSTALL_DIR)/jre/bin
 
-    export QNX_CONFIGURATION?=$(QNX_INSTALL_DIR)/etc/qnx
+    export QNX_CONFIGURATION?=$(QNX_INSTALL_DIR)/.qnx
     export QNX_HOST?=$(QNX_INSTALL_DIR)/host/linux/x86
     export QNX_TARGET?=$(QNX_INSTALL_DIR)/target/qnx6
     export MAKEFLAGS=-I$(QNX_INSTALL_DIR)/target/qnx6/usr/include
@@ -55,23 +48,34 @@ endif
 
 all: .qnx
 
-.qnx: .qnx,omap5432
+.qnx: .qnx,$(PLATFORM)
 
 .qnx,%: PATH:=$(QNX_PATH):$(PATH)
 .qnx,%:
-       @echo "building Qnx user libraries for" $(*:.qnx,=) "..."
+       @echo "building Qnx user libraries for \"$(PLATFORM)\" platform..."
+ifneq ("$(QNX_CFLAGS)","")
+       @make -C qnx \
+                IPC_REPO=`pwd` \
+                PLATFORM=$(PLATFORM) \
+                QNX_CFLAGS=$(QNX_CFLAGS)
+else
        @make -C qnx \
                 IPC_REPO=`pwd` \
-                PLATFORM=$(*:.qnx,=)
+                PLATFORM=$(PLATFORM)
+endif
 
 clean:
        @echo "cleaning Qnx user libraries ..."
-       @make -C qnx clean
+       @make -C qnx PLATFORM=$(PLATFORM) clean
+
+install: .install,$(PLATFORM)
 
-#TODO: Implement Install goal
-#install:
-#      @ echo installing binaries to $(DESTDIR) ...
-#      @ mkdir -p $(DESTDIR)/$(prefix)/$(docdir)
-#      @ cp -rf $(wildcard ipc_*_release_notes.html) docs/* $(DESTDIR)/$(prefix)/$(docdir)
-#      @ mkdir -p $(DESTDIR)/$(prefix)/$(includedir)/ti/ipc
-#      @ cp -rf packages/ti/ipc/*.h $(DESTDIR)/$(prefix)/$(includedir)/ti/ipc
+.install,%: PATH:=$(QNX_PATH):$(PATH)
+.install,%:
+       @echo installing binaries to $(DESTDIR) ...
+       @mkdir -p $(DESTDIR)
+       @make -C qnx \
+                IPC_REPO=`pwd` \
+                PLATFORM=$(PLATFORM) \
+               DESTDIR=$(DESTDIR) \
+               install