Commit fae0cf51 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Build a separate non-installable VLC for easier debugging

parent 138c463b
...@@ -392,7 +392,7 @@ endif ...@@ -392,7 +392,7 @@ endif
vlc$(EXEEXT): Makefile.am vlc$(EXEEXT): Makefile.am
rm -f -- vlc vlc.tmp rm -f -- vlc vlc.tmp
echo '#! /bin/sh' > vlc.tmp echo '#! /bin/sh' > vlc.tmp
echo 'exec "$$(dirname "$$0")/bin/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp echo 'exec "$$(dirname "$$0")/bin/vlc-static$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
chmod +x vlc.tmp chmod +x vlc.tmp
mv -f -- vlc.tmp vlc mv -f -- vlc.tmp vlc
......
# Building vlc # Building vlc
# #
bin_PROGRAMS = vlc bin_PROGRAMS = vlc
noinst_PROGRAMS = vlc-static
EXTRA_PROGRAMS = vlc-wrapper EXTRA_PROGRAMS = vlc-wrapper
AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
if !HAVE_WIN32 if !HAVE_WIN32
bin_PROGRAMS += vlc-wrapper bin_PROGRAMS += vlc-wrapper
endif endif
...@@ -17,14 +21,15 @@ vlc_wrapper_SOURCES = rootwrap.c ...@@ -17,14 +21,15 @@ vlc_wrapper_SOURCES = rootwrap.c
vlc_DEPENDENCIES = ../src/libvlc.la vlc_DEPENDENCIES = ../src/libvlc.la
vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc` vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
# vlc needs libvlccore for locale conversion # vlc needs libvlccore for locale conversion
vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la $(LTLIBINTL) \ vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la $(LTLIBINTL) \
`$(VLC_CONFIG) -libs vlc` `$(VLC_CONFIG) -libs vlc`
#vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES) vlc_static_SOURCES = $(vlc_SOURCES)
# $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES)
vlc_static_LDADD = $(vlc_LDADD)
vlc_static_LDFLAGS = $(vlc_LDFLAGS) -no-install -static
if HAVE_WIN32 if HAVE_WIN32
vlc_LDADD += vlc_win32_rc.$(OBJEXT) vlc_LDADD += vlc_win32_rc.$(OBJEXT)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment