From fae0cf510dec7d86e4b8d0dc6f8a56d14c766475 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 31 Aug 2008 13:06:04 +0300 Subject: [PATCH] Build a separate non-installable VLC for easier debugging --- Makefile.am | 2 +- bin/Makefile.am | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 44b4caee54..184326be7b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -392,7 +392,7 @@ endif vlc$(EXEEXT): Makefile.am rm -f -- vlc 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 mv -f -- vlc.tmp vlc diff --git a/bin/Makefile.am b/bin/Makefile.am index 33491a7a4c..9e61d3470e 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,8 +1,12 @@ # Building vlc # bin_PROGRAMS = vlc +noinst_PROGRAMS = vlc-static EXTRA_PROGRAMS = vlc-wrapper +AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc` + + if !HAVE_WIN32 bin_PROGRAMS += vlc-wrapper endif @@ -17,14 +21,15 @@ vlc_wrapper_SOURCES = rootwrap.c vlc_DEPENDENCIES = ../src/libvlc.la -vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc` # vlc needs libvlccore for locale conversion vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la $(LTLIBINTL) \ `$(VLC_CONFIG) -libs vlc` -#vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES) -# $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) +vlc_static_SOURCES = $(vlc_SOURCES) +vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES) +vlc_static_LDADD = $(vlc_LDADD) +vlc_static_LDFLAGS = $(vlc_LDFLAGS) -no-install -static if HAVE_WIN32 vlc_LDADD += vlc_win32_rc.$(OBJEXT) -- 2.39.2