Commit 9a4101d7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

More vlc to src/ (yes, I know this screws up things).

If you packaged without staged installation you're going to have a problem (but packaging without staged installation is to utterly lame in the first place)
parent 0d4b0871
......@@ -245,51 +245,16 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
# Don't use it if you don't know what it is about.
# Don't complain if it doesn't work. -- Courmisch
libvlc:
cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
cd src && $(MAKE) $(AM_MAKEFLAGS) src/libvlc.la
.PHONY: libvlc
###############################################################################
# Building vlc
###############################################################################
bin_PROGRAMS = vlc
vlc_SOURCES = src/vlc.c
# Ugly kludge so that automake defines $(CXXLINK)
nodist_EXTRA_vlc_SOURCES = extras/analyser/zsh.cpp src/misc/darwin_specific.c
vlc_DEPENDENCIES = $(DATA_win32_rc)
vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
if !HAVE_PLUGINS
vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'`
endif
core: libvlc vlc$(EXEEXT)
vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
LIB_libvlc = libvlc.la
LIBVLC = src/$(LIB_libvlc)
.PHONY: libvlc core
#To get some nice output
nice:
$(top_builddir)/compile
core: libvlc vlc$(EXEEXT)
.PHONY: core
vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
@rm -f vlc$(EXEEXT)
@case `$(VLC_CONFIG) --linkage vlc builtin` in \
c++) cmd="$(CXXLINK)" ;; \
objc) cmd="$(OBJCLINK)" ;; \
c|*) cmd="$(LINK)" ;; \
esac ; \
cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
echo $$cmd ; \
eval $$cmd
if HAVE_BEOS
noinst_DATA = vlc-bundle
vlc-bundle: vlc
......@@ -616,15 +581,6 @@ VLC.app: vlc
printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo
endif
if HAVE_WIN32
DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA)
noinst_share_vlc_win32_rc_DATA = share/vlc_win32_rc.$(OBJEXT)
noinst_share_vlc_win32_rcdir = $(libdir)
share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc
$(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir)/share -i $< -o $@
endif
###############################################################################
# Building architecture-specific binary packages
###############################################################################
......
......@@ -129,6 +129,7 @@ modules/modules.c: modules/builtin.h
grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2- | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp"
echo ";" >> "$@.tmp"
mv -f -- "$@.tmp" "$@"
###############################################################################
# Building libvlc
###############################################################################
......@@ -372,6 +373,39 @@ misc/revision.c:
echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
mv -f $@.tmp $@
###############################################################################
# Building vlc
###############################################################################
bin_PROGRAMS = vlc
#
vlc_SOURCES = vlc.c
vlc_DEPENDENCIES = $(DATA_win32_rc)
vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
vlc_LDADD = $(DATA_win32_rc) libvlc.la $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
@rm -f vlc$(EXEEXT)
@case `$(VLC_CONFIG) --linkage vlc builtin` in \
c++) cmd="$(CXXLINK)" ;; \
objc) cmd="$(OBJCLINK)" ;; \
c|*) cmd="$(LINK)" ;; \
esac ; \
cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
echo $$cmd ; \
eval $$cmd
if HAVE_WIN32
DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA)
noinst_DATA = vlc_win32_rc.$(OBJEXT)
vlc_win32_rc.$(OBJEXT): $(top_srcdir)/share/vlc_win32_rc.rc
$(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir)/share -i $< -o $@
endif
###############################################################################
# Unit/regression test
###############################################################################
......
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