Merge remote-tracking branch 'origin/3.36' into ipc-next

[ipc/ipcdev.git] / linux / src / api / Makefile.am

diff --git a/linux/src/api/Makefile.am b/linux/src/api/Makefile.am
index 6f03c8ded5802056a0329cae4769225ae385727e..cd94065337c13228d9505eb9ecefea485a9be071 100644 (file)
--- a/linux/src/api/Makefile.am
+++ b/linux/src/api/Makefile.am
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2013, Texas Instruments Incorporated
+##  Copyright (c) 2013-2015 Texas Instruments Incorporated - http://www.ti.com
 ##
 ##  Redistribution and use in source and binary forms, with or without
 ##  modification, are permitted provided that the following conditions
@@ -32,9 +32,17 @@
 ##
 
 # additional include paths necessary to compile the library
-AM_CFLAGS = -I$(top_srcdir)/linux/include -I$(top_srcdir)/hlos_common/include \
-        -I$(top_srcdir)/packages -I$(KERNEL_INSTALL_DIR)/include/generated/uapi\
-        -D_GNU_SOURCE -Wall @AM_CFLAGS@
+AM_CFLAGS = -I$(top_srcdir)/hlos_common/include -D_GNU_SOURCE -Wall
+
+if DRA7XX
+AM_CFLAGS += -DGATEMP_SUPPORT
+endif
+
+if KERNEL_INSTALL_DIR
+AM_CFLAGS += -I$(KERNEL_INSTALL_DIR)/include/generated/uapi
+endif
+
+AM_CFLAGS += -I$(top_srcdir)/linux/include -I$(top_srcdir)/packages @AM_CFLAGS@
 
 ###############################################################################
 # THE LIBRARIES TO BUILD
@@ -69,7 +77,22 @@ libtiipc_la_SOURCES =    \
                         NameServer.c \
                         Ipc.c
 
+if DRA7XX
+libtiipc_la_SOURCES +=  $(top_srcdir)/linux/include/IGateProvider.h \
+                        $(top_srcdir)/linux/include/GateHWSpinlock.h \
+                        $(top_srcdir)/linux/include/GateMutex.h \
+                        $(top_srcdir)/linux/include/GateMP_config.h \
+                        $(top_srcdir)/linux/include/_GateMP.h \
+                        $(top_srcdir)/packages/ti/ipc/GateMP.h \
+                        $(top_srcdir)/linux/src/api/gates/GateMP.c \
+                        $(top_srcdir)/linux/src/api/gates/GateMutex.c \
+                        $(top_srcdir)/linux/src/api/gates/GateHWSpinlock.c
+endif
+
 # Add version info to the shared library
 libtiipc_la_LDFLAGS = -version-info 1:0:0
-                                               
+
+pkgconfig_DATA          = libtiipc.pc
+pkgconfigdir            = $(libdir)/pkgconfig
+
 ###############################################################################