X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2FMakefile.am;h=debbc23f8b22dc8bab3c24cf7c5c69d0c24461d7;hb=48be35499d7545a31a160c7578ffa073f761e814;hp=dfeaee26acfc41279e8166012c95ec257c74a053;hpb=19bed424e1bc4756ae6593e2352b6edd127cefa1;p=vlc diff --git a/bin/Makefile.am b/bin/Makefile.am index dfeaee26ac..debbc23f8b 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -14,7 +14,7 @@ AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc` if !HAVE_WIN32 if !HAVE_WINCE bin_PROGRAMS += vlc-wrapper -vlc_SOURCES = vlc.c +vlc_SOURCES = vlc.c override.c endif endif @@ -46,16 +46,19 @@ vlc_static_LDFLAGS = $(vlc_LDFLAGS) -no-install -static if HAVE_WIN32 vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT) vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT) +else +vlc_LDADD += $(LIBDL) endif -.rc.in.rc: $(top_builddir)/config.status +vlc_win32_rc.rc: $(top_builddir)/config.status vlc_win32_rc.rc.in cd "$(top_builddir)" && \ $(SHELL) ./config.status --file="bin/$@" vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc - $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@ + $(WINDRES) --include-dir $(top_srcdir)/share/icons -i $< -o $@ vlc_cache_gen_SOURCES = cachegen.c vlc_cache_gen_LDADD = \ + $(GNUGETOPT_LIBS) \ ../compat/libcompat.la \ ../src/libvlc.la ../src/libvlccore.la