Moved drm libraries out of common variable.
authorRamsey Harris <ramsey@ti.com>
Wed, 7 Aug 2013 22:27:55 +0000 (15:27 -0700)
committerRamsey Harris <ramsey@ti.com>
Wed, 7 Aug 2013 22:30:42 +0000 (15:30 -0700)
linux/src/tests/Makefile.am
linux/src/tests/Makefile.in

index 7c9004a5133e52d05d86b4113ba379bfaf09cf29..ac9c141f9e32c38684d5e29dff1f5ec76b51fc6e 100644 (file)
@@ -34,7 +34,6 @@
 # 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)/include \
-        -I$(top_srcdir)/packages -I$(CMEM_INSTALL_DIR)/packages \
         -I$(DRM_PREFIX)/usr/include \
         -I$(DRM_PREFIX)/usr/include/libdrm \
         -I$(DRM_PREFIX)/usr/include/omap \
@@ -133,16 +132,16 @@ NameServerApp_SOURCES = $(nameServer_common_sources)
 nano_test_SOURCES = $(common_sources) nano_test.c
 
 common_libraries = -lpthread $(top_builddir)/linux/src/api/libtiipc.la \
-                $(top_builddir)/linux/src/utils/libtiipcutils.la \
-                $(DRM_PREFIX)/usr/lib/libdrm.la \
-                $(DRM_PREFIX)/usr/lib/libdrm_omap.la
+                $(top_builddir)/linux/src/utils/libtiipcutils.la
 
 # the additional libraries to link ping_rpmsg
 ping_rpmsg_LDADD = -lrt
 
 # the additional libraries to link mmrpc_test
 mmrpc_test_LDADD = $(common_libraries) \
-                $(top_builddir)/linux/src/mm/libmmrpc.la
+                $(top_builddir)/linux/src/mm/libmmrpc.la \
+                $(DRM_PREFIX)/usr/lib/libdrm.la \
+                $(DRM_PREFIX)/usr/lib/libdrm_omap.la
 
 # the additional libraries needed to link MessageQApp
 MessageQApp_LDADD = $(common_libraries) \
index a7e9b885d87df4a7daf64b4160c1010a398ee091..21ba1bc9184877be4428bfe78cd68c35f49699a4 100644 (file)
@@ -81,9 +81,7 @@ am__objects_1 =
 am_MessageQApp_OBJECTS = $(am__objects_1) MessageQApp.$(OBJEXT)
 MessageQApp_OBJECTS = $(am_MessageQApp_OBJECTS)
 am__DEPENDENCIES_1 = $(top_builddir)/linux/src/api/libtiipc.la \
-       $(top_builddir)/linux/src/utils/libtiipcutils.la \
-       $(DRM_PREFIX)/usr/lib/libdrm.la \
-       $(DRM_PREFIX)/usr/lib/libdrm_omap.la
+       $(top_builddir)/linux/src/utils/libtiipcutils.la
 am__DEPENDENCIES_2 =
 MessageQApp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 am_MessageQBench_OBJECTS = $(am__objects_1) MessageQBench.$(OBJEXT)
@@ -102,7 +100,9 @@ NameServerApp_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 am_mmrpc_test_OBJECTS = Mx.$(OBJEXT) mmrpc_test.$(OBJEXT)
 mmrpc_test_OBJECTS = $(am_mmrpc_test_OBJECTS)
 mmrpc_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-       $(top_builddir)/linux/src/mm/libmmrpc.la
+       $(top_builddir)/linux/src/mm/libmmrpc.la \
+       $(DRM_PREFIX)/usr/lib/libdrm.la \
+       $(DRM_PREFIX)/usr/lib/libdrm_omap.la
 am_nano_test_OBJECTS = $(am__objects_1) nano_test.$(OBJEXT)
 nano_test_OBJECTS = $(am_nano_test_OBJECTS)
 nano_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -142,7 +142,6 @@ 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)/include \
-        -I$(top_srcdir)/packages -I$(CMEM_INSTALL_DIR)/packages \
         -I$(DRM_PREFIX)/usr/include \
         -I$(DRM_PREFIX)/usr/include/libdrm \
         -I$(DRM_PREFIX)/usr/include/omap \
@@ -301,9 +300,7 @@ NameServerApp_SOURCES = $(nameServer_common_sources)
 # list of sources for the 'nano_test' binary
 nano_test_SOURCES = $(common_sources) nano_test.c
 common_libraries = -lpthread $(top_builddir)/linux/src/api/libtiipc.la \
-                $(top_builddir)/linux/src/utils/libtiipcutils.la \
-                $(DRM_PREFIX)/usr/lib/libdrm.la \
-                $(DRM_PREFIX)/usr/lib/libdrm_omap.la
+                $(top_builddir)/linux/src/utils/libtiipcutils.la
 
 
 # the additional libraries to link ping_rpmsg
@@ -311,7 +308,9 @@ ping_rpmsg_LDADD = -lrt
 
 # the additional libraries to link mmrpc_test
 mmrpc_test_LDADD = $(common_libraries) \
-                $(top_builddir)/linux/src/mm/libmmrpc.la
+                $(top_builddir)/linux/src/mm/libmmrpc.la \
+                $(DRM_PREFIX)/usr/lib/libdrm.la \
+                $(DRM_PREFIX)/usr/lib/libdrm_omap.la
 
 
 # the additional libraries needed to link MessageQApp