X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2FMakefile.am;h=db5aaaecc458eb2101f8e2884dd636eb79824492;hb=66e451b5af762b7caec7ed1b5ba2e668580ce362;hp=1295e32926c1b1aa8cf8351780ad50bb6b7427aa;hpb=528a7cab1f4ff035914ac05011bc1bfbd273081b;p=vlc diff --git a/bin/Makefile.am b/bin/Makefile.am index 1295e32926..db5aaaecc4 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -24,20 +24,21 @@ endif vlc_wrapper_SOURCES = rootwrap.c -vlc_DEPENDENCIES = ../src/libvlc.la - +vlc_DEPENDENCIES = ../src/libvlc.sym 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_LDADD = ../src/libvlc.la `$(VLC_CONFIG) -libs vlc` vlc_static_SOURCES = $(vlc_SOURCES) +vlc_static_CFLAGS = $(AM_CFLAGS) \ + -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" \ + -DTOP_SRCDIR=\"$$(cd "$(top_srcdir)"; pwd)\" \ + $(NULL) 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) +vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT) vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT) endif