Update lame. Closes #482

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cbf9375d684630d040323851d9304eacfa19f4ae..5b17ff2bcb6ddf38e95f10dd87f15d9dfaa772c3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -200,44 +200,55 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
 # Building vlc
 ###############################################################################
 
-.PHONY: libvlc
-
-# Shortcut for developpers to rebuild the core (libvlc + vlc)
-# Don't use it if you don't know what it is about.
-# Don't complain if it doesn't work. -- Courmisch
-core: libvlc vlc$(EXEEXT)
-
-libvlc:
-       cd src && $(MAKE) all
-
 bin_PROGRAMS = vlc
 
-vlc_SOURCES = src/vlc.c
+vlc_SOURCES = vlc.c
 # Ugly kludge so that automake defines $(CXXLINK)
 EXTRA_vlc_SOURCES = extras/zsh.cpp
 
 # Work around a bug in the arm-wince-pe linker
 if HAVE_WINCE
-vlc_WORKAROUNDLDFLAGS = $(LIB_libvlc)
+vlc_WORKAROUNDLDFLAGS = $(LIBVLC)
 endif
 
-vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-vlc_LDFLAGS = $(LDFLAGS_libvlc) $(vlc_WORKAROUNDLDFLAGS)
-vlc_LDADD = $(DATA_win32_rc) $(INCLUDED_LIBINTL)
-
 # We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
 # old automake-1.5 bug (automake/279).
-DEPENDENCIES_vlc = $(LIB_libvlc) $(DATA_win32_rc)
+DEPENDENCIES_vlc = src/$(LIB_libvlc) $(DATA_win32_rc)
 
+vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+if USE_LIBTOOL
+vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
+LIB_libvlc = libvlc.la
+LIBVLC = src/$(LIB_libvlc)
+else
 if BUILD_SHARED
-vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -Lsrc -lvlc
-LIB_libvlc = src/libvlc$(LIBEXT)
+vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc
+if HAVE_WIN32
+LIB_libvlc = libvlc.dll.a
+else
+LIB_libvlc = libvlc$(LIBEXT)
+endif
+LIBVLC =
 else
-vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc builtin`
-vlc_LDADD += $(LIB_libvlc)
-LIB_libvlc = src/libvlc.a
+vlc_LDFLAGS = $(vlc_WORKAROUNDLFDLAGS) `$(VLC_CONFIG) --libs vlc builtin`
+LIB_libvlc = libvlc.a
+LIBVLC = src/$(LIB_libvlc)
 DEPENDENCIES_vlc += stamp-builtin
 endif
+endif
+vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(INCLUDED_LIBINTL)
+
+# Shortcut for developpers to rebuild the core (libvlc + vlc)
+# Don't use it if you don't know what it is about.
+# Don't complain if it doesn't work. -- Courmisch
+core:
+       rm -f src/$(LIB_libvlc)
+       $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+
+.PHONY: core
+
+src/$(LIB_libvlc):
+       cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
 
 vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
        @rm -f vlc$(EXEEXT)
@@ -246,7 +257,7 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
          objc) cmd="$(OBJCLINK)" ;; \
          c|*) cmd="$(LINK)" ;; \
        esac ; \
-       cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS)" ; \
+       cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
        echo $$cmd ; \
        eval $$cmd
 
@@ -276,7 +287,7 @@ vlc-bundle: vlc
        find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
 endif
 
-# Install the symlinks and shared libvlc
+# Install the symlinks
 install-exec-local:
        for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
          rm -f "$(DESTDIR)$(bindir)/$$i" && \
@@ -654,7 +665,7 @@ package-win32-base: package-win32-base-debug
          do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
 
 
-package-win32-base-exe:
+package-win32-base-exe: package-win32-base
 # Create package
        if makensis -VERSION >/dev/null 2>&1; then \
            MAKENSIS="makensis -DVERSION=${VERSION}"; \
@@ -674,7 +685,7 @@ package-win32-base-exe-linux:
 # Create package
        makensis -DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
 
-package-win32-base-zip:
+package-win32-base-zip: package-win32-base
 # Create package 
        zip -r vlc-${VERSION}-win32.zip vlc-${VERSION}
 
@@ -686,11 +697,11 @@ package-win32-exe-linux: package-win32-base package-win32-base-exe-linux
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}
 
-package-win32-zip: package-win32-base package-win32-base-zip
+package-win32-zip: package-win32-base-zip
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}
 
-package-win32: package-win32-base package-win32-base-exe package-win32-base-zip
+package-win32: package-win32-base-exe package-win32-base-zip
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}