diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2011-02-01 18:04:48 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2011-02-01 18:04:48 +1100 |
| commit | d586346fe098ee5cd0e0767017a88952e9ac4afe (patch) | |
| tree | 1f34d87fc8dd20bffe1d7ed9eaf4e506a13ba830 /build_posix | |
| parent | 1772f2602c334420b2ee492a70ece8fcf8dc8c51 (diff) | |
| download | mongo-d586346fe098ee5cd0e0767017a88952e9ac4afe.tar.gz | |
Merge the build of the WiredTiger core with the API tree.
refs #27
--HG--
rename : include/wiredtiger.h => include/api_int.h
rename : src/support/strerror.c => src/api/strerror.c
rename : src/support/version.c => src/api/version.c
Diffstat (limited to 'build_posix')
| -rw-r--r-- | build_posix/Make.base | 22 | ||||
| -rw-r--r-- | build_posix/configure.ac | 1 |
2 files changed, 22 insertions, 1 deletions
diff --git a/build_posix/Make.base b/build_posix/Make.base index 1b4237c0d62..cb1bdd00d10 100644 --- a/build_posix/Make.base +++ b/build_posix/Make.base @@ -1,12 +1,32 @@ wtdir = $(prefix)/wt wt_LIBRARIES = libwiredtiger.a +LDADD = libwiredtiger.a -lpthread wt_PROGRAMS = db_dump db_load db_stat db_verify db_dump_SOURCES = ../src/utilities/db_dump/util_dump.c ../src/support/simple_setup.c db_load_SOURCES = ../src/utilities/db_load/util_load.c ../src/support/simple_setup.c db_stat_SOURCES = ../src/utilities/db_stat/util_stat.c ../src/support/simple_setup.c db_verify_SOURCES = ../src/utilities/db_verify/util_verify.c ../src/support/simple_setup.c -LDADD = libwiredtiger.a -lpthread + +noinst_PROGRAMS = ex_access ex_all ex_call_center ex_config ex_cursor \ + ex_extending ex_hello ex_pack ex_process ex_schema ex_sequence \ + ex_stat ex_thread ex_tpcb ex_transaction + +ex_access_SOURCES = ../examples/c/ex_access.c +ex_all_SOURCES = ../examples/c/ex_all.c +ex_call_center_SOURCES = ../examples/c/ex_call_center.c +ex_config_SOURCES = ../examples/c/ex_config.c +ex_cursor_SOURCES = ../examples/c/ex_cursor.c +ex_extending_SOURCES = ../examples/c/ex_extending.c +ex_hello_SOURCES = ../examples/c/ex_hello.c +ex_pack_SOURCES = ../examples/c/ex_pack.c +ex_process_SOURCES = ../examples/c/ex_process.c +ex_schema_SOURCES = ../examples/c/ex_schema.c +ex_sequence_SOURCES = ../examples/c/ex_sequence.c +ex_stat_SOURCES = ../examples/c/ex_stat.c +ex_thread_SOURCES = ../examples/c/ex_thread.c +ex_tpcb_SOURCES = ../examples/c/ex_tpcb.c +ex_transaction_SOURCES = ../examples/c/ex_transaction.c include_HEADERS= wiredtiger.h INCLUDES= -I../include diff --git a/build_posix/configure.ac b/build_posix/configure.ac index 74c47e3a860..88227addc48 100644 --- a/build_posix/configure.ac +++ b/build_posix/configure.ac @@ -24,6 +24,7 @@ AM_INIT_AUTOMAKE AM_OPTIONS AC_PROG_CC(cc gcc) +AC_PROG_CXX(c++ g++) if test "$GCC" = "yes"; then # Automake configures gcc's CFLAGS to be -g -O2. |