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

[ipc/ipcdev.git] / linux / src / transport / Makefile.in

diff --git a/linux/src/transport/Makefile.in b/linux/src/transport/Makefile.in
index dadaef7adde5f333b0d4d60f5b3b83b4082241e6..f652706e305b3a578312b4fa7843bfabaf2f1972 100644 (file)
--- a/linux/src/transport/Makefile.in
+++ b/linux/src/transport/Makefile.in
@@ -37,6 +37,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@KERNEL_INSTALL_DIR_TRUE@am__append_1 = -I$(KERNEL_INSTALL_DIR)/include/generated/uapi
+@AF_RPMSG_TRUE@am__append_2 = -DAF_RPMSG=$(AF_RPMSG)
 subdir = linux/src/transport
 DIST_COMMON = $(libtitransportrpmsg_la_HEADERS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in
@@ -78,15 +80,17 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+AF_RPMSG = @AF_RPMSG@
+AF_RPMSG_FALSE = @AF_RPMSG_FALSE@
+AF_RPMSG_TRUE = @AF_RPMSG_TRUE@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 
 # 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 \
+       $(am__append_1) $(am__append_2) -I$(top_srcdir)/linux/include \
+       -I$(top_srcdir)/packages @AM_CFLAGS@
 AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -128,6 +132,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KDIR_FALSE = @KDIR_FALSE@
 KDIR_TRUE = @KDIR_TRUE@
 KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@
+KERNEL_INSTALL_DIR_FALSE = @KERNEL_INSTALL_DIR_FALSE@
+KERNEL_INSTALL_DIR_TRUE = @KERNEL_INSTALL_DIR_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -207,10 +213,6 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
-#if DRA7XX
-#AM_CFLAGS += -DGATEMP_SUPPORT
-#endif
-
 ###############################################################################
 # THE LIBRARIES TO BUILD
 ###############################################################################
@@ -219,10 +221,12 @@ target_alias = @target_alias@
 lib_LTLIBRARIES = libtitransportrpmsg.la
 
 # where to install the headers on the system
-libtitransportrpmsg_ladir = $(includedir)/ti/ipc
+libtitransportrpmsg_ladir = $(includedir)/ti/ipc/transports
 
 # the list of header files that belong to the library (to be installed later)
-libtitransportrpmsg_la_HEADERS = $(top_srcdir)/linux/include/ti/ipc/Std.h
+libtitransportrpmsg_la_HEADERS = \
+        $(top_srcdir)/linux/include/ti/ipc/transports/TransportRpmsg.h
+
 
 # the sources to add to the library and to add to the source distribution
 libtitransportrpmsg_la_SOURCES = \
@@ -399,7 +403,7 @@ distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-       $(mkdir_p) $(distdir)/../../../linux/include/ti/ipc
+       $(mkdir_p) $(distdir)/../../../linux/include/ti/ipc/transports
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \