# - modules should come before . because vlc needs the builtins
# - . should come before mozilla because the plugin needs libvlc_pic.a
# - po should come before . because VLC.app needs the pofiles
-SUBDIRS = intl modules po . mozilla activex share m4 doc
+# - loader should come before modules because some plugins need it
+SUBDIRS = intl loader modules po . mozilla activex share m4 doc
DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib
EXTRA_DIST = \
bootstrap \
src/extras/COPYING \
toolbox \
+ vlc-api.pl \
vlc-config.in.in \
vlc.spec \
vlc.spec.mdk \
###############################################################################
BUILT_SOURCES += \
- include/vlc_symbols.h \
+ stamp-api \
src/misc/modules_builtin.h \
- src/misc/modules_plugin.h \
$(NULL)
pkgincludedir = $(includedir)/vlc
include/vlc/decoder.h \
include/vlc/input.h \
include/vlc/intf.h \
+ include/vlc/control.h \
$(NULL)
-noinst_HEADERS = $(HEADERS_include) $(HEADERS_include_built)
+noinst_HEADERS = $(HEADERS_include)
HEADERS_include = \
include/aout_internal.h \
include/variables.h \
include/video_output.h \
include/vlc_access.h \
+ include/vlc_acl.h \
include/vlc_bits.h \
include/vlc_block.h \
include/vlc_block_helper.h \
include/vlc_config_cat.h \
include/vlc_httpd.h \
include/vlc_tls.h \
+ include/vlc_md5.h \
include/vlc_image.h \
include/vlc_input.h \
include/vlc_interface.h \
include/vlc_playlist.h \
include/vlc_spu.h \
include/vlc_stream.h \
+ include/vlc_symbols.h \
include/vlc_threads_funcs.h \
include/vlc_threads.h \
include/vlc_video.h \
include/win32_specific.h \
$(NULL)
-HEADERS_include_built = \
- include/vlc_symbols.h \
- $(NULL)
-
-include/vlc_symbols.h: Makefile $(HEADERS_include) vlc-config
- srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
-
-src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include) vlc-config
- srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
-
src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in vlc-config
srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
+ touch $@
# These dependencies are mandatory
-$(SOURCES): include/vlc_symbols.h
-$(SOURCES_libvlc): src/misc/modules_plugin.h src/misc/modules_builtin.h $(LIB_intl)
+$(SOURCES_libvlc): src/misc/modules_builtin.h $(LIB_intl)
###############################################################################
# Optional libintl - FIXME, bad dependencies
EXTRA_DIST += \
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib \
- extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib \
+ extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \
extras/MacOSX/Resources/English.lproj/About.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/About.nib/info.nib \
extras/MacOSX/Resources/English.lproj/About.nib/keyedobjects.nib \
extras/MacOSX/Resources/English.lproj/Preferences.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/Preferences.nib/info.nib \
extras/MacOSX/Resources/English.lproj/Preferences.nib/keyedobjects.nib \
+ extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib \
+ extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib \
+ extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib \
+ extras/MacOSX/Resources/English.lproj/Bookmarks.nib/classes.nib \
+ extras/MacOSX/Resources/English.lproj/Bookmarks.nib/info.nib \
+ extras/MacOSX/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \
extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
extras/MacOSX/Resources/a52.icns \
extras/MacOSX/Resources/aac.icns \
lib_LIBRARIES = lib/libvlc.a $(LIBRARIES_libvlc_pic)
lib_libvlc_a_SOURCES = $(SOURCES_libvlc)
-dist_lib_libvlc_a_SOURCES = src/misc/modules_plugin.h
lib_libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
lib_libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
lib_libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
src/stream_output/stream_output.c \
src/stream_output/announce.c \
src/stream_output/sap.c \
+ src/stream_output/acl.c \
src/misc/charset.c \
src/misc/httpd.c \
src/misc/tls.c \
+ src/misc/md5.c \
src/misc/mtime.c \
src/misc/block.c \
src/misc/modules.c \
src/misc/threads.c \
+ src/misc/unicode.c \
src/misc/cpu.c \
src/misc/configuration.c \
src/misc/image.c \
src/misc/variables.c \
src/misc/error.c \
src/misc/net.c \
+ src/misc/getaddrinfo.c \
src/misc/vlm.c \
src/misc/xml.c \
src/extras/libc.c \
+ src/control/core.c \
+ src/control/util.c \
+ src/control/audio_video.c \
$(NULL)
SOURCES_libvlc = \
vlc_SOURCES = src/vlc.c
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin`
-vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
-vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-
# Work around a bug in the arm-wince-pe linker
if HAVE_WINCE
-vlc_LDFLAGS += lib/libvlc.a
+vlc_WORKAROUNDLDFLAGS = lib/libvlc.a
endif
+vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` $(vlc_WORKAROUNDLDFLAGS)
+vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
+vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+
# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
# old automake-1.5 bug (automake/279).
DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
@rm -f $(top_builddir)/vlc$(EXEEXT)
@case `$(VLC_CONFIG) --linkage vlc builtin` in \
- c++) echo $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
- objc) echo $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
- c|*) echo $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
+ c++) echo $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
+ objc) echo $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
+ c|*) echo $(LINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
esac
if HAVE_BEOS
ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \
fi ; done
+# the opposite of install-{data,exec}-local
+uninstall-local:
+ @for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \
+ echo rm -f "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`/$$(basename $$i$(LIBEXT))" ; \
+ rm -f "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`/$$(basename $$i$(LIBEXT))" ; \
+ fi ; done
+ @for i in "" `$(VLC_CONFIG) --target builtin` ; do if test -n "$$i" ; then \
+ echo rm -f "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
+ rm -f "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
+ fi ; done
+if BUILD_MOZILLA
+ @for i in "" `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
+ echo rm -f "$$i" "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
+ rm -f "$$i" "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
+ fi ; done
+endif
+ for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
+ rm -f "$(DESTDIR)$(bindir)/$$i" ; \
+ fi ; done
+
if HAVE_DARWIN
# Create the MacOS X app
vlc_app_DATA = VLC.app
vout.h \
voutqt.m \
voutgl.m \
+ wizard.h \
+ wizard.m \
+ extended.h \
+ extended.m \
+ bookmarks.h \
+ bookmarks.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
done
- cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'
- cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
- $(top_builddir)/VLC-release.app
+ case $(target_triplet) in \
+ *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+ cd ../../../; \
+ cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+ $(top_builddir)/VLC-release.app;; \
+ *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+ cd ../../../; \
+ cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+ $(top_builddir)/VLC-release.app;; \
+ *darwin8*) cd $(top_builddir)/tmp/extras/Default/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+ cd ../../../; \
+ cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+ $(top_builddir)/VLC-release.app;; \
+ esac
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
$(INSTALL) $(top_builddir)/vlc \
vout.h \
voutqt.m \
voutgl.m \
+ wizard.h \
+ wizard.m \
+ extended.h \
+ extended.m \
+ bookmarks.h \
+ bookmarks.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
done
- cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'
- cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
- $(top_builddir)/VLC.app
+ case $(target_triplet) in \
+ *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+ cd ../../../; \
+ cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+ $(top_builddir)/VLC.app;; \
+ *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+ cd ../../../; \
+ cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+ $(top_builddir)/VLC.app;; \
+ *darwin8*) cd $(top_builddir)/tmp/extras/Default/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+ cd ../../../; \
+ cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+ $(top_builddir)/VLC.app;; \
+ esac
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
$(INSTALL) $(top_builddir)/vlc \
$(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 specific source packages
###############################################################################
cp $(srcdir)/share/http/admin/*.html \
$(top_builddir)/vlc-${VERSION}/http/admin/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/*.html ;
+ cp $(srcdir)/share/http/admin/dboxfiles.html \
+ $(top_builddir)/vlc-${VERSION}/http/admin/ ;
cp $(srcdir)/share/http/admin/.access \
$(top_builddir)/vlc-${VERSION}/http/admin/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/.access ;
$(top_builddir)/vlc-${VERSION}/http/vlm/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
- cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
+ cp $(srcdir)/share/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ;
mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
if BUILD_MOZILLA
mkdir -p "$(top_builddir)/vlc-${VERSION}/activex"
if BUILD_ACTIVEX
- cp $(top_builddir)/activex/README.TXT $(top_builddir)/vlc-${VERSION}/activex/ ;
- cp $(top_builddir)/activex/test.html $(top_builddir)/vlc-${VERSION}/activex/ ;
+ cp $(srcdir)/activex/README.TXT $(top_builddir)/vlc-${VERSION}/activex/ ;
+ cp $(srcdir)/activex/test.html $(top_builddir)/vlc-${VERSION}/activex/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
package-win32-base-exe:
# Create package
- wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \
+ wine C:/Program\ Files/NSIS/makensis.exe \
/DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
package-win32-base-exe-cygwin:
###############################################################################
clean: clean-stamp clean-recursive
clean-stamp:
- rm -f stamp-builtin
+ rm -f stamp-builtin stamp-api
stamp-builtin: FORCE
@for dep in "" `$(VLC_CONFIG) --target builtin`; do \
done
@if test ! -f $@; then printf "" > $@; fi
+stamp-api: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl src/misc/modules_builtin.h.in
+ cd $(srcdir) && cat $(HEADERS_include) | perl ./vlc-api.pl
+ touch stamp-api
+
###############################################################################
# Force rule
###############################################################################
projects / vlc / blobdiff