Add headers and libs to QNX 'make install'
authorvwan@ti.com <vwan@ti.com>
Tue, 24 Sep 2013 17:45:08 +0000 (10:45 -0700)
committerChris Ring <cring@ti.com>
Tue, 24 Sep 2013 19:27:50 +0000 (12:27 -0700)
Export MessageQ-related headers and libs for QNX.  Also clean
up exported files in general to remove headers that are not needed.

This addresses SDOCM00102141.

qnx/src/api/common.mk
qnx/src/ipc3x_dev/ti/syslink/headers/Makefile [deleted file]
qnx/src/utils/common.mk

index ddcfc748e36cf0589ab3f0b0efeff6f989e80afe..03f1fd5c809d1e1691ea4e1480139ad137f4f68f 100644 (file)
@@ -40,8 +40,7 @@ define PINFO
 PINFO DESCRIPTION=IPC QNX User library
 endef
 
-# don't install the binaries, they are copied in base makefile
-INSTALLDIR = /dev/null
+INSTALLDIR = /usr/lib
 
 CCOPTS += -DSYSLINK_BUILDOS_QNX
 
@@ -65,3 +64,11 @@ EXTRA_INCVPATH += \
 
 include $(MKFILES_ROOT)/qtargets.mk
 OPTIMIZE__gcc=$(OPTIMIZE_NONE_gcc)
+
+# install the headers
+POST_INSTALL += \
+        $(CP_HOST) -Rv $(IPC_REPO)/packages/ti/ipc/MessageQ.h $(INSTALL_ROOT_nto)/usr/include/ti/ipc/MessageQ.h; \
+        $(CP_HOST) -Rv $(IPC_REPO)/packages/ti/ipc/NameServer.h $(INSTALL_ROOT_nto)/usr/include/ti/ipc/NameServer.h; \
+        $(CP_HOST) -Rv $(IPC_REPO)/packages/ti/ipc/GateMP.h $(INSTALL_ROOT_nto)/usr/include/ti/ipc/GateMP.h; \
+        $(CP_HOST) -Rv $(IPC_REPO)/packages/ti/ipc/Ipc.h $(INSTALL_ROOT_nto)/usr/include/ti/ipc/Ipc.h; \
+        $(CP_HOST) -Rv $(IPC_REPO)/qnx/include/ti/ipc/Std.h $(INSTALL_ROOT_nto)/usr/include/ti/ipc/Std.h
diff --git a/qnx/src/ipc3x_dev/ti/syslink/headers/Makefile b/qnx/src/ipc3x_dev/ti/syslink/headers/Makefile
deleted file mode 100644 (file)
index a9197c8..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-#   Copyright (c) 2013, Texas Instruments Incorporated
-#
-#   Redistribution and use in source and binary forms, with or without
-#   modification, are permitted provided that the following conditions
-#   are met:
-#
-#   *  Redistributions of source code must retain the above copyright
-#      notice, this list of conditions and the following disclaimer.
-#
-#   *  Redistributions in binary form must reproduce the above copyright
-#      notice, this list of conditions and the following disclaimer in the
-#      documentation and/or other materials provided with the distribution.
-#
-#   *  Neither the name of Texas Instruments Incorporated nor the names of
-#      its contributors may be used to endorse or promote products derived
-#      from this software without specific prior written permission.
-#
-#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-#   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-#   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-#   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-#   EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-ifndef QCONFIG
-QCONFIG=qconfig.mk
-endif
-include $(QCONFIG)
-
-#include $(MKFILES_ROOT)/qmacros.mk
-
-hinstall:
-install:
-       $(CP_HOST) -Rv $(PROJECT_ROOT)../inc/ti/ipc/rpmsg_omx.h $(INSTALL_ROOT_nto)/usr/include/ti/ipc/rpmsg_omx.h
-       $(CP_HOST) -Rv $(PROJECT_ROOT)../inc/ti/ipc/rpmsg_dce.h $(INSTALL_ROOT_nto)/usr/include/ti/ipc/rpmsg_dce.h
-       $(CP_HOST) -Rv $(PROJECT_ROOT)../inc/ti/ipc/ti_ipc.h $(INSTALL_ROOT_nto)/usr/include/ti/ipc/ti_ipc.h
-       $(CP_HOST) -Rv $(PROJECT_ROOT)../inc/ti/ipc/rpmsg_rpc.h $(INSTALL_ROOT_nto)/usr/include/ti/ipc/rpmsg_rpc.h
-       $(CP_HOST) -Rv $(PROJECT_ROOT)../inc/ti/ipc/HwSpinLockUsr.h $(INSTALL_ROOT_nto)/usr/include/ti/ipc/HwSpinLockUsr.h
-       $(CP_HOST) -Rv $(PROJECT_ROOT)../inc/GateHWSpinlock.h $(INSTALL_ROOT_nto)/usr/include/ti/ipc/GateHWSpinlock.h
-       $(CP_HOST) -Rv $(PROJECT_ROOT)../Std.h $(INSTALL_ROOT_nto)/usr/include/ti/ipc/ti/ipc/Std.h
-clean:
-       true
-
index d78398d14c97c049bb31c95434b0278290615049..a37b38f047604d5cee58b336f15ec1f18c0819a7 100644 (file)
@@ -40,8 +40,7 @@ define PINFO
 PINFO DESCRIPTION=IPC QNX UTIILIES USER LIBRARY
 endef
 
-# don't install the binaries, they are copied in base makefile
-INSTALLDIR = /dev/null
+INSTALLDIR = usr/lib
 
 # source path
 EXTRA_SRCVPATH += \
@@ -57,4 +56,8 @@ EXTRA_INCVPATH += \
         $(IPC_REPO)/qnx/src/ipc3x_dev/ti/syslink/inc
 
 include $(MKFILES_ROOT)/qtargets.mk
-OPTIMIZE__gcc=$(OPTIMIZE_NONE_gcc)
\ No newline at end of file
+OPTIMIZE__gcc=$(OPTIMIZE_NONE_gcc)
+
+# install the headers
+POST_INSTALL += \
+        $(CP_HOST) -Rv $(IPC_REPO)/packages/ti/ipc/MultiProc.h $(INSTALL_ROOT_nto)/usr/include/ti/ipc/MultiProc.h