[vlc-commits] [Git][videolan/vlc][master] 2 commits: chromecast: simplify the generated protobuf code dependencies

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
663065df by Steve Lhomme at 2022-11-19T08:33:21+00:00
chromecast: simplify the generated protobuf code dependencies

- build only the .pb.cc file, the .pb.h file will be generated at the same time
  so will not need a build rule when it's time to build it, as long as it needs the
  .pb.cc to be build before.
- don't use a dummy .chromecast_proto which was used to group the .pb.cc and .pb.h
  we just generate the .pb.cc. The .pb.h is just a by-product.

Now the .pb.cc is directly tied to the cast_channel.proto files changes and the
PROTOBUF_VERSION value changes.

- - - - -
dd9e8538 by Alexandre Janniaux at 2022-11-19T08:33:21+00:00
chromecast: setup silent Makefile.am rules

Setup silent rules so that the mkdir/protoc calls are not exposed by
default, and the generated files needed for the build are correctly
signaled to the user.

- - - - -


1 changed file:

- modules/stream_out/Makefile.am


Changes:

=====================================
modules/stream_out/Makefile.am
=====================================
@@ -113,12 +113,11 @@ sout_LTLIBRARIES += $(LTLIBstream_out_chromaprint)
 # Chromecast plugin
 SUFFIXES += .proto .pb.cc
 
-.chromecast_proto: stream_out/chromecast/cast_channel.proto
-	mkdir -p stream_out/chromecast/@PROTOBUF_VERSION@
-	$(PROTOC) --cpp_out=stream_out/chromecast/@PROTOBUF_VERSION@ -I$(srcdir)/stream_out/chromecast $<
-	touch $@
+stream_out/chromecast/@PROTOBUF_VERSION@/cast_channel.pb.cc: stream_out/chromecast/cast_channel.proto
+	$(AM_V_at)mkdir -p stream_out/chromecast/@PROTOBUF_VERSION@
+	$(AM_V_GEN)$(PROTOC) --cpp_out=stream_out/chromecast/@PROTOBUF_VERSION@ -I$(srcdir)/stream_out/chromecast $<
 
-stream_out/chromecast/@PROTOBUF_VERSION@/cast_channel.pb.h stream_out/chromecast/@PROTOBUF_VERSION@/cast_channel.pb.cc: .chromecast_proto
+stream_out/chromecast/@PROTOBUF_VERSION@/cast_channel.pb.h: stream_out/chromecast/@PROTOBUF_VERSION@/cast_channel.pb.cc
 
 libdemux_chromecast_plugin_la_SOURCES = stream_out/chromecast/chromecast_demux.cpp stream_out/chromecast/chromecast.h \
                                         stream_out/chromecast/chromecast_common.h



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a0b3c43815328dd5e73485f912ee2fb9e46bfb4a...dd9e8538147378eeaeb6442205d8a7db171b7488

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a0b3c43815328dd5e73485f912ee2fb9e46bfb4a...dd9e8538147378eeaeb6442205d8a7db171b7488
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance