Commit 07e87b93 authored by Sam Hocevar's avatar Sam Hocevar

* src/Makefile.am: made the dist rule independent of --enable-libtool.

parent 40c5adff
...@@ -157,7 +157,7 @@ libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc` ...@@ -157,7 +157,7 @@ libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc` libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc` libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\(modules\/[^ ]*\)\.a /\1_builtin.la /g'` \ libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\(modules\/[^ ]*\)\.a /\1_builtin.la /g'` \
-avoid-version -no-undefined -avoid-version -no-undefined -shrext $(LIBEXT).0d
libvlc_la_DEPENDENCIES = stamp-builtins libvlc_la_DEPENDENCIES = stamp-builtins
...@@ -348,16 +348,10 @@ SOURCES_libvlc = \ ...@@ -348,16 +348,10 @@ SOURCES_libvlc = \
$(OPT_SOURCES_libvlc_getopt) \ $(OPT_SOURCES_libvlc_getopt) \
$(NULL) $(NULL)
if !USE_LIBTOOL if !USE_LIBTOOL
if !BUILD_SHARED if !BUILD_SHARED
SOURCES_libvlc += misc/version.c SOURCES_libvlc += misc/version.c
CLEANFILES += misc/version.c CLEANFILES += misc/version.c
misc/version.c: FORCE
$(TOOLBOX) --update-version
FORCE:
endif endif
# Install shared libvlc # Install shared libvlc
...@@ -369,6 +363,9 @@ uninstall-local: ...@@ -369,6 +363,9 @@ uninstall-local:
test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)" test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
endif endif
misc/version.c: FORCE
$(TOOLBOX) --update-version
############################################################################### ###############################################################################
# Stamp rules # Stamp rules
############################################################################### ###############################################################################
...@@ -395,3 +392,4 @@ test_url_LDADD = libvlc.la ...@@ -395,3 +392,4 @@ test_url_LDADD = libvlc.la
test_url_CFLAGS = $(CFLAGS_tests) test_url_CFLAGS = $(CFLAGS_tests)
endif endif
FORCE:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment