# - libs/* are needed by modules
SUBDIRS = po libs/loader libs/srtp src modules \
projects/mozilla bindings projects/activex share doc
-DIST_SUBDIRS = $(SUBDIRS) extras/buildsystem/autotools/m4 extras/package/ipkg
+DIST_SUBDIRS = $(SUBDIRS) m4 extras/package/ipkg
EXTRA_DIST = \
HACKING \
1.9 \
-Wall \
check-news \
- std-options \
dist-bzip2 \
no-dist-gzip
+# std-options
###############################################################################
# MacOS X project
# Various utilities ( editor syntax files, D-Bus controller ... )
##############################################################################
EXTRA_DIST += \
- extras/analyser/Makefile \
+ extras/analyser/zsh_completion.sh \
extras/analyser/zsh.cpp \
extras/analyser/emacs.init \
extras/analyser/vlc.vim \
# 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) libvlc.la
-.PHONY: libvlc
+core:
+ cd src && $(MAKE) $(AM_MAKEFLAGS) vlc
-###############################################################################
-# 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
-
-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
ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
bin_SCRIPTS += $(ALIASES)
+CLEANFILES += $(ALIASES)
+if BUILD_VLC
EXTRA_SCRIPTS = $(ALL_ALIASES)
+endif
dist_noinst_SCRIPTS += make-alias
nvlc: make-alias
$(MKALIAS) ncurses
+if BUILD_VLC
+noinst_SCRIPTS = vlc$(EXEEXT)
+endif
+
+vlc$(EXEEXT): core
+ rm -f vlc$(EXEEXT)
+ ln -s src/vlc$(EXEEXT)
+# rm -f -- vlc vlc.tmp
+# echo '#! /bin/sh' > vlc.tmp
+# echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
+# chmod +x vlc.tmp
+# mv -f -- vlc.tmp vlc
+
if HAVE_DARWIN
# Create the MacOS X app
+if BUILD_VLC
noinst_DATA = VLC.app
+endif
# VLC-release.app is the old VLC.app target
VLC-release.app: vlc
( cd src && make install )
- then rm -Rf "$(top_builddir)/tmp"
+ rm -Rf "$(top_builddir)/tmp"
mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
rm -Rf $(top_builddir)/VLC-release.app
- cp -R $(srcdir)/extras/package/macosx/vlc.xcodeproj $(top_builddir)/tmp/extras/package/macosx/
- cp -R $(srcdir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx
- for i in AUTHORS COPYING extras/package/macosx/README.MacOSX.rtf THANKS; do \
+ for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
+ done
+ for i in AUTHORS COPYING THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done
mkdir -p $(top_builddir)/tmp/modules/audio_output
prefs_widgets.m \
prefs.h \
prefs.m \
+ simple_prefs.h \
+ simple_prefs.m \
vout.h \
voutqt.m \
voutgl.m \
$(top_builddir)/tmp/modules/gui/macosx; \
done
cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
- cd ../../../ && \
+ cd ../../../../ && \
cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
$(top_builddir)/VLC-release.app; \
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
- ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/extras/package/macosx/Framework/Pre-Compile.sh
+ ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist
for i in $(srcdir)/share/luaplaylist/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \
$(INSTALL) -m 644 $(srcdir)/share/http-lua/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/.hosts
for i in $(srcdir)/share/http-lua/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http-lua/dialogs/* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http-lua/js/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http-lua/old/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http-lua/old/admin/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http-lua/old/vlm/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http-lua/images/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http-lua/requests/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/`basename $${i}` ; \
- done ; \
+ done
$(INSTALL) -m 644 $(srcdir)/share/http-lua/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/readme.txt
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js
$(INSTALL) -m 644 $(srcdir)/share/http/old/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/.hosts
for i in $(srcdir)/share/http/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http/dialogs/* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http/js/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http/old/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http/old/admin/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http/old/vlm/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http/images/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http/requests/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \
- done ; \
+ done
$(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale
cat $(top_srcdir)/po/LINGUAS | while read i; do \
rm -Rf $(top_builddir)/tmp
mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
rm -Rf $(top_builddir)/VLC.app
- cp -R $(srcdir)/extras/package/macosx/vlc.xcodeproj $(top_builddir)/tmp/extras/package/macosx/
- cp -R $(srcdir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx
- for i in AUTHORS COPYING extras/package/macosx/README.MacOSX.rtf THANKS; do \
+ for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
+ done
+ for i in AUTHORS COPYING THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done
mkdir -p $(top_builddir)/tmp/modules/audio_output
prefs_widgets.m \
prefs.h \
prefs.m \
+ simple_prefs.h \
+ simple_prefs.m \
vout.h \
voutqt.m \
voutgl.m \
$(top_builddir)/tmp/modules/gui/macosx; \
done
cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
- cd ../../../ && \
+ cd ../../../../ && \
cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
- $(top_builddir)/VLC.app; \
+ $(top_builddir)/VLC.app
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
- $(INSTALL) $(top_builddir)/.libs/vlc \
+ $(INSTALL) $(top_builddir)/src/.libs/vlc \
$(top_builddir)/VLC.app/Contents/MacOS/VLC
ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
cat $(top_srcdir)/po/LINGUAS | while read i; do \
mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
- ln -sfn `pwd`/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
ln -sf ../English.lproj/InfoPlist.strings \
$(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
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
###############################################################################
fi
# Copy relevant files
- cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
+ cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/"
cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/"
cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-$(VERSION)/"
for file in AUTHORS MAINTAINERS THANKS ; \
do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-$(VERSION)/$${file}.txt" ; done;
for file in NEWS COPYING README; \
- do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
- unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
+ do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
+ unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
mkdir $(top_builddir)/vlc-$(VERSION)/locale
cat $(top_srcdir)/po/LINGUAS | while read i; do \