[vlc-commits] [Git][videolan/vlc][master] 4 commits: Makefile.am: build doc after src and lib

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
252bba79 by Thomas Guillem at 2024-02-02T09:37:42+00:00
Makefile.am: build doc after src and lib

In order to build samples code that depend on Core and LibVLC.

- - - - -
b285ba6d by Thomas Guillem at 2024-02-02T09:37:42+00:00
doc: build some libvlc samples

Assure that these samples can always build.

- - - - -
1da6898e by Thomas Guillem at 2024-02-02T09:37:42+00:00
doc: fix unused warning in example.c

- - - - -
a8a57ba8 by Thomas Guillem at 2024-02-02T09:37:42+00:00
doc: rename vlc-thumb.c

- - - - -


5 changed files:

- Makefile.am
- doc/Makefile.am
- doc/libvlc/example.c
- doc/libvlc/vlc-thumb.c → doc/libvlc/thumbnailer.c
- doc/libvlc/vlc-thumb.thumbnailer → doc/libvlc/vlc.thumbnailer


Changes:

=====================================
Makefile.am
=====================================
@@ -6,7 +6,7 @@
 # something. DIST_SUBDIRS stores the directories where nothing is built but
 # which have makefiles with distribution information.
 #  - src (libvlccore) is nedeed by modules
-SUBDIRS = compat doc po share src modules lib bin test
+SUBDIRS = compat po share src modules lib doc bin test
 DIST_SUBDIRS = m4 $(SUBDIRS)
 
 EXTRA_DIST = \


=====================================
doc/Makefile.am
=====================================
@@ -11,7 +11,7 @@ LIBVLC_SAMPLES = \
 	libvlc/QtGL/qtvlcwidget.cpp \
 	libvlc/QtGL/qtvlcwidget.h \
 	libvlc/QtGL/QtGl.pro \
-	libvlc/vlc-thumb.c \
+	libvlc/thumbnailer.c \
 	libvlc/wx_player.cpp \
 	libvlc/d3d11_player.cpp \
 	libvlc/d3d9_player.c \
@@ -20,6 +20,18 @@ LIBVLC_SAMPLES = \
 	libvlc/appkit_player.m \
 	$(NULL)
 
+# Check that samples that depends only on LibVLC can build
+AUTOMAKE_OPTIONS = subdir-objects
+AM_LDFLAGS = -no-install $(LDFLAGS_vlc) -L../src/ -lvlccore -L../lib -lvlc
+
+samples_libvlc_example_SOURCES = libvlc/example.c
+samples_libvlc_thumbnailer_SOURCES = libvlc/thumbnailer.c
+
+check_PROGRAMS = \
+	samples_libvlc_example \
+	samples_libvlc_thumbnailer \
+	$(NULL)
+
 nobase_doc_DATA = $(LIBVLC_SAMPLES)
 
 doc_DATA = \


=====================================
doc/libvlc/example.c
=====================================
@@ -9,6 +9,7 @@
 
 int main(int argc, char* argv[])
 {
+    (void) argc; (void) argv;
     libvlc_instance_t * inst;
     libvlc_media_player_t *mp;
     libvlc_media_t *m;


=====================================
doc/libvlc/vlc-thumb.c → doc/libvlc/thumbnailer.c
=====================================
@@ -6,7 +6,7 @@
    gcc -pedantic -Wall -Werror -Wextra `pkg-config --cflags --libs libvlc` -lpthread
 
   # to register the thumbnailer on gnome 3.x:
-  cp vlc-thumb.thumbnailer /usr/share/thumbnailers
+  cp thumb.thumbnailer /usr/share/thumbnailers
 
   # to register the thumbnailer on gnome 2.x:
   list=`grep ^Mime vlc.desktop|cut -d= -f2-|sed -e s/";"/\\\n/g -e s,/,@,g`


=====================================
doc/libvlc/vlc-thumb.thumbnailer → doc/libvlc/vlc.thumbnailer
=====================================



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/073ed9d4d46146c6edaf3d232b8d5248835f4020...a8a57ba8c4a9b9cd717be22ad18c23e5db5aafde

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


VideoLAN code repository instance