X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2FMakefile.am;h=ad3967ea6305ef528444d9625453aef1364805ae;hb=77befcece5c552996e9337e5ea900afab48d9718;hp=1ef61e73f9ac2bdf69d93958456a596213d38807;hpb=7a7630a19c21ad53258ed1a8e39dfae1efcdb160;p=vlc

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 1ef61e73f9..ad3967ea63 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -2,37 +2,41 @@
 #
 bin_PROGRAMS = vlc
 noinst_PROGRAMS = vlc-static
+noinst_DATA =
 vlclib_PROGRAMS = vlc-cache-gen
 EXTRA_PROGRAMS = vlc-wrapper
 EXTRA_DIST = vlc_win32_rc.rc.in
 
 SUFFIXES = .rc.in .rc
 
-AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-
+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
+EXTRA_vlc_SOURCES = vlc.c winvlc.c darwinvlc.c
 if HAVE_WIN32
 vlc_SOURCES = winvlc.c
-noinst_DATA = vlc_win32_rc.rc
+noinst_DATA += vlc_win32_rc.rc
 endif
-if HAVE_WINCE
-vlc_SOURCES = winvlc.c
+if HAVE_DARWIN
+vlc_SOURCES = darwinvlc.c override.c
 endif
 
 vlc_wrapper_SOURCES = rootwrap.c
 vlc_wrapper_LDADD = $(SOCKET_LIBS)
 
-vlc_DEPENDENCIES = ../src/libvlc.sym
-vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
-vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la `$(VLC_CONFIG) -libs vlc`
+vlc_LDFLAGS = $(LDFLAGS_vlc)
+if HAVE_DARWIN
+vlc_LDFLAGS += -Wl,-framework,CoreFoundation
+endif
+vlc_LDADD = ../lib/libvlc.la $(LIBPTHREAD)
 
 vlc_static_SOURCES = $(vlc_SOURCES)
 vlc_static_CFLAGS = $(AM_CFLAGS) \
@@ -44,11 +48,11 @@ vlc_static_LDADD = $(vlc_LDADD)
 vlc_static_LDFLAGS = $(vlc_LDFLAGS)
 
 if HAVE_WIN32
-vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT)
-vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT)
+vlc_LDADD += -lpsapi -lwininet vlc_win32_rc.$(OBJEXT)
+vlc_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
 else
 vlc_LDADD += $(LIBDL)
-vlc_LDFLAGS += -no-install -static
+vlc_static_LDFLAGS += -no-install -static
 endif
 
 vlc_win32_rc.rc: $(top_builddir)/config.status vlc_win32_rc.rc.in
@@ -56,15 +60,30 @@ 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)
 endif
 
+#
+# Plug-ins cache
+#
+noinst_DATA += ../modules/plugins.dat
+MOSTLYCLEANFILES = $(noinst_DATA)
+
+.PHONY: ../modules/plugins.dat
+
+../modules/plugins.dat: vlc-cache-gen$(EXEEXT)
+	$(AM_V_at)rm -f ../modules/plugins.dat
+	$(AM_V_GEN)if test "$(build)" = "$(host)"; then \
+		./vlc-cache-gen$(EXEEXT) ../modules ; \
+	else \
+		echo "Cross-compilation: cache generation skipped!" ; \
+	fi