You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2015/07/27 23:52:50 UTC
[2/2] thrift git commit: THRIFT-2957 warning: source file %s is in a
subdirectory,
but option 'subdir-objects' is disabled Client: Compiler General Patch: Simon
South
THRIFT-2957 warning: source file %s is in a subdirectory, but option 'subdir-objects' is disabled
Client: Compiler General
Patch: Simon South
This closes #563
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/86777191
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/86777191
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/86777191
Branch: refs/heads/master
Commit: 8677719180b3ef628122e68c188217d4ba987e40
Parents: da0b71f
Author: Jens Geyer <je...@apache.org>
Authored: Sat Jul 25 15:59:46 2015 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Mon Jul 27 23:52:13 2015 +0200
----------------------------------------------------------------------
compiler/cpp/Makefile.am | 2 +-
configure.ac | 2 +-
lib/c_glib/test/Makefile.am | 76 ++++++++++++++++++++--------------------
3 files changed, 40 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/86777191/compiler/cpp/Makefile.am
----------------------------------------------------------------------
diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index f5514d9..485e30c 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -23,7 +23,7 @@
AM_YFLAGS = -d
LIBS =
-BUILT_SOURCES = thrifty.cc
+BUILT_SOURCES = src/thrifty.cc
bin_PROGRAMS = thrift
http://git-wip-us.apache.org/repos/asf/thrift/blob/86777191/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index bc257a3..9af7f65 100755
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_INIT([thrift], [1.0.0-dev])
AC_CONFIG_AUX_DIR([.])
-AM_INIT_AUTOMAKE([1.13 tar-ustar])
+AM_INIT_AUTOMAKE([1.13 subdir-objects tar-ustar])
PKG_PROG_PKG_CONFIG
AC_ARG_VAR([PY_PREFIX], [Prefix for installing Python modules.
http://git-wip-us.apache.org/repos/asf/thrift/blob/86777191/lib/c_glib/test/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/c_glib/test/Makefile.am b/lib/c_glib/test/Makefile.am
index a9842da..0e8de86 100755
--- a/lib/c_glib/test/Makefile.am
+++ b/lib/c_glib/test/Makefile.am
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-AUTOMAKE_OPTIONS = serial-tests
+AUTOMAKE_OPTIONS = subdir-objects serial-tests
SUBDIRS =
@@ -58,70 +58,70 @@ endif
testapplicationexception_SOURCES = testapplicationexception.c
testapplicationexception_LDADD = \
- ../libthrift_c_glib_la-thrift_application_exception.o \
- ../libthrift_c_glib_la-thrift_protocol.o \
- ../libthrift_c_glib_la-thrift_struct.o \
- ../libthrift_c_glib_la-thrift_transport.o
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/libthrift_c_glib_la-thrift_application_exception.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/libthrift_c_glib_la-thrift_struct.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o
testtransportsocket_SOURCES = testtransportsocket.c
testtransportsocket_LDADD = \
- ../libthrift_c_glib_la-thrift_transport.o \
- ../libthrift_c_glib_la-thrift_buffered_transport.o \
- ../libthrift_c_glib_la-thrift_server_transport.o \
- ../libthrift_c_glib_la-thrift_server_socket.o
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_buffered_transport.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
testbinaryprotocol_SOURCES = testbinaryprotocol.c
testbinaryprotocol_LDADD = \
- ../libthrift_c_glib_la-thrift_protocol.o \
- ../libthrift_c_glib_la-thrift_transport.o \
- ../libthrift_c_glib_la-thrift_socket.o \
- ../libthrift_c_glib_la-thrift_server_transport.o \
- ../libthrift_c_glib_la-thrift_server_socket.o
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
testbufferedtransport_SOURCES = testbufferedtransport.c
testbufferedtransport_LDADD = \
- ../libthrift_c_glib_la-thrift_transport.o \
- ../libthrift_c_glib_la-thrift_socket.o \
- ../libthrift_c_glib_la-thrift_server_transport.o \
- ../libthrift_c_glib_la-thrift_server_socket.o
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
testframedtransport_SOURCES = testframedtransport.c
testframedtransport_LDADD = \
- ../libthrift_c_glib_la-thrift_transport.o \
- ../libthrift_c_glib_la-thrift_socket.o \
- ../libthrift_c_glib_la-thrift_server_transport.o \
- ../libthrift_c_glib_la-thrift_server_socket.o
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
testmemorybuffer_SOURCES = testmemorybuffer.c
testmemorybuffer_LDADD = \
- ../libthrift_c_glib_la-thrift_transport.o
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o
teststruct_SOURCES = teststruct.c
teststruct_LDADD = \
- ../libthrift_c_glib_la-thrift_protocol.o \
- ../libthrift_c_glib_la-thrift_transport.o
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o
testsimpleserver_SOURCES = testsimpleserver.c
testsimpleserver_LDADD = \
- ../libthrift_c_glib_la-thrift_protocol.o \
- ../libthrift_c_glib_la-thrift_transport.o \
- ../libthrift_c_glib_la-thrift_transport_factory.o \
- ../libthrift_c_glib_la-thrift_processor.o \
- ../libthrift_c_glib_la-thrift_protocol_factory.o \
- ../libthrift_c_glib_la-thrift_binary_protocol.o \
- ../libthrift_c_glib_la-thrift_binary_protocol_factory.o \
- ../libthrift_c_glib_la-thrift_socket.o \
- ../libthrift_c_glib_la-thrift_server_transport.o \
- ../libthrift_c_glib_la-thrift_server_socket.o \
- ../libthrift_c_glib_la-thrift_server.o
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport_factory.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/processor/libthrift_c_glib_la-thrift_processor.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol_factory.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_binary_protocol.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_binary_protocol_factory.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/server/libthrift_c_glib_la-thrift_server.o
testdebugproto_SOURCES = testdebugproto.c
testdebugproto_LDADD = libtestgenc.la
testoptionalrequired_SOURCES = testoptionalrequired.c
testoptionalrequired_LDADD = \
- ../libthrift_c_glib_la-thrift_protocol.o \
- ../libthrift_c_glib_la-thrift_transport.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
libtestgenc.la
testthrifttest_SOURCES = testthrifttest.c