Linux: Test - Cleanup to mmrpc build after sources moved to a common location

Signed-off-by: Chris Ring <cring@ti.com>

diff --git a/linux/src/mm/Makefile.am b/linux/src/mm/Makefile.am
index 5ba2e00463d2bcc7103f8af57974f06bb1e53617..52c44b75cc817e084df5220df3f324f30a84cd9b 100644 (file)
--- a/linux/src/mm/Makefile.am
+++ b/linux/src/mm/Makefile.am
@@ -43,13 +43,13 @@ lib_LTLIBRARIES =
 
 if KDIR
 lib_LTLIBRARIES += libmmrpc.la
-endif
 
 # where to install the headers on the system
-libmmrpc_ladir = $(includedir)
+libmmrpc_ladir = $(includedir)/ti/ipc/mm
 
 # the list of header files that belong to the library (to be installed later)
 libmmrpc_la_HEADERS = $(top_srcdir)/packages/ti/ipc/mm/MmRpc.h
+endif
 
 # the sources to add to the library and to add to the source distribution
 libmmrpc_la_SOURCES = \

diff --git a/linux/src/mm/Makefile.in b/linux/src/mm/Makefile.in
index 8528011fd4e4af3af69b9e74af6011117abd1e27..c0f1d0ab4d38a643f59f1550447caace28a18785 100644 (file)
--- a/linux/src/mm/Makefile.in
+++ b/linux/src/mm/Makefile.in
@@ -39,7 +39,7 @@ build_triplet = @build@
 host_triplet = @host@
 @KDIR_TRUE@am__append_1 = libmmrpc.la
 subdir = linux/src/mm
-DIST_COMMON = $(libmmrpc_la_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(am__libmmrpc_la_HEADERS_DIST) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -57,6 +57,9 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libmmrpc_ladir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libmmrpc_la_LIBADD =
+am__libmmrpc_la_SOURCES_DIST =  \
+       $(top_srcdir)/packages/ti/ipc/mm/MmRpc.h \
+       $(top_srcdir)/packages/ti/ipc/mm/MmRpc.c
 am__objects_1 =
 am_libmmrpc_la_OBJECTS = $(am__objects_1) MmRpc.lo
 libmmrpc_la_OBJECTS = $(am_libmmrpc_la_OBJECTS)
@@ -73,7 +76,9 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libmmrpc_la_SOURCES)
-DIST_SOURCES = $(libmmrpc_la_SOURCES)
+DIST_SOURCES = $(am__libmmrpc_la_SOURCES_DIST)
+am__libmmrpc_la_HEADERS_DIST =  \
+       $(top_srcdir)/packages/ti/ipc/mm/MmRpc.h
 libmmrpc_laHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(libmmrpc_la_HEADERS)
 ETAGS = etags
@@ -203,10 +208,10 @@ target_alias = @target_alias@
 lib_LTLIBRARIES = $(am__append_1)
 
 # where to install the headers on the system
-libmmrpc_ladir = $(includedir)
+@KDIR_TRUE@libmmrpc_ladir = $(includedir)/ti/ipc/mm
 
 # the list of header files that belong to the library (to be installed later)
-libmmrpc_la_HEADERS = $(top_srcdir)/packages/ti/ipc/mm/MmRpc.h
+@KDIR_TRUE@libmmrpc_la_HEADERS = $(top_srcdir)/packages/ti/ipc/mm/MmRpc.h
 
 # the sources to add to the library and to add to the source distribution
 libmmrpc_la_SOURCES = \

diff --git a/linux/src/tests/Makefile.am b/linux/src/tests/Makefile.am
index 2af0a1e117e857bd3eaed96c43ac4e76a360b157..1c9c52ad59f4021252df648ac2dc226330bd8c24 100644 (file)
--- a/linux/src/tests/Makefile.am
+++ b/linux/src/tests/Makefile.am
@@ -71,6 +71,9 @@ else
 if CMEM
   bin_PROGRAMS += nano_test
 endif
+if KDIR
+  bin_PROGRAMS += mmrpc_test
+endif
 endif
 endif
 endif
@@ -92,7 +95,9 @@ nameServer_common_sources = \
 ping_rpmsg_SOURCES = ping_rpmsg.c
 
 # list of sources for the 'mmrpc_test' binary
-mmrpc_test_SOURCES = Mx.c mmrpc_test.c
+mmrpc_test_SOURCES = $(top_srcdir)/packages/ti/ipc/tests/Mx.c \
+                $(top_srcdir)/packages/ti/ipc/tests/Mx.h \
+                $(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c
 
 # list of sources for the 'MessageQApp' binary
 MessageQApp_SOURCES = $(common_sources) MessageQApp.c

diff --git a/linux/src/tests/Makefile.in b/linux/src/tests/Makefile.in
index fb2990cc5f9c240a02d044364c3df6b809b7ff7a..14715bb8ce2fd25f4c70f83b1ffe2da019911c3e 100644 (file)
--- a/linux/src/tests/Makefile.in
+++ b/linux/src/tests/Makefile.in
@@ -39,7 +39,7 @@ bin_PROGRAMS = ping_rpmsg$(EXEEXT) MessageQApp$(EXEEXT) \
        MessageQBench$(EXEEXT) MessageQMulti$(EXEEXT) \
        NameServerApp$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
        $(am__EXEEXT_1) $(am__EXEEXT_3) $(am__EXEEXT_1) \
-       $(am__EXEEXT_1) $(am__EXEEXT_4)
+       $(am__EXEEXT_1) $(am__EXEEXT_4) $(am__EXEEXT_5)
 
 # Add platform specific bin application's here
 @OMAP54XX_SMP_TRUE@am__append_1 = 
@@ -53,6 +53,7 @@ bin_PROGRAMS = ping_rpmsg$(EXEEXT) MessageQApp$(EXEEXT) \
 @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_TRUE@am__append_6 = 
 # Add platform independent apps here or above in bin_PROGRMAS
 @CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__append_7 = nano_test
+@KDIR_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__append_8 = mmrpc_test
 subdir = linux/src/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -65,6 +66,7 @@ am__EXEEXT_1 =
 @KDIR_TRUE@@OMAP54XX_SMP_TRUE@am__EXEEXT_2 = mmrpc_test$(EXEEXT)
 @CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@am__EXEEXT_3 = nano_test$(EXEEXT)
 @CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__EXEEXT_4 = nano_test$(EXEEXT)
+@KDIR_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__EXEEXT_5 = mmrpc_test$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -256,7 +258,10 @@ nameServer_common_sources = \
 ping_rpmsg_SOURCES = ping_rpmsg.c
 
 # list of sources for the 'mmrpc_test' binary
-mmrpc_test_SOURCES = Mx.c mmrpc_test.c
+mmrpc_test_SOURCES = $(top_srcdir)/packages/ti/ipc/tests/Mx.c \
+                $(top_srcdir)/packages/ti/ipc/tests/Mx.h \
+                $(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c
+
 
 # list of sources for the 'MessageQApp' binary
 MessageQApp_SOURCES = $(common_sources) MessageQApp.c
@@ -426,6 +431,34 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
+Mx.o: $(top_srcdir)/packages/ti/ipc/tests/Mx.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT Mx.o -MD -MP -MF "$(DEPDIR)/Mx.Tpo" -c -o Mx.o `test -f '$(top_srcdir)/packages/ti/ipc/tests/Mx.c' || echo '$(srcdir)/'`$(top_srcdir)/packages/ti/ipc/tests/Mx.c; \
+@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/Mx.Tpo" "$(DEPDIR)/Mx.Po"; else rm -f "$(DEPDIR)/Mx.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$(top_srcdir)/packages/ti/ipc/tests/Mx.c' object='Mx.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o Mx.o `test -f '$(top_srcdir)/packages/ti/ipc/tests/Mx.c' || echo '$(srcdir)/'`$(top_srcdir)/packages/ti/ipc/tests/Mx.c
+
+Mx.obj: $(top_srcdir)/packages/ti/ipc/tests/Mx.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT Mx.obj -MD -MP -MF "$(DEPDIR)/Mx.Tpo" -c -o Mx.obj `if test -f '$(top_srcdir)/packages/ti/ipc/tests/Mx.c'; then $(CYGPATH_W) '$(top_srcdir)/packages/ti/ipc/tests/Mx.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/packages/ti/ipc/tests/Mx.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/Mx.Tpo" "$(DEPDIR)/Mx.Po"; else rm -f "$(DEPDIR)/Mx.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$(top_srcdir)/packages/ti/ipc/tests/Mx.c' object='Mx.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o Mx.obj `if test -f '$(top_srcdir)/packages/ti/ipc/tests/Mx.c'; then $(CYGPATH_W) '$(top_srcdir)/packages/ti/ipc/tests/Mx.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/packages/ti/ipc/tests/Mx.c'; fi`
+
+mmrpc_test.o: $(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmrpc_test.o -MD -MP -MF "$(DEPDIR)/mmrpc_test.Tpo" -c -o mmrpc_test.o `test -f '$(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c' || echo '$(srcdir)/'`$(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c; \
+@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/mmrpc_test.Tpo" "$(DEPDIR)/mmrpc_test.Po"; else rm -f "$(DEPDIR)/mmrpc_test.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c' object='mmrpc_test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmrpc_test.o `test -f '$(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c' || echo '$(srcdir)/'`$(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c
+
+mmrpc_test.obj: $(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmrpc_test.obj -MD -MP -MF "$(DEPDIR)/mmrpc_test.Tpo" -c -o mmrpc_test.obj `if test -f '$(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c'; then $(CYGPATH_W) '$(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/mmrpc_test.Tpo" "$(DEPDIR)/mmrpc_test.Po"; else rm -f "$(DEPDIR)/mmrpc_test.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c' object='mmrpc_test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmrpc_test.obj `if test -f '$(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c'; then $(CYGPATH_W) '$(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/packages/ti/ipc/tests/mmrpc_test.c'; fi`
+
 mostlyclean-libtool:
        -rm -f *.lo