Changes for new cmem.h location and CMEM library 3.00.02.26
authorRobert Tivy <rtivy@ti.com>
Fri, 12 Jul 2013 04:13:25 +0000 (21:13 -0700)
committerChris Ring <cring@ti.com>
Fri, 12 Jul 2013 04:13:25 +0000 (21:13 -0700)
Linux Utils 4.00 simplified the directory structure of
CMEM from Linux Utils 3.x.  This commit updates to that new
release.

This only affects users of the nano test.

linux/src/tests/Makefile.am
linux/src/tests/Makefile.in
linux/src/tests/nano_test.c

index 099300e7f909bf67576e934105bd53fca75a2ef8..9020e601339346dad3c08c3ad76b2beaeaf4f10d 100644 (file)
@@ -33,7 +33,7 @@
 
 # additional include paths necessary to compile the program
 AM_CFLAGS = -I$(top_srcdir)/linux/include -I$(top_srcdir)/hlos_common/include \
-        -I$(top_srcdir)/packages -I$(CMEM_INSTALL_DIR)/packages \
+        -I$(top_srcdir)/packages -I$(CMEM_INSTALL_DIR)/include \
         -D_GNU_SOURCE -Wall @AM_CFLAGS@
 VPATH = ../../../packages/ti/ipc/tests
 
@@ -148,7 +148,7 @@ NameServerApp_LDADD = $(common_libraries) \
 
 # the additional libraries needed to link nano_test
 nano_test_LDADD = $(common_libraries) \
-                $(CMEM_INSTALL_DIR)/packages/ti/sdo/linuxutils/cmem/lib/cmem.a470MV \
+                $(CMEM_INSTALL_DIR)/src/cmem/api/.libs/libticmem.a \
                 $(AM_LDFLAGS)
 
 ###############################################################################
index 43e242655d5b16ea727ea571aaf6104e52e3dcb9..efb87cf12e03cb3d77e47a00cd2ae2fb43bf6a0c 100644 (file)
@@ -100,7 +100,7 @@ mmrpc_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 am_nano_test_OBJECTS = $(am__objects_1) nano_test.$(OBJEXT)
 nano_test_OBJECTS = $(am_nano_test_OBJECTS)
 nano_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-       $(CMEM_INSTALL_DIR)/packages/ti/sdo/linuxutils/cmem/lib/cmem.a470MV \
+       $(CMEM_INSTALL_DIR)/src/cmem/api/.libs/libticmem.a \
        $(am__DEPENDENCIES_2)
 am_ping_rpmsg_OBJECTS = ping_rpmsg.$(OBJEXT)
 ping_rpmsg_OBJECTS = $(am_ping_rpmsg_OBJECTS)
@@ -135,7 +135,7 @@ AMTAR = @AMTAR@
 
 # additional include paths necessary to compile the program
 AM_CFLAGS = -I$(top_srcdir)/linux/include -I$(top_srcdir)/hlos_common/include \
-        -I$(top_srcdir)/packages -I$(CMEM_INSTALL_DIR)/packages \
+        -I$(top_srcdir)/packages -I$(CMEM_INSTALL_DIR)/include \
         -D_GNU_SOURCE -Wall @AM_CFLAGS@
 
 AM_LDFLAGS = @AM_LDFLAGS@
@@ -318,7 +318,7 @@ NameServerApp_LDADD = $(common_libraries) \
 
 # the additional libraries needed to link nano_test
 nano_test_LDADD = $(common_libraries) \
-                $(CMEM_INSTALL_DIR)/packages/ti/sdo/linuxutils/cmem/lib/cmem.a470MV \
+                $(CMEM_INSTALL_DIR)/src/cmem/api/.libs/libticmem.a \
                 $(AM_LDFLAGS)
 
 all: all-am
index 2d7a73e95c1cb53dde3cebd0e4d3375ff1a49ba9..8d8492db2ccbd4e678d5fd43cc7d4ea7dc4d29a4 100644 (file)
@@ -53,7 +53,7 @@
 #include <ti/ipc/Ipc.h>
 #include <ti/ipc/MessageQ.h>
 
-#include <ti/sdo/linuxutils/cmem/include/cmem.h>
+#include <ti/cmem.h>
 
 typedef struct MyMsg {
     MessageQ_MsgHeader header;