X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2FMakefile.am;h=4a8e555ce245c1770322b2e4f8b8be7983b087de;hb=e378fa45a71b83dfea4a7955fda520a50a747b1b;hp=06c5d3b4f03b01d91aaa84806407a022db687e94;hpb=e33be977f4e19b298c7805bca6204fb5720ff7c8;p=vlc

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 06c5d3b4f0..4a8e555ce2 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -11,29 +11,26 @@ SUFFIXES = .rc.in .rc
 
 AM_CPPFLAGS = $(CPPFLAGS_vlc)
 AM_CFLAGS = $(CFLAGS_vlc)
-
+if HAVE_DBUS
+AM_CPPFLAGS += -DHAVE_DBUS
+endif
 
 if !HAVE_WIN32
-if !HAVE_WINCE
 bin_PROGRAMS += vlc-wrapper
 vlc_SOURCES = vlc.c override.c
 endif
-endif
 
 EXTRA_vlc_SOURCES = vlc.c winvlc.c
 if HAVE_WIN32
 vlc_SOURCES = winvlc.c
 noinst_DATA += vlc_win32_rc.rc
 endif
-if HAVE_WINCE
-vlc_SOURCES = winvlc.c
-endif
 
 vlc_wrapper_SOURCES = rootwrap.c
 vlc_wrapper_LDADD = $(SOCKET_LIBS)
 
 vlc_LDFLAGS = $(LDFLAGS_vlc)
-vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la $(LIBS_vlc)
+vlc_LDADD = ../lib/libvlc.la $(LIBPTHREAD)
 
 vlc_static_SOURCES = $(vlc_SOURCES)
 vlc_static_CFLAGS = $(AM_CFLAGS) \
@@ -45,7 +42,7 @@ vlc_static_LDADD = $(vlc_LDADD)
 vlc_static_LDFLAGS = $(vlc_LDFLAGS)
 
 if HAVE_WIN32
-vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT)
+vlc_LDADD += -lpsapi -lwininet vlc_win32_rc.$(OBJEXT)
 vlc_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
 else
 vlc_LDADD += $(LIBDL)
@@ -57,13 +54,13 @@ vlc_win32_rc.rc: $(top_builddir)/config.status vlc_win32_rc.rc.in
 	$(SHELL) ./config.status --file="bin/$@"
 
 vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc
-	$(WINDRES) --include-dir $(top_srcdir)/share/icons -i $< -o $@
+	$(WINDRES) --include-dir $(top_srcdir)/share/icons --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@
 
 vlc_cache_gen_SOURCES = cachegen.c
 vlc_cache_gen_LDADD = \
 	$(GNUGETOPT_LIBS) \
 	../compat/libcompat.la \
-	../src/libvlc.la ../src/libvlccore.la
+	../lib/libvlc.la
 if HAVE_WIN32
 vlc_cache_gen_LDADD += vlc_win32_rc.$(OBJEXT)
 vlc_cache_gen_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
@@ -84,12 +81,3 @@ MOSTLYCLEANFILES = $(noinst_DATA)
 	else \
 		echo "Cross-compilation: cache generation skipped!" ; \
 	fi
-
-install-exec-hook:
-	if test "$(build)" = "$(host)"; then \
-		LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
-		"$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
-			 "$(DESTDIR)$(vlclibdir)/plugins" ; \
-	else \
-		echo "Cross-compilation: cache generation skipped!" ; \
-	fi