Move src/control/ to lib/

[vlc] / bin / Makefile.am

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 2bb42944ff6e31f984e436cc0a7643f36eb20a1d..7c40a971b19931add70af65d73ccf6f35a786166 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -8,13 +8,14 @@ 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_WIN32
 if !HAVE_WINCE
 bin_PROGRAMS += vlc-wrapper
-vlc_SOURCES = vlc.c
+vlc_SOURCES = vlc.c override.c
 endif
 endif
 
@@ -30,9 +31,8 @@ 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)
+vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la $(LIBS_vlc)
 
 vlc_static_SOURCES = $(vlc_SOURCES)
 vlc_static_CFLAGS = $(AM_CFLAGS) \
@@ -41,22 +41,30 @@ vlc_static_CFLAGS = $(AM_CFLAGS) \
        $(NULL)
 vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES)
 vlc_static_LDADD = $(vlc_LDADD)
-vlc_static_LDFLAGS = $(vlc_LDFLAGS) -no-install -static
+vlc_static_LDFLAGS = $(vlc_LDFLAGS)
 
 if HAVE_WIN32
 vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT)
-vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT)
+vlc_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
+else
+vlc_LDADD += $(LIBDL)
+vlc_static_LDFLAGS += -no-install -static
 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
+if HAVE_WIN32
+vlc_cache_gen_LDADD += vlc_win32_rc.$(OBJEXT)
+vlc_cache_gen_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
+endif
+