[Ltp-cvs] ltp/include/mk env_pre.mk,1.13,1.14

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp/include/mk
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4214/include/mk

Modified Files:
	env_pre.mk 
Log Message:
1. env_pre.mk: Add additional build-tree states and unify them under the $(BUILD_TREE_STATE) variable.
2. Makefile: Resolve issue spotted by Mitani-san because it was an overlooked corner case that wasn't properly expressed until $(BUILD_TREE_STATE) was introduced.
3. testscripts/... : resolve some issues with the test scripts.

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: env_pre.mk
===================================================================
RCS file: /cvsroot/ltp/ltp/include/mk/env_pre.mk,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** env_pre.mk	28 Jan 2010 16:03:04 -0000	1.13
--- env_pre.mk	29 Jan 2010 09:41:22 -0000	1.14
***************
*** 28,31 ****
--- 28,40 ----
  ENV_PRE_LOADED = 1
  
+ # "out-of-build-tree" build.
+ BUILD_TREE_BUILDDIR_INSTALL	:= 1
+ # "in-srcdir" build / install.
+ BUILD_TREE_SRCDIR_INSTALL	:= 2
+ # "in-srcdir" build, non-srcdir install.
+ BUILD_TREE_NONSRCDIR_INSTALL	:= 3
+ # configure not run.
+ BUILD_TREE_UNCONFIGURED		:= 4
+ 
  ifndef MAKE_VERSION_CHECK
  export MAKE_VERSION_CHECK = 1
***************
*** 86,111 ****
  endif
  
! # We can piece together where we're located in the source and object trees with
! # just these two vars and $(CURDIR).
! export abs_top_srcdir abs_top_builddir
  
! # DO NOT MOVE THIS BELOW include [..]/config.mk (will break out-of-build tree
! # checks)!
  ifneq ($(abs_builddir),$(abs_srcdir))
! OUT_OF_BUILD_TREE		:= 1
  else
! # Stub support for installing directly in the build tree; the support is not
! # there yet, but the variable itself has its own uses...
  ifeq ($(strip $(DESTDIR)$(prefix)),)
! INSTALL_IN_BUILD_TREE		:= 1
! else
! ifeq ($(subst $(abs_top_srcdir),,$(prefix)),)
! INSTALL_IN_BUILD_TREE		:= 1
  endif
  endif
  endif
  
! ifeq ($(filter autotools %clean help,$(MAKECMDGOALS)),)
! include $(abs_top_builddir)/include/mk/config.mk
  endif
  
--- 95,126 ----
  endif
  
! # autotools, *clean, and help don't require config.mk...
! ifeq ($(filter autotools %clean help,$(MAKECMDGOALS)),)
  
! include $(abs_top_builddir)/include/mk/config.mk
! 
! # START out-of-build-tree check.
  ifneq ($(abs_builddir),$(abs_srcdir))
! BUILD_TREE_STATE		:= $(BUILD_TREE_BUILDDIR_INSTALL)
  else
! # Else, not out of build tree..
! 
! # START srcdir build-tree install checks
  ifeq ($(strip $(DESTDIR)$(prefix)),)
! BUILD_TREE_STATE		:= $(BUILD_TREE_SRCDIR_INSTALL)
! else  # Empty $(DESTDIR)$(prefix)
! ifeq ($(abs_top_srcdir),$(prefix))
! BUILD_TREE_STATE		:= $(BUILD_TREE_SRCDIR_INSTALL)
  endif
+ # END srcdir build-tree install checks
  endif
+ # END out-of-build-tree check.
  endif
  
! # Is the build-tree configured yet?
! ifeq ($(BUILD_TREE_STATE),)
! ifneq ($(wildcard $(abs_top_builddir)/include/mk/config.mk),)
! BUILD_TREE_STATE		:= $(BUILD_TREE_NONSRCDIR_INSTALL)
! endif
  endif
  
***************
*** 113,115 ****
--- 128,138 ----
  .DEFAULT_GOAL			:= all
  
+ endif	# END autotools, *clean...
+ 
+ BUILD_TREE_STATE		?= $(BUILD_TREE_UNCONFIGURED)
+ 
+ # We can piece together where we're located in the source and object trees with
+ # just these two vars and $(CURDIR).
+ export abs_top_srcdir abs_top_builddir BUILD_TREE_STATE
+ 
  endif