Added make install goal for QNX

diff --git a/ipc-qnx.mak b/ipc-qnx.mak
index ca23b37bdd6e87253b8611a48fe59da7755bcfc8..9120dd345e753c8d87c1098c5b43d74483cb13e5 100644 (file)
--- a/ipc-qnx.mak
+++ b/ipc-qnx.mak
@@ -31,11 +31,6 @@
 #  ======== ipc-qnx.mak ========
 #
 
 #  ======== ipc-qnx.mak ========
 #
 

-#
-# Where to export the binaries
-#
-DESTDIR ?= <UNDEFINED>
-

 include ./products.mak
 
 # Setup QNX paths
 include ./products.mak
 
 # Setup QNX paths


@@ -68,10 +63,11 @@ clean:
        @echo "cleaning Qnx user libraries ..."
        @make -C qnx clean
 
        @echo "cleaning Qnx user libraries ..."
        @make -C qnx clean
 

-#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:
+       @echo installing binaries to $(DESTDIR) ...
+       @mkdir -p $(DESTDIR)
+       @make -C qnx \
+                IPC_REPO=`pwd` \
+                PLATFORM=$(*:.qnx,=) \
+               DESTDIR=$(DESTDIR) \
+               install

diff --git a/products.mak b/products.mak
index 110066513578fcc5f3eba1ff009ee8f3d00b3f87..3e330d5cfb390be837129ec16c5b88aedd8b54c7 100644 (file)
--- a/products.mak
+++ b/products.mak
@@ -53,7 +53,8 @@ CMEM_INSTALL_DIR ?=
 
 # Set up path to QNX tools installation
 QNX_INSTALL_DIR ?=
 
 # Set up path to QNX tools installation
 QNX_INSTALL_DIR ?=

-
+# Set up destination for target binaries
+DESTDIR ?=

 
 #################### IPC Bios ####################
 
 
 #################### IPC Bios ####################
 

diff --git a/qnx/Makefile b/qnx/Makefile
index b84d215b340d1cbf80f985142701ee8b93b7038f..9ebe59278d0a9bd8a7279c7ef9f81a1a2d12be14 100644 (file)
--- a/qnx/Makefile
+++ b/qnx/Makefile
@@ -47,6 +47,13 @@ ipc3x_dev: utils
        @cd src/ipc3x_dev; \
             make SYSLINK_PLATFORM=omap5430 TILER_PLATFORM=omap5430 SMP=1
 
        @cd src/ipc3x_dev; \
             make SYSLINK_PLATFORM=omap5430 TILER_PLATFORM=omap5430 SMP=1
 

+install:
+       @cd src/ipc3x_dev; make SYSLINK_PLATFORM=omap5430 \
+               TILER_PLATFORM=omap5430 SMP=1 USE_INSTALL_ROOT=1 \
+               INSTALL_ROOT_nto=$(DESTDIR) install
+       @cd src/tests; make USE_INSTALL_ROOT=1 DESTDIR=$(DESTDIR) \
+               INSTALL_ROOT_nto=$(DESTDIR) install
+

 clean:
        @cd src/family; make clean
        @cd src/api; make clean
 clean:
        @cd src/family; make clean
        @cd src/api; make clean

diff --git a/qnx/src/tests/MessageQApp/common.mk b/qnx/src/tests/MessageQApp/common.mk
index 60b2e6ea2f06ca38d8f47dcdf4e94cda47783501..8208cd9fbec305df486becd1b598347755f53cfd 100644 (file)
--- a/qnx/src/tests/MessageQApp/common.mk
+++ b/qnx/src/tests/MessageQApp/common.mk
@@ -40,8 +40,7 @@ define PINFO
 PINFO DESCRIPTION=IPC QNX MESSAGEQ SAMPLE
 endef
 
 PINFO DESCRIPTION=IPC QNX MESSAGEQ SAMPLE
 endef
 

-# don't install the binaries, they are copied in base makefile
-INSTALLDIR = /dev/null
+INSTALLDIR = bin

 
 CCOPTS += -DSYSLINK_BUILDOS_QNX
 
 
 CCOPTS += -DSYSLINK_BUILDOS_QNX
 

diff --git a/qnx/src/tests/MessageQBench/common.mk b/qnx/src/tests/MessageQBench/common.mk
index 21e40d1f39770f4e67920eda7859842332a723cf..63d7dec8c7fc9434b504ea981f0b81508a0f6775 100644 (file)
--- a/qnx/src/tests/MessageQBench/common.mk
+++ b/qnx/src/tests/MessageQBench/common.mk
@@ -40,8 +40,7 @@ define PINFO
 PINFO DESCRIPTION=IPC QNX MESSAGEQ SAMPLE
 endef
 
 PINFO DESCRIPTION=IPC QNX MESSAGEQ SAMPLE
 endef
 

-# don't install the binaries, they are copied in base makefile
-INSTALLDIR = /dev/null
+INSTALLDIR = bin

 
 CCOPTS += -DSYSLINK_BUILDOS_QNX
 
 
 CCOPTS += -DSYSLINK_BUILDOS_QNX
 

diff --git a/qnx/src/tests/MessageQMulti/common.mk b/qnx/src/tests/MessageQMulti/common.mk
index a4f1c42a20278e11f480a59500f3ee5d897a5b87..f8e6e3f6b4d1b4853fc141fea9dad9532da67238 100644 (file)
--- a/qnx/src/tests/MessageQMulti/common.mk
+++ b/qnx/src/tests/MessageQMulti/common.mk
@@ -40,8 +40,7 @@ define PINFO
 PINFO DESCRIPTION=IPC QNX MESSAGEQ SAMPLE
 endef
 
 PINFO DESCRIPTION=IPC QNX MESSAGEQ SAMPLE
 endef
 

-# don't install the binaries, they are copied in base makefile
-INSTALLDIR = /dev/null
+INSTALLDIR = bin

 
 CCOPTS += -DSYSLINK_BUILDOS_QNX
 
 
 CCOPTS += -DSYSLINK_BUILDOS_QNX
 

diff --git a/qnx/src/tests/NameServerApp/common.mk b/qnx/src/tests/NameServerApp/common.mk
index 9c452dfc209d50f2f19d17a53d78401ce3adc539..542ee80d6238067106957b315575e18f6b2752c2 100644 (file)
--- a/qnx/src/tests/NameServerApp/common.mk
+++ b/qnx/src/tests/NameServerApp/common.mk
@@ -40,8 +40,7 @@ define PINFO
 PINFO DESCRIPTION=IPC QNX MESSAGEQ SAMPLE
 endef
 
 PINFO DESCRIPTION=IPC QNX MESSAGEQ SAMPLE
 endef
 

-# don't install the binaries, they are copied in base makefile
-INSTALLDIR = /dev/null
+INSTALLDIR = bin

 
 CCOPTS += -DSYSLINK_BUILDOS_QNX
 
 
 CCOPTS += -DSYSLINK_BUILDOS_QNX