Changeset 21681

Show
Ignore:
Timestamp:
27.01.2010 16:20:55 (9 years ago)
Author:
mdewsnip
Message:

Changed top-level configure and Makefile so the build-src directory is done as well.

Location:
main/trunk/gs2-core
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gs2-core/Makefile.am

    r21498 r21681  
    2626 
    2727 
    28 SUBDIRS = common-src runtime-src 
     28SUBDIRS = common-src build-src runtime-src 
  • main/trunk/gs2-core/Makefile.in

    r21534 r21681  
    183183sysconfdir = @sysconfdir@ 
    184184target_alias = @target_alias@ 
    185 SUBDIRS = common-src runtime-src 
     185SUBDIRS = common-src build-src runtime-src 
    186186all: config.h 
    187187    $(MAKE) $(AM_MAKEFLAGS) all-recursive 
  • main/trunk/gs2-core/configure

    r21624 r21681  
    275275 
    276276ac_subdirs_all="$ac_subdirs_all common-src" 
     277ac_subdirs_all="$ac_subdirs_all build-src" 
    277278ac_subdirs_all="$ac_subdirs_all runtime-src" 
    278279ac_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 CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os COMPAT32BITFLAGS ENABLE_LUCENE_TRUE ENABLE_LUCENE_FALSE USE_SQLITE_TRUE USE_SQLITE_FALSE subdirs LIBOBJS LTLIBOBJS' 
     
    27362737 
    27372738subdirs="$subdirs common-src" 
     2739 
     2740fi 
     2741 
     2742# Configure the build-src subdirectory 
     2743if test -d "$srcdir/build-src"; then 
     2744 
     2745 
     2746subdirs="$subdirs build-src" 
    27382747 
    27392748fi 
  • main/trunk/gs2-core/configure.ac

    r21624 r21681  
    8080fi 
    8181 
     82# Configure the build-src subdirectory 
     83if test -d "$srcdir/build-src"; then 
     84  AC_CONFIG_SUBDIRS([build-src]) 
     85fi 
     86 
    8287# Configure the runtime-src subdirectory 
    8388if test -d "$srcdir/runtime-src"; then