From 24e9261e33b85f3423cded989c81ac2fac0b8df0 Mon Sep 17 00:00:00 2001 From: Ramsey Harris Date: Fri, 22 Mar 2013 14:13:56 -0700 Subject: [PATCH] Updated autoreconf generated files; Makefile.in, configure. --- Makefile.in | 1 + configure | 56 +++++++++++++++++++++++------------- linux/etc/Makefile.in | 1 + linux/src/api/Makefile.in | 1 + linux/src/daemon/Makefile.in | 1 + linux/src/family/Makefile.in | 1 + linux/src/mm/Makefile.in | 3 +- linux/src/tests/Makefile.in | 8 ++++-- linux/src/utils/Makefile.in | 1 + 9 files changed, 49 insertions(+), 24 deletions(-) diff --git a/Makefile.in b/Makefile.in index e44aa2d..8f0f928 100644 --- a/Makefile.in +++ b/Makefile.in @@ -118,6 +118,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ diff --git a/configure b/configure index 00a9561..cf8e3db 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 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 LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -942,6 +942,10 @@ ac_env_CMEM_INSTALL_DIR_set=${CMEM_INSTALL_DIR+set} ac_env_CMEM_INSTALL_DIR_value=$CMEM_INSTALL_DIR ac_cv_env_CMEM_INSTALL_DIR_set=${CMEM_INSTALL_DIR+set} ac_cv_env_CMEM_INSTALL_DIR_value=$CMEM_INSTALL_DIR +ac_env_KERNEL_INSTALL_DIR_set=${KERNEL_INSTALL_DIR+set} +ac_env_KERNEL_INSTALL_DIR_value=$KERNEL_INSTALL_DIR +ac_cv_env_KERNEL_INSTALL_DIR_set=${KERNEL_INSTALL_DIR+set} +ac_cv_env_KERNEL_INSTALL_DIR_value=$KERNEL_INSTALL_DIR # # Report the --help message. @@ -1060,6 +1064,8 @@ Some influential environment variables: built. CMEM_INSTALL_DIR Installation path directory to the CMEM libraries + KERNEL_INSTALL_DIR + Installation path to the Linux kernel. Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -3705,7 +3711,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3708 "configure"' > conftest.$ac_ext + echo '#line 3714 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6130,11 +6136,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6133: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6139: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6137: \$? = $ac_status" >&5 + echo "$as_me:6143: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6398,11 +6404,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6401: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6407: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6405: \$? = $ac_status" >&5 + echo "$as_me:6411: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6502,11 +6508,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6505: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6511: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6509: \$? = $ac_status" >&5 + echo "$as_me:6515: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8847,7 +8853,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11296: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11294: \$? = $ac_status" >&5 + echo "$as_me:11300: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11391,11 +11397,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11394: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11400: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11398: \$? = $ac_status" >&5 + echo "$as_me:11404: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12698,11 +12704,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12701: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12707: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12705: \$? = $ac_status" >&5 + echo "$as_me:12711: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12966,11 +12972,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12969: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12975: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12973: \$? = $ac_status" >&5 + echo "$as_me:12979: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13070,11 +13076,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13073: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13079: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13077: \$? = $ac_status" >&5 + echo "$as_me:13083: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16767,6 +16773,7 @@ done + # Test platform variable for setting if test "x$PLATFORM" = "xomapl138"; then { echo "$as_me:$LINENO: PLATFORM is set to ${PLATFORM}" >&5 @@ -16802,10 +16809,18 @@ 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;} + { (exit 1); exit 1; }; } +fi + + # Export optional user variable to Makefile(s) + # Define specific variables to be used in Makefile.am @@ -17668,6 +17683,7 @@ s,@AM_CFLAGS@,$AM_CFLAGS,;t t s,@AM_LDFLAGS@,$AM_LDFLAGS,;t t s,@PLATFORM@,$PLATFORM,;t t s,@CMEM_INSTALL_DIR@,$CMEM_INSTALL_DIR,;t t +s,@KERNEL_INSTALL_DIR@,$KERNEL_INSTALL_DIR,;t t s,@OMAPL138_TRUE@,$OMAPL138_TRUE,;t t s,@OMAPL138_FALSE@,$OMAPL138_FALSE,;t t s,@TCI6614_TRUE@,$TCI6614_TRUE,;t t diff --git a/linux/etc/Makefile.in b/linux/etc/Makefile.in index ad29aba..6dc9f92 100644 --- a/linux/etc/Makefile.in +++ b/linux/etc/Makefile.in @@ -84,6 +84,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ diff --git a/linux/src/api/Makefile.in b/linux/src/api/Makefile.in index 3abb39e..05f6fce 100644 --- a/linux/src/api/Makefile.in +++ b/linux/src/api/Makefile.in @@ -118,6 +118,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ diff --git a/linux/src/daemon/Makefile.in b/linux/src/daemon/Makefile.in index 1612345..0f767e2 100644 --- a/linux/src/daemon/Makefile.in +++ b/linux/src/daemon/Makefile.in @@ -146,6 +146,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ diff --git a/linux/src/family/Makefile.in b/linux/src/family/Makefile.in index 0a785a2..fee1960 100644 --- a/linux/src/family/Makefile.in +++ b/linux/src/family/Makefile.in @@ -175,6 +175,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ diff --git a/linux/src/mm/Makefile.in b/linux/src/mm/Makefile.in index b2267c1..d078969 100644 --- a/linux/src/mm/Makefile.in +++ b/linux/src/mm/Makefile.in @@ -83,7 +83,7 @@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ # additional include paths necessary to compile the library -AM_CFLAGS = -Wall @AM_CFLAGS@ +AM_CFLAGS = -Wall @AM_CFLAGS@ -DKERNEL_INSTALL_DIR="$(KERNEL_INSTALL_DIR)" AM_LDFLAGS = @AM_LDFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -115,6 +115,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ diff --git a/linux/src/tests/Makefile.in b/linux/src/tests/Makefile.in index 9cfb977..bdf6cae 100644 --- a/linux/src/tests/Makefile.in +++ b/linux/src/tests/Makefile.in @@ -16,7 +16,6 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -208,7 +207,7 @@ NameServerApp_tci6638_OBJECTS = $(am_NameServerApp_tci6638_OBJECTS) NameServerApp_tci6638_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(top_builddir)/linux/src/family/libtiipccfg_tci6638.la \ $(am__DEPENDENCIES_2) -am_mmrpc_test_OBJECTS = mmrpc_test.$(OBJEXT) +am_mmrpc_test_OBJECTS = Mx.$(OBJEXT) mmrpc_test.$(OBJEXT) mmrpc_test_OBJECTS = $(am_mmrpc_test_OBJECTS) mmrpc_test_DEPENDENCIES = $(top_builddir)/linux/src/mm/libmmrpc.la am_nano_test_omapl138_OBJECTS = $(am__objects_1) nano_test.$(OBJEXT) @@ -266,6 +265,7 @@ DIST_SOURCES = $(MessageQApp_omap54xx_smp_SOURCES) \ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +VPATH = ../../../packages/ti/ipc/tests ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -306,6 +306,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -397,7 +398,7 @@ nameServer_common_sources = \ ping_rpmsg_SOURCES = ping_rpmsg.c # list of sources for the 'mmrpc_test' binary -mmrpc_test_SOURCES = mmrpc_test.c +mmrpc_test_SOURCES = Mx.c mmrpc_test.c # list of sources for the 'MessageQApp' binary MessageQApp_omap54xx_smp_SOURCES = $(common_sources) MessageQApp.c @@ -641,6 +642,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MessageQApp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MessageQBench.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MessageQMulti.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Mx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NameServerApp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mmrpc_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nano_test.Po@am__quote@ diff --git a/linux/src/utils/Makefile.in b/linux/src/utils/Makefile.in index 20b753a..f39e83c 100644 --- a/linux/src/utils/Makefile.in +++ b/linux/src/utils/Makefile.in @@ -119,6 +119,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KERNEL_INSTALL_DIR = @KERNEL_INSTALL_DIR@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -- 2.39.2