Merge remote-tracking branch 'gil/3.00.00.10_eng' into 3.00.00.11_eng
authorArnie Reynoso <arnier@ti.com>
Thu, 28 Feb 2013 20:05:36 +0000 (12:05 -0800)
committerArnie Reynoso <arnier@ti.com>
Thu, 28 Feb 2013 20:05:36 +0000 (12:05 -0800)
1  2 
linux/src/tests/Makefile.am

index a7606171db6b96ed385fa7fc66d8b23f32d26ae4,866bf58e38dc03da0f75efe1890c5c012a3fb130..b4ddc709327be5ce5bd5ca3c00d15b37b052f5ed
@@@ -40,15 -8,15 +40,15 @@@ AM_CFLAGS = -I$(top_srcdir)/linux/inclu
  ###############################################################################
  
  # the program to build (the names of the final binaries)
- bin_PROGRAMS =
+ bin_PROGRAMS = ping_rpmsg
  
  if OMAP4430
 -  bin_PROGRAMS += MessageQApp_omap4430 MessageQBench_omap4430 MessageQMulti_omap4430 \
 -                    NameServerApp_omap4430
 +  bin_PROGRAMS += MessageQApp_omap4430 MessageQBench_omap4430 \
 +                MessageQMulti_omap4430 NameServerApp_omap4430
  else
  if OMAPL138
 -  bin_PROGRAMS += MessageQApp_omapl138 MessageQBench_omapl138 MessageQMulti_omapl138 \
 -                    NameServerApp_omapl138
 +  bin_PROGRAMS += MessageQApp_omapl138 MessageQBench_omapl138 \
 +                MessageQMulti_omapl138 NameServerApp_omapl138
  if CMEM
    bin_PROGRAMS += nano_test_omapl138
  endif
@@@ -119,19 -90,18 +122,22 @@@ nano_test_omapl138_SOURCES = $(common_s
  common_libraries = -lpthread $(top_builddir)/linux/src/api/libtiipc.la \
                  $(top_builddir)/linux/src/utils/libtiipcutils.la
  
+ # the additional libraries to link ping_rpmsg
+ ping_rpmsg_LDADD = -lrt
  # the additional libraries needed to link MessageQApp
  MessageQApp_omap4430_LDADD = $(common_libraries) \
 -                $(top_builddir)/linux/src/family/libtiipccfg_omap4430.la $(AM_LDFLAGS)
 +                $(top_builddir)/linux/src/family/libtiipccfg_omap4430.la \
 +                $(AM_LDFLAGS)
  MessageQApp_omapl138_LDADD = $(common_libraries) \
 -                $(top_builddir)/linux/src/family/libtiipccfg_omapl138.la $(AM_LDFLAGS)
 +                $(top_builddir)/linux/src/family/libtiipccfg_omapl138.la \
 +                $(AM_LDFLAGS)
  MessageQApp_tci6614_LDADD = $(common_libraries) \
 -                $(top_builddir)/linux/src/family/libtiipccfg_tci6614.la $(AM_LDFLAGS)
 +                $(top_builddir)/linux/src/family/libtiipccfg_tci6614.la \
 +                $(AM_LDFLAGS)
  MessageQApp_tci6638_LDADD = $(common_libraries) \
 -                $(top_builddir)/linux/src/family/libtiipccfg_tci6638.la $(AM_LDFLAGS)
 +                $(top_builddir)/linux/src/family/libtiipccfg_tci6638.la \
 +                $(AM_LDFLAGS)
  
  # the additional libraries needed to link MessageQBench
  MessageQBench_omap4430_LDADD = $(common_libraries) \