Commit 7cc05363 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Try to unbreak dependency

(of course, it was obvious reverting the earlier fix would break it,
 but some people don't seem to care about the build system as long as
 "their" feature works).
Oh, and don't let version.c twice in CLEANFILES.
parent 1b75ee7b
...@@ -11,7 +11,7 @@ EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in ...@@ -11,7 +11,7 @@ EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in
BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES) BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES)
DISTCLEANFILES = stamp-api libvlc.sym DISTCLEANFILES = stamp-api libvlc.sym
CLEANFILES = misc/modules_builtin.h misc/version.c CLEANFILES = misc/modules_builtin.h
MOSTLYCLEANFILES = $(DATA_noinst_libvlc) stamp-builtins MOSTLYCLEANFILES = $(DATA_noinst_libvlc) stamp-builtins
TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
...@@ -141,13 +141,12 @@ endif ...@@ -141,13 +141,12 @@ endif
############################################################################### ###############################################################################
libvlc_a_SOURCES = $(SOURCES_libvlc) libvlc_a_SOURCES = $(SOURCES_libvlc)
nodist_libvlc_a_SOURCES = $(SOURCES_nodist_libvlc) nodist_libvlc_a_SOURCES = misc/version.c
libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic` -DUSE_BUILTINS libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic` -DUSE_BUILTINS
libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic` libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic` libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
libvlc_la_SOURCES = $(SOURCES_libvlc) libvlc_la_SOURCES = $(SOURCES_libvlc)
nodist_libvlc_la_SOURCES = $(SOURCES_nodist_libvlc)
libvlc_la_LIBADD = $(INCLUDED_LIBINTL) libvlc_la_LIBADD = $(INCLUDED_LIBINTL)
libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc` libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc` libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
...@@ -356,7 +355,6 @@ SOURCES_libvlc = \ ...@@ -356,7 +355,6 @@ SOURCES_libvlc = \
if !USE_LIBTOOL if !USE_LIBTOOL
if !BUILD_SHARED if !BUILD_SHARED
SOURCES_nodist_libvlc = misc/version.c
CLEANFILES += misc/version.c CLEANFILES += misc/version.c
endif endif
......
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