Skip to content

Commit b83e08a

Browse files
peternewmanpeternewman
committed
Use top_builddir in more places
1 parent 56b7571 commit b83e08a

File tree

9 files changed

+24
-24
lines changed

9 files changed

+24
-24
lines changed

‎common/protocol/Makefile.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ common_protocol_libolaproto_la_CXXFLAGS = $(COMMON_CXXFLAGS_ONLY_WARNINGS)
2222
common_libolacommon_la_LIBADD += common/protocol/libolaproto.la
2323

2424
common/protocol/Ola.pb.cc common/protocol/Ola.pb.h: common/protocol/Makefile.mk common/protocol/Ola.proto
25-
$(PROTOC) --cpp_out common/protocol --proto_path $(srcdir)/common/protocol $(srcdir)/common/protocol/Ola.proto
25+
$(PROTOC) --cpp_out $(top_builddir)/common/protocol --proto_path $(srcdir)/common/protocol $(srcdir)/common/protocol/Ola.proto
2626

2727
common/protocol/OlaService.pb.cpp common/protocol/OlaService.pb.h: common/protocol/Makefile.mk common/protocol/Ola.proto protoc/ola_protoc_plugin$(EXEEXT)
28-
$(OLA_PROTOC) --cppservice_out common/protocol --proto_path $(srcdir)/common/protocol $(srcdir)/common/protocol/Ola.proto
28+
$(OLA_PROTOC) --cppservice_out $(top_builddir)/common/protocol --proto_path $(srcdir)/common/protocol $(srcdir)/common/protocol/Ola.proto

‎common/rdm/Makefile.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ common_libolacommon_la_LIBADD += $(libprotobuf_LIBS)
5656
EXTRA_DIST += common/rdm/Pids.proto
5757

5858
common/rdm/Pids.pb.cc common/rdm/Pids.pb.h: common/rdm/Makefile.mk common/rdm/Pids.proto
59-
$(PROTOC) --cpp_out common/rdm --proto_path $(srcdir)/common/rdm $(srcdir)/common/rdm/Pids.proto
59+
$(PROTOC) --cpp_out $(top_builddir)/common/rdm --proto_path $(srcdir)/common/rdm $(srcdir)/common/rdm/Pids.proto
6060

6161
# TESTS_DATA
6262
##################################################

‎common/rpc/Makefile.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ EXTRA_DIST += \
2727
common/rpc/TestService.proto
2828

2929
common/rpc/Rpc.pb.cc common/rpc/Rpc.pb.h: common/rpc/Makefile.mk common/rpc/Rpc.proto
30-
$(PROTOC) --cpp_out common/rpc --proto_path $(srcdir)/common/rpc $(srcdir)/common/rpc/Rpc.proto
30+
$(PROTOC) --cpp_out $(top_builddir)/common/rpc --proto_path $(srcdir)/common/rpc $(srcdir)/common/rpc/Rpc.proto
3131

3232
common/rpc/TestService.pb.cc common/rpc/TestService.pb.h: common/rpc/Makefile.mk common/rpc/TestService.proto
33-
$(PROTOC) --cpp_out common/rpc --proto_path $(srcdir)/common/rpc $(srcdir)/common/rpc/TestService.proto
33+
$(PROTOC) --cpp_out $(top_builddir)/common/rpc --proto_path $(srcdir)/common/rpc $(srcdir)/common/rpc/TestService.proto
3434

3535
common/rpc/TestServiceService.pb.cpp common/rpc/TestServiceService.pb.h: common/rpc/Makefile.mk common/rpc/TestService.proto protoc/ola_protoc_plugin$(EXEEXT)
36-
$(OLA_PROTOC) --cppservice_out common/rpc --proto_path $(srcdir)/common/rpc $(srcdir)/common/rpc/TestService.proto
36+
$(OLA_PROTOC) --cppservice_out $(top_builddir)/common/rpc --proto_path $(srcdir)/common/rpc $(srcdir)/common/rpc/TestService.proto
3737

3838
# TESTS
3939
##################################################

‎plugins/artnet/messages/Makefile.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ plugins_artnet_messages_libolaartnetconf_la_CXXFLAGS = $(COMMON_PROTOBUF_CXXFLAG
2424
plugins_artnet_messages_libolaartnetconf_la_LIBADD = $(libprotobuf_LIBS)
2525

2626
plugins/artnet/messages/ArtNetConfigMessages.pb.cc plugins/artnet/messages/ArtNetConfigMessages.pb.h: plugins/artnet/messages/Makefile.mk plugins/artnet/messages/ArtNetConfigMessages.proto
27-
$(PROTOC) --cpp_out plugins/artnet/messages/ --proto_path $(srcdir)/plugins/artnet/messages $(srcdir)/plugins/artnet/messages/ArtNetConfigMessages.proto
27+
$(PROTOC) --cpp_out $(top_builddir)/plugins/artnet/messages/ --proto_path $(srcdir)/plugins/artnet/messages $(srcdir)/plugins/artnet/messages/ArtNetConfigMessages.proto
2828

2929
endif
3030

‎plugins/e131/messages/Makefile.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ plugins_e131_messages_libolae131conf_la_CXXFLAGS = $(COMMON_PROTOBUF_CXXFLAGS)
2323
plugins_e131_messages_libolae131conf_la_LIBADD = $(libprotobuf_LIBS)
2424

2525
plugins/e131/messages/E131ConfigMessages.pb.cc plugins/e131/messages/E131ConfigMessages.pb.h: plugins/e131/messages/Makefile.mk plugins/e131/messages/E131ConfigMessages.proto
26-
$(PROTOC) --cpp_out plugins/e131/messages/ --proto_path $(srcdir)/plugins/e131/messages/ $(srcdir)/plugins/e131/messages/E131ConfigMessages.proto
26+
$(PROTOC) --cpp_out $(top_builddir)/plugins/e131/messages/ --proto_path $(srcdir)/plugins/e131/messages/ $(srcdir)/plugins/e131/messages/E131ConfigMessages.proto
2727

2828
endif

‎plugins/usbpro/messages/Makefile.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ plugins_usbpro_messages_libolausbproconf_la_CXXFLAGS = $(COMMON_PROTOBUF_CXXFLAG
2222
plugins_usbpro_messages_libolausbproconf_la_LIBADD = $(libprotobuf_LIBS)
2323

2424
plugins/usbpro/messages/UsbProConfigMessages.pb.cc plugins/usbpro/messages/UsbProConfigMessages.pb.h: plugins/usbpro/messages/Makefile.mk plugins/usbpro/messages/UsbProConfigMessages.proto
25-
$(PROTOC) --cpp_out plugins/usbpro/messages/ --proto_path $(srcdir)/plugins/usbpro/messages/ $(srcdir)/plugins/usbpro/messages/UsbProConfigMessages.proto
25+
$(PROTOC) --cpp_out $(top_builddir)/plugins/usbpro/messages/ --proto_path $(srcdir)/plugins/usbpro/messages/ $(srcdir)/plugins/usbpro/messages/UsbProConfigMessages.proto

‎python/ola/Makefile.mk‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@ pkgpython_PYTHON = \
3838
endif
3939

4040
python/ola/ArtNetConfigMessages_pb2.py: $(artnet_proto)
41-
$(PROTOC) --python_out python/ola/ -I $(artnet_path) $(artnet_proto)
41+
$(PROTOC) --python_out $(top_builddir)/python/ola/ -I $(artnet_path) $(artnet_proto)
4242

4343
python/ola/Ola_pb2.py: $(ola_proto)
44-
$(PROTOC) --python_out python/ola/ -I $(ola_path) $(ola_proto)
44+
$(PROTOC) --python_out $(top_builddir)/python/ola/ -I $(ola_path) $(ola_proto)
4545

4646
python/ola/Pids_pb2.py: $(pids_proto)
47-
$(PROTOC) --python_out python/ola/ -I $(pids_path) $(pids_proto)
47+
$(PROTOC) --python_out $(top_builddir)/python/ola/ -I $(pids_path) $(pids_proto)
4848

4949
python/ola/UsbProConfigMessages_pb2.py: $(usbpro_proto)
50-
$(PROTOC) --python_out python/ola/ -I $(usbpro_path) $(usbpro_proto)
50+
$(PROTOC) --python_out $(top_builddir)/python/ola/ -I $(usbpro_path) $(usbpro_proto)
5151

5252
python/ola/PidStoreLocation.py: python/ola/Makefile.mk configure.ac
53-
echo "location = '${piddatadir}'" > python/ola/PidStoreLocation.py
53+
echo "location = '${piddatadir}'" > $(top_builddir)/python/ola/PidStoreLocation.py
5454

5555
python/ola/Version.py: python/ola/Makefile.mk configure.ac config/ola_version.m4
56-
echo "version = '${VERSION}'" > python/ola/Version.py
56+
echo "version = '${VERSION}'" > $(top_builddir)/python/ola/Version.py
5757

5858
# TESTS
5959
##################################################

‎python/ola/rpc/Makefile.mk‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ built_sources += python/ola/rpc/Rpc_pb2.py
1212
endif
1313

1414
python/ola/rpc/Rpc_pb2.py: common/rpc/Rpc.proto
15-
mkdir -p python/ola/rpc
16-
$(PROTOC) --python_out python/ola/rpc -I ${top_srcdir}/common/rpc/ ${top_srcdir}/common/rpc/Rpc.proto
15+
mkdir -p $(top_builddir)/python/ola/rpc
16+
$(PROTOC) --python_out $(top_builddir)/python/ola/rpc -I ${top_srcdir}/common/rpc/ ${top_srcdir}/common/rpc/Rpc.proto
1717

1818
# TESTS
1919
##################################################
@@ -24,9 +24,9 @@ endif
2424
dist_check_SCRIPTS += python/ola/rpc/SimpleRpcControllerTest.py
2525

2626
python/ola/rpc/SimpleRpcControllerTest.sh: python/ola/rpc/Makefile.mk
27-
mkdir -p python/ola/rpc
28-
echo "export PYTHONPATH=${top_builddir}/python:${top_srcdir}/python; $(PYTHON) ${srcdir}/python/ola/rpc/SimpleRpcControllerTest.py; exit \$$?" > python/ola/rpc/SimpleRpcControllerTest.sh
29-
chmod +x python/ola/rpc/SimpleRpcControllerTest.sh
27+
mkdir -p $(top_builddir)/python/ola/rpc
28+
echo "export PYTHONPATH=${top_builddir}/python:${top_srcdir}/python; $(PYTHON) ${srcdir}/python/ola/rpc/SimpleRpcControllerTest.py; exit \$$?" > $(top_builddir)/python/ola/rpc/SimpleRpcControllerTest.sh
29+
chmod +x $(top_builddir)/python/ola/rpc/SimpleRpcControllerTest.sh
3030

3131
CLEANFILES += python/ola/rpc/SimpleRpcControllerTest.sh \
3232
python/ola/rpc/*.pyc

‎tools/ola_trigger/Makefile.mk‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ built_sources += \
4949
tools/ola_trigger/config.tab.h
5050

5151
tools/ola_trigger/lex.yy.cpp: tools/ola_trigger/Makefile.mk tools/ola_trigger/config.lex
52-
$(LEX) -otools/ola_trigger/lex.yy.cpp $(srcdir)/tools/ola_trigger/config.lex
52+
$(LEX) -o$(top_builddir)/tools/ola_trigger/lex.yy.cpp $(srcdir)/tools/ola_trigger/config.lex
5353

5454
tools/ola_trigger/config.tab.cpp tools/ola_trigger/config.tab.h: tools/ola_trigger/Makefile.mk tools/ola_trigger/config.ypp
55-
$(BISON) --defines=tools/ola_trigger/config.tab.h --output-file=tools/ola_trigger/config.tab.cpp $(srcdir)/tools/ola_trigger/config.ypp
55+
$(BISON) --defines=$(top_builddir)/tools/ola_trigger/config.tab.h --output-file=$(top_builddir)/tools/ola_trigger/config.tab.cpp $(srcdir)/tools/ola_trigger/config.ypp
5656

5757
# TESTS
5858
##################################################
@@ -73,7 +73,7 @@ tools_ola_trigger_ActionTester_LDADD = $(COMMON_TESTING_LIBS) \
7373
test_scripts += tools/ola_trigger/FileValidateTest.sh
7474

7575
tools/ola_trigger/FileValidateTest.sh: tools/ola_trigger/Makefile.mk
76-
echo "for FILE in ${srcdir}/tools/ola_trigger/example.conf ${srcdir}/tools/ola_trigger/test_file.conf ${srcdir}/tools/ola_trigger/contrib/mac_volume.conf ${srcdir}/tools/ola_trigger/contrib/mac_itunes.conf ${srcdir}/tools/ola_trigger/contrib/philips_hue_osram_lightify.conf; do echo \"Checking \$$FILE\"; ${top_builddir}/tools/ola_trigger/ola_trigger${EXEEXT} --validate \$$FILE; STATUS=\$$?; if [ \$$STATUS -ne 0 ]; then echo \"FAIL: \$$FILE caused ola_trigger to exit with status \$$STATUS\"; exit \$$STATUS; fi; done; exit 0" > tools/ola_trigger/FileValidateTest.sh
77-
chmod +x tools/ola_trigger/FileValidateTest.sh
76+
echo "for FILE in ${srcdir}/tools/ola_trigger/example.conf ${srcdir}/tools/ola_trigger/test_file.conf ${srcdir}/tools/ola_trigger/contrib/mac_volume.conf ${srcdir}/tools/ola_trigger/contrib/mac_itunes.conf ${srcdir}/tools/ola_trigger/contrib/philips_hue_osram_lightify.conf; do echo \"Checking \$$FILE\"; ${top_builddir}/tools/ola_trigger/ola_trigger${EXEEXT} --validate \$$FILE; STATUS=\$$?; if [ \$$STATUS -ne 0 ]; then echo \"FAIL: \$$FILE caused ola_trigger to exit with status \$$STATUS\"; exit \$$STATUS; fi; done; exit 0" > $(top_builddir)/tools/ola_trigger/FileValidateTest.sh
77+
chmod +x $(top_builddir)/tools/ola_trigger/FileValidateTest.sh
7878

7979
CLEANFILES += tools/ola_trigger/FileValidateTest.sh

0 commit comments

Comments
 (0)