Build a separate non-installable VLC for easier debugging

diff --git a/Makefile.am b/Makefile.am
index 44b4caee545b97a7c3dbe38f7603ac72c3a690ea..184326be7b3118fe69d352063809ccf72a5b0340 100644 (file)
--- 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 33491a7a4c35d5bd946a3fccbb7d6c58baefdda0..9e61d3470e27bb48458acadd553b9ec59ab728dd 100644 (file)
--- 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)