Changeset 21681 for main/trunk

Timestamp:

2010-01-27T16:20:55+13:00 (14 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:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• configure (modified) (2 diffs)
• configure.ac (modified) (1 diff)

main/trunk/gs2-core/Makefile.am

@@ -26 +26 @@
 
 
-SUBDIRS = common-src runtime-src
+SUBDIRS = common-src build-src runtime-src

main/trunk/gs2-core/Makefile.in

@@ -183 +183 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = common-src runtime-src
+SUBDIRS = common-src build-src runtime-src
 all: config.h
     $(MAKE) $(AM_MAKEFLAGS) all-recursive

main/trunk/gs2-core/configure

@@ -275 +275 @@
 
 ac_subdirs_all="$ac_subdirs_all common-src"
+ac_subdirs_all="$ac_subdirs_all build-src"
 ac_subdirs_all="$ac_subdirs_all runtime-src"
 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 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'
@@ -2736 +2737 @@
 
 subdirs="$subdirs common-src"
+
+fi
+
+# Configure the build-src subdirectory
+if test -d "$srcdir/build-src"; then
+
+
+subdirs="$subdirs build-src"
 
 fi

main/trunk/gs2-core/configure.ac

@@ -80 +80 @@
 fi
 
+# Configure the build-src subdirectory
+if test -d "$srcdir/build-src"; then
+  AC_CONFIG_SUBDIRS([build-src])
+fi
+
 # Configure the runtime-src subdirectory
 if test -d "$srcdir/runtime-src"; then