From 01007aaa61abc046e54c6ab261b02ef383172a03 Mon Sep 17 00:00:00 2001 From: Arnie Reynoso Date: Tue, 9 Apr 2013 09:25:18 -0700 Subject: [PATCH] Linux IPC: Resticted KERNEL dir config variable to omap54xx_smp builds Require KENREL_INSTALL_DIR to be set only for omap54xx_smp builds. Other supported platforms will not build mmrpc library and test applications. --- Makefile.in | 2 ++ configure | 48 ++++++++++++++++++++++++++++++------ configure.ac | 16 +++++++++--- linux/etc/Makefile.in | 2 ++ linux/src/api/Makefile.in | 2 ++ linux/src/daemon/Makefile.in | 2 ++ linux/src/family/Makefile.in | 2 ++ linux/src/mm/Makefile.am | 6 ++++- linux/src/mm/Makefile.in | 8 ++++-- linux/src/tests/Makefile.am | 5 +++- linux/src/tests/Makefile.in | 34 ++++++++++++++----------- linux/src/utils/Makefile.in | 2 ++ 12 files changed, 99 insertions(+), 30 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8f0f928..27b5b35 100644 --- a/Makefile.in +++ b/Makefile.in @@ -118,6 +118,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KDIR_FALSE = @KDIR_FALSE@ +KDIR_TRUE = @KDIR_TRUE@ KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/configure b/configure index cf8e3db..4f1007e 100755 --- a/configure +++ b/configure @@ -461,7 +461,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL AM_CFLAGS AM_LDFLAGS PLATFORM CMEM_INSTALL_DIR KERNEL_INSTALL_DIR OMAPL138_TRUE OMAPL138_FALSE TCI6614_TRUE TCI6614_FALSE TCI6638_TRUE TCI6638_FALSE OMAP54XX_SMP_TRUE OMAP54XX_SMP_FALSE CMEM_TRUE CMEM_FALSE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL AM_CFLAGS AM_LDFLAGS PLATFORM CMEM_INSTALL_DIR KERNEL_INSTALL_DIR OMAPL138_TRUE OMAPL138_FALSE TCI6614_TRUE TCI6614_FALSE TCI6638_TRUE TCI6638_FALSE OMAP54XX_SMP_TRUE OMAP54XX_SMP_FALSE CMEM_TRUE CMEM_FALSE KDIR_TRUE KDIR_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -16809,12 +16809,22 @@ fi fi -if test "x$KERNEL_INSTALL_DIR" = "x"; then - { { echo "$as_me:$LINENO: error: Kernel path is not set" >&5 -echo "$as_me: error: Kernel path is not set" >&2;} +# Test platform for omap5 variable and require a KERNEL path +if test "x$PLATFORM" = "xomap54xx_smp"; then + if test "x$KERNEL_INSTALL_DIR" = "x"; then + { { echo "$as_me:$LINENO: error: Kernel path for ${PLATFORM} is not set" >&5 +echo "$as_me: error: Kernel path for ${PLATFORM} is not set" >&2;} { (exit 1); exit 1; }; } fi +fi + + +# Ignore KERNEL path when no platform is set +if test "x$PLATFORM" = "x"; then + KERNEL_INSTALL_DIR= +fi + # Export optional user variable to Makefile(s) @@ -16873,6 +16883,16 @@ else fi + +if test "x$KERNEL_INSTALL_DIR" != "x"; then + KDIR_TRUE= + KDIR_FALSE='#' +else + KDIR_TRUE='#' + KDIR_FALSE= +fi + + # Generate Makefile(s) ac_config_files="$ac_config_files Makefile" @@ -16884,12 +16904,12 @@ fi ac_config_files="$ac_config_files linux/src/family/Makefile" + ac_config_files="$ac_config_files linux/src/mm/Makefile" + ac_config_files="$ac_config_files linux/src/daemon/Makefile" ac_config_files="$ac_config_files linux/src/tests/Makefile" - ac_config_files="$ac_config_files linux/src/mm/Makefile" - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -17082,6 +17102,13 @@ echo "$as_me: error: conditional \"CMEM\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${KDIR_TRUE}" && test -z "${KDIR_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"KDIR\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"KDIR\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -17526,9 +17553,9 @@ do "linux/src/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/src/utils/Makefile" ;; "linux/src/api/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/src/api/Makefile" ;; "linux/src/family/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/src/family/Makefile" ;; + "linux/src/mm/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/src/mm/Makefile" ;; "linux/src/daemon/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/src/daemon/Makefile" ;; "linux/src/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/src/tests/Makefile" ;; - "linux/src/mm/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/src/mm/Makefile" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -17694,6 +17721,8 @@ s,@OMAP54XX_SMP_TRUE@,$OMAP54XX_SMP_TRUE,;t t s,@OMAP54XX_SMP_FALSE@,$OMAP54XX_SMP_FALSE,;t t s,@CMEM_TRUE@,$CMEM_TRUE,;t t s,@CMEM_FALSE@,$CMEM_FALSE,;t t +s,@KDIR_TRUE@,$KDIR_TRUE,;t t +s,@KDIR_FALSE@,$KDIR_FALSE,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -18177,7 +18206,10 @@ Compilation command: '${CC} ${CFLAGS} ${CPPFLAGS}' You have configured to build for the '${PLATFORM}' platform -Your CMEM installation is at: +Your KERNEL installation directory is set to: + '${KERNEL_INSTALL_DIR}' + +Your CMEM installation directory is set to: '${CMEM_INSTALL_DIR}' Now type 'make; sudo make install' to generate the program diff --git a/configure.ac b/configure.ac index 1ce5273..1dfc302 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,13 @@ AS_IF([test "x$PLATFORM" = "xomapl138"], [AC_MSG_NOTICE([PLATFORM is not set. All supported platforms will be built ....])], [AC_MSG_ERROR([PLATFORM is set to "${PLATFORM}": run ./configure --help for available PLATFORM options])])])])])]) -AS_IF([test "x$KERNEL_INSTALL_DIR" = "x"], [AC_MSG_ERROR([Kernel path is not set])]) +# Test platform for omap5 variable and require a KERNEL path +AS_IF([test "x$PLATFORM" = "xomap54xx_smp"], + [AS_IF([test "x$KERNEL_INSTALL_DIR" = "x"], + [AC_MSG_ERROR([Kernel path for ${PLATFORM} is not set])])]) + +# Ignore KERNEL path when no platform is set +AS_IF([test "x$PLATFORM" = "x"], [KERNEL_INSTALL_DIR=]) # Export optional user variable to Makefile(s) AC_SUBST([PLATFORM]) @@ -96,6 +102,7 @@ AM_CONDITIONAL([TCI6614], [test "x$PLATFORM" = "xtci6614"]) AM_CONDITIONAL([TCI6638], [test "x$PLATFORM" = "xtci6638"]) AM_CONDITIONAL([OMAP54XX_SMP], [test "x$PLATFORM" = "xomap54xx_smp"]) AM_CONDITIONAL([CMEM], [test "x$CMEM_INSTALL_DIR" != "x"]) +AM_CONDITIONAL([KDIR], [test "x$KERNEL_INSTALL_DIR" != "x"]) # Generate Makefile(s) AC_CONFIG_FILES([Makefile]) @@ -103,9 +110,9 @@ AC_CONFIG_FILES([linux/etc/Makefile]) AC_CONFIG_FILES([linux/src/utils/Makefile]) AC_CONFIG_FILES([linux/src/api/Makefile]) AC_CONFIG_FILES([linux/src/family/Makefile]) +AC_CONFIG_FILES([linux/src/mm/Makefile]) AC_CONFIG_FILES([linux/src/daemon/Makefile]) AC_CONFIG_FILES([linux/src/tests/Makefile]) -AC_CONFIG_FILES([linux/src/mm/Makefile]) AC_OUTPUT echo \ @@ -118,7 +125,10 @@ Compilation command: '${CC} ${CFLAGS} ${CPPFLAGS}' You have configured to build for the '${PLATFORM}' platform -Your CMEM installation is at: +Your KERNEL installation directory is set to: + '${KERNEL_INSTALL_DIR}' + +Your CMEM installation directory is set to: '${CMEM_INSTALL_DIR}' Now type 'make; sudo make install' to generate the program diff --git a/linux/etc/Makefile.in b/linux/etc/Makefile.in index 6dc9f92..0402495 100644 --- a/linux/etc/Makefile.in +++ b/linux/etc/Makefile.in @@ -84,6 +84,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KDIR_FALSE = @KDIR_FALSE@ +KDIR_TRUE = @KDIR_TRUE@ KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/linux/src/api/Makefile.in b/linux/src/api/Makefile.in index 05f6fce..9e43bcd 100644 --- a/linux/src/api/Makefile.in +++ b/linux/src/api/Makefile.in @@ -118,6 +118,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KDIR_FALSE = @KDIR_FALSE@ +KDIR_TRUE = @KDIR_TRUE@ KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/linux/src/daemon/Makefile.in b/linux/src/daemon/Makefile.in index 0f767e2..4b2f948 100644 --- a/linux/src/daemon/Makefile.in +++ b/linux/src/daemon/Makefile.in @@ -146,6 +146,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KDIR_FALSE = @KDIR_FALSE@ +KDIR_TRUE = @KDIR_TRUE@ KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/linux/src/family/Makefile.in b/linux/src/family/Makefile.in index fee1960..4a9fb0b 100644 --- a/linux/src/family/Makefile.in +++ b/linux/src/family/Makefile.in @@ -175,6 +175,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KDIR_FALSE = @KDIR_FALSE@ +KDIR_TRUE = @KDIR_TRUE@ KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/linux/src/mm/Makefile.am b/linux/src/mm/Makefile.am index 666a086..5ba2e00 100644 --- a/linux/src/mm/Makefile.am +++ b/linux/src/mm/Makefile.am @@ -39,7 +39,11 @@ AM_CFLAGS = -Wall @AM_CFLAGS@ -DKERNEL_INSTALL_DIR="$(KERNEL_INSTALL_DIR)" ############################################################################### # the library names to build (note we are building shared libs) -lib_LTLIBRARIES = libmmrpc.la +lib_LTLIBRARIES = + +if KDIR +lib_LTLIBRARIES += libmmrpc.la +endif # where to install the headers on the system libmmrpc_ladir = $(includedir) diff --git a/linux/src/mm/Makefile.in b/linux/src/mm/Makefile.in index d078969..8528011 100644 --- a/linux/src/mm/Makefile.in +++ b/linux/src/mm/Makefile.in @@ -37,6 +37,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : 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 \ $(srcdir)/Makefile.in @@ -59,6 +60,7 @@ libmmrpc_la_LIBADD = am__objects_1 = am_libmmrpc_la_OBJECTS = $(am__objects_1) MmRpc.lo libmmrpc_la_OBJECTS = $(am_libmmrpc_la_OBJECTS) +@KDIR_TRUE@am_libmmrpc_la_rpath = -rpath $(libdir) DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/linux/build-aux/depcomp am__depfiles_maybe = depfiles @@ -115,6 +117,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KDIR_FALSE = @KDIR_FALSE@ +KDIR_TRUE = @KDIR_TRUE@ KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -196,7 +200,7 @@ target_alias = @target_alias@ ############################################################################### # the library names to build (note we are building shared libs) -lib_LTLIBRARIES = libmmrpc.la +lib_LTLIBRARIES = $(am__append_1) # where to install the headers on the system libmmrpc_ladir = $(includedir) @@ -273,7 +277,7 @@ clean-libLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done libmmrpc.la: $(libmmrpc_la_OBJECTS) $(libmmrpc_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libmmrpc_la_LDFLAGS) $(libmmrpc_la_OBJECTS) $(libmmrpc_la_LIBADD) $(LIBS) + $(LINK) $(am_libmmrpc_la_rpath) $(libmmrpc_la_LDFLAGS) $(libmmrpc_la_OBJECTS) $(libmmrpc_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) diff --git a/linux/src/tests/Makefile.am b/linux/src/tests/Makefile.am index 43ec32e..b12c3fa 100644 --- a/linux/src/tests/Makefile.am +++ b/linux/src/tests/Makefile.am @@ -41,11 +41,14 @@ VPATH = ../../../packages/ti/ipc/tests ############################################################################### # the program to build (the names of the final binaries) -bin_PROGRAMS = ping_rpmsg mmrpc_test +bin_PROGRAMS = ping_rpmsg if OMAP54XX_SMP bin_PROGRAMS += MessageQApp_omap54xx_smp MessageQBench_omap54xx_smp \ MessageQMulti_omap54xx_smp NameServerApp_omap54xx_smp +if KDIR + bin_PROGRAMS += mmrpc_test +endif else if OMAPL138 bin_PROGRAMS += MessageQApp_omapl138 MessageQBench_omapl138 \ diff --git a/linux/src/tests/Makefile.in b/linux/src/tests/Makefile.in index bdf6cae..c337fcb 100644 --- a/linux/src/tests/Makefile.in +++ b/linux/src/tests/Makefile.in @@ -35,23 +35,24 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = ping_rpmsg$(EXEEXT) mmrpc_test$(EXEEXT) $(am__EXEEXT_1) \ - $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \ - $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) +bin_PROGRAMS = ping_rpmsg$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \ + $(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5) \ + $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) @OMAP54XX_SMP_TRUE@am__append_1 = MessageQApp_omap54xx_smp MessageQBench_omap54xx_smp \ @OMAP54XX_SMP_TRUE@ MessageQMulti_omap54xx_smp NameServerApp_omap54xx_smp -@OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@am__append_2 = MessageQApp_omapl138 MessageQBench_omapl138 \ +@KDIR_TRUE@@OMAP54XX_SMP_TRUE@am__append_2 = mmrpc_test +@OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@am__append_3 = MessageQApp_omapl138 MessageQBench_omapl138 \ @OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@ MessageQMulti_omapl138 NameServerApp_omapl138 -@CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@am__append_3 = nano_test_omapl138 -@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_TRUE@am__append_4 = MessageQApp_tci6614 MessageQBench_tci6614 \ +@CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@am__append_4 = nano_test_omapl138 +@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_TRUE@am__append_5 = MessageQApp_tci6614 MessageQBench_tci6614 \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_TRUE@ MessageQMulti_tci6614 NameServerApp_tci6614 -@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_TRUE@am__append_5 = MessageQApp_tci6638 MessageQBench_tci6638 \ +@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_TRUE@am__append_6 = MessageQApp_tci6638 MessageQBench_tci6638 \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_TRUE@ MessageQMulti_tci6638 NameServerApp_tci6638 -@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__append_6 = MessageQApp_omap54xx_smp MessageQBench_omap54xx_smp \ +@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__append_7 = MessageQApp_omap54xx_smp MessageQBench_omap54xx_smp \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@ MessageQMulti_omap54xx_smp NameServerApp_omap54xx_smp \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@ MessageQApp_omapl138 MessageQBench_omapl138 \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@ MessageQMulti_omapl138 NameServerApp_omapl138 \ @@ -60,7 +61,7 @@ bin_PROGRAMS = ping_rpmsg$(EXEEXT) mmrpc_test$(EXEEXT) $(am__EXEEXT_1) \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@ MessageQApp_tci6638 MessageQBench_tci6638 \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@ MessageQMulti_tci6638 NameServerApp_tci6638 -@CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__append_7 = nano_test_omapl138 +@CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__append_8 = nano_test_omapl138 subdir = linux/src/tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -73,20 +74,21 @@ CONFIG_CLEAN_FILES = @OMAP54XX_SMP_TRUE@ MessageQBench_omap54xx_smp$(EXEEXT) \ @OMAP54XX_SMP_TRUE@ MessageQMulti_omap54xx_smp$(EXEEXT) \ @OMAP54XX_SMP_TRUE@ NameServerApp_omap54xx_smp$(EXEEXT) -@OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@am__EXEEXT_2 = MessageQApp_omapl138$(EXEEXT) \ +@KDIR_TRUE@@OMAP54XX_SMP_TRUE@am__EXEEXT_2 = mmrpc_test$(EXEEXT) +@OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@am__EXEEXT_3 = MessageQApp_omapl138$(EXEEXT) \ @OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@ MessageQBench_omapl138$(EXEEXT) \ @OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@ MessageQMulti_omapl138$(EXEEXT) \ @OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@ NameServerApp_omapl138$(EXEEXT) -@CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@am__EXEEXT_3 = nano_test_omapl138$(EXEEXT) -@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_TRUE@am__EXEEXT_4 = MessageQApp_tci6614$(EXEEXT) \ +@CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@am__EXEEXT_4 = nano_test_omapl138$(EXEEXT) +@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_TRUE@am__EXEEXT_5 = MessageQApp_tci6614$(EXEEXT) \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_TRUE@ MessageQBench_tci6614$(EXEEXT) \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_TRUE@ MessageQMulti_tci6614$(EXEEXT) \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_TRUE@ NameServerApp_tci6614$(EXEEXT) -@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_TRUE@am__EXEEXT_5 = MessageQApp_tci6638$(EXEEXT) \ +@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_TRUE@am__EXEEXT_6 = MessageQApp_tci6638$(EXEEXT) \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_TRUE@ MessageQBench_tci6638$(EXEEXT) \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_TRUE@ MessageQMulti_tci6638$(EXEEXT) \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_TRUE@ NameServerApp_tci6638$(EXEEXT) -@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__EXEEXT_6 = MessageQApp_omap54xx_smp$(EXEEXT) \ +@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__EXEEXT_7 = MessageQApp_omap54xx_smp$(EXEEXT) \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@ MessageQBench_omap54xx_smp$(EXEEXT) \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@ MessageQMulti_omap54xx_smp$(EXEEXT) \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@ NameServerApp_omap54xx_smp$(EXEEXT) \ @@ -102,7 +104,7 @@ CONFIG_CLEAN_FILES = @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@ MessageQBench_tci6638$(EXEEXT) \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@ MessageQMulti_tci6638$(EXEEXT) \ @OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@ NameServerApp_tci6638$(EXEEXT) -@CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__EXEEXT_7 = nano_test_omapl138$(EXEEXT) +@CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__EXEEXT_8 = nano_test_omapl138$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) @@ -306,6 +308,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KDIR_FALSE = @KDIR_FALSE@ +KDIR_TRUE = @KDIR_TRUE@ KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/linux/src/utils/Makefile.in b/linux/src/utils/Makefile.in index f39e83c..fd653c9 100644 --- a/linux/src/utils/Makefile.in +++ b/linux/src/utils/Makefile.in @@ -119,6 +119,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KDIR_FALSE = @KDIR_FALSE@ +KDIR_TRUE = @KDIR_TRUE@ KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -- 2.39.2