EXTRA_DIST = \
HACKING \
INSTALL.win32 \
+ INSTALL.wince \
vlc.exe.manifest \
MAINTAINERS \
README.MacOSX.rtf \
src/misc/modules_builtin.h.in \
$(NULL)
-BUILT_SOURCES = \
+BUILT_SOURCES_distclean = vlc-config
+BUILT_SOURCES_clean = \
stamp-api \
src/misc/modules_builtin.h \
src/misc/version.c \
$(NULL)
+BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
+
SUFFIXES =
# Tell aclocal to use -I m4. Wonder if it really works.
$(NULL)
noinst_HEADERS = $(HEADERS_include)
+noinst_DATA = $(DATA_noinst_beos) $(DATA_noinst_libvlc)
HEADERS_include = \
include/aout_internal.h \
include/modules_inner.h \
include/mtime.h \
include/network.h \
- include/osd.h \
include/os_specific.h \
include/snapshot.h \
include/stream_output.h \
src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in vlc-config
srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
- touch $@
+ touch src/misc/modules_builtin.h
+
+src/misc/modules.c: src/misc/modules_builtin.h
src/misc/version.c: FORCE
srcdir=$(srcdir) $(srcdir)/toolbox --update-version
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/Extended.nib/classes.nib \
+ extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib \
+ extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib \
+# extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib \
+# extras/MacOSX/Resources/English.lproj/Update.nib/info.nib \
+# extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib \
extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
extras/MacOSX/Resources/a52.icns \
extras/MacOSX/Resources/aac.icns \
bin_SCRIPTS = vlc-config
vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
- cd $(top_builddir) && $(SHELL) ./config.status --file=$@
- -cd $(top_builddir) && chmod 0755 $@
+ $(SHELL) ./config.status --file=vlc-config
+ chmod 0755 vlc-config
vlc-config.in: vlc-config.in.in
./config.status --recheck
-$(SOURCES): vlc-config
+MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
+CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
+DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in
-CLEANFILES = $(BUILT_SOURCES) stamp-builtin
-DISTCLEANFILES = vlc-config.in vlc-config
-
-lib_LIBRARIES = lib/libvlc.a $(LIBRARIES_libvlc_pic)
+if HAVE_WIN32
+lib_LIBRARIES = lib/libvlc.a
+else
+if BUILD_SHARED
+lib_LIBRARIES = lib/libvlc_pic.a
+else
+lib_LIBRARIES = lib/libvlc.a
+if BUILD_MOZILLA
+lib_LIBRARIES += lib/libvlc_pic.a
+endif
+endif
+endif
lib_libvlc_a_SOURCES = $(SOURCES_libvlc)
lib_libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
if BUILD_GETOPT
OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt)
endif
-if BUILD_MOZILLA
-if !HAVE_WIN32
-LIBRARIES_libvlc_pic = lib/libvlc_pic.a
+
+# Build libvlc as a shared library
+if BUILD_SHARED
+DATA_noinst_libvlc = libvlc$(LIBEXT)
+if HAVE_WIN32
+OBJECTS_libvlc_so = $(lib_libvlc_a_OBJECTS)
+else
+OBJECTS_libvlc_so = $(lib_libvlc_pic_a_OBJECTS)
endif
endif
+libvlc$(LIBEXT): $(OBJECTS_libvlc_so)
+ @ldfl="`$(VLC_CONFIG) --libs plugin vlc $(pic) builtin`" ; \
+ case `$(VLC_CONFIG) --linkage vlc` in \
+ c++) ld="$(CXXLINK)" ;; \
+ objc) ld="$(OBJCLINK)" ;; \
+ c|*) ld="$(LINK)" ;; \
+ esac ; \
+ echo $$ld $(OBJECTS_libvlc_so) $$ldfl ; \
+ $$ld $(OBJECTS_libvlc_so) $$ldfl
+
EXTRA_DIST += \
$(SOURCES_libvlc_beos) \
$(SOURCES_libvlc_darwin) \
src/stream_output/sap.c \
src/stream_output/acl.c \
src/osd/osd.c \
- src/osd/osd_widgets.c \
src/osd/osd_parser.c \
+ src/osd/osd_text.c \
+ src/osd/osd_widgets.c \
src/misc/charset.c \
src/misc/httpd.c \
src/misc/tls.c \
# Work around a bug in the arm-wince-pe linker
if HAVE_WINCE
-vlc_WORKAROUNDLDFLAGS = lib/libvlc.a
+vlc_WORKAROUNDLDFLAGS = $(LIB_libvlc)
+endif
+
+if BUILD_SHARED
+### libvlc.so cannot be created into lib/
+LIB_libvlc = libvlc$(LIBEXT)
+LDFLAGS_libvlc =
+#-Wl,-rpath $(libdir)
+else
+LIB_libvlc = lib/libvlc.a
+LDFLAGS_libvlc = `$(VLC_CONFIG) --libs vlc builtin`
endif
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` $(vlc_WORKAROUNDLDFLAGS)
-vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
+vlc_LDFLAGS = $(LDFLAGS_libvlc) $(vlc_WORKAROUNDLDFLAGS)
+vlc_LDADD = $(LIB_libvlc) $(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)
+DEPENDENCIES_vlc = $(LIB_libvlc) $(DATA_win32_rc) $(LIB_intl)
vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
- @rm -f $(top_builddir)/vlc$(EXEEXT)
+ @rm -f vlc$(EXEEXT)
@case `$(VLC_CONFIG) --linkage vlc builtin` in \
- 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
+ c++) cmd="$(CXXLINK)" ;; \
+ objc) cmd="$(OBJCLINK)" ;; \
+ c|*) cmd="$(LINK)" ;; \
+ esac ; \
+ cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS)" ; \
+ echo $$cmd ; \
+ eval $$cmd
if HAVE_BEOS
-noinst_DATA = vlc-bundle
+DATA_noinst_beos = vlc-bundle
vlc-bundle: vlc
rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle
cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/
find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
endif
-# Install the symlinks
+# Install the symlinks and shared libvlc
install-exec-local:
for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
rm -f "$(DESTDIR)$(bindir)/$$i" && \
ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \
fi ; done
+ test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)"
# the opposite of install-{data,exec}-local
uninstall-local:
for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
rm -f "$(DESTDIR)$(bindir)/$$i" ; \
fi ; done
+ test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
if HAVE_DARWIN
# Create the MacOS X app
wizard.m \
extended.h \
extended.m \
- bookmarks.h \
- bookmarks.m \
+ bookmarks.h \
+ bookmarks.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
wizard.m \
extended.h \
extended.m \
- bookmarks.h \
- bookmarks.m \
+ bookmarks.h \
+ bookmarks.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
done
mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selected"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/unselect"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selection"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/volume"
- for i in $(srcdir)/share/osdmenu/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/ || true ; \
- unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/`basename $$i` ; \
- done
- for i in $(srcdir)/share/osdmenu/dvd/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd || true ; \
- done
- for i in $(srcdir)/share/osdmenu/dvd/unselect/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/unselect || true ; \
- done
- for i in $(srcdir)/share/osdmenu/dvd/selected/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selected/ || true ; \
- done
- for i in $(srcdir)/share/osdmenu/dvd/selection/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selection/ || true ; \
- done
- for i in $(srcdir)/share/osdmenu/dvd/volume/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/volume/ || true ; \
- done
-
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/selected"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/selection"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/volume"
- for i in $(srcdir)/share/osdmenu/default/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default || true ; \
- done
- for i in $(srcdir)/share/osdmenu/default/selected/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/selected/ || true ; \
- done
- for i in $(srcdir)/share/osdmenu/default/selection/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/selection/ || true ; \
- done
- for i in $(srcdir)/share/osdmenu/default/volume/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/volume/ || true ; \
+ cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"
+ for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume;do \
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir"; \
+ for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \
+ cp $$file "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir" || true; \
+ done; \
done
+ unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg;
+ sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg
+ sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
- unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;:
cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
cp $(srcdir)/share/http/*.png $(top_builddir)/vlc-${VERSION}/http/
# Clean up
rm -Rf $(top_builddir)/vlc-${VERSION}
+package-wince-base:
+# Check that tmp isn't in the way
+ @if test -e "$(top_builddir)/vlc-${VERSION}"; then \
+ echo "Error: please remove $(top_builddir)/vlc-${VERSION}, it is in the way"; \
+ false; \
+ else \
+ echo "OK."; mkdir -p "$(top_builddir)/vlc-${VERSION}"; \
+ fi
+
+# Copy relevant files
+ cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
+ cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
+ $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
+
+ for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
+ do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
+ unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done
+
+ mkdir $(top_builddir)/vlc-${VERSION}/locale
+ for i in $(ALL_LINGUAS); do \
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
+ cp "$(srcdir)/po/$${i}.gmo" \
+ "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \
+ || true ; \
+ done
+
+
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
+ cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
+ cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
+ cp $(srcdir)/share/http/*.png $(top_builddir)/vlc-${VERSION}/http/
+ cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
+ 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 ;
+ cp $(srcdir)/share/http/vlm/*.html \
+ $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
+
+ cp $(srcdir)/share/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ;
+
+if BUILD_MOZILLA
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
+ cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
+ $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
+ cp $(top_builddir)/mozilla/vlcintf.xpt $(top_builddir)/vlc-${VERSION}/mozilla/ ;
+endif
+
+if BUILD_ACTIVEX
+ mkdir -p "$(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/ ;
+ $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
+endif
+# Rebase all those DLLs to speed up loading (need cygwin rebase)
+ if [ -x rebase ]; then \
+ find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
+ fi
+
+package-wince-base-zip:
+# Create package
+ zip -r vlc-${VERSION}-wince.zip vlc-${VERSION}
+
+package-wince: package-wince-base package-wince-base-zip
+# Clean up
+ rm -Rf $(top_builddir)/vlc-${VERSION}
+
+
package-beos:
# Check that tmp isn't in the way
@if test -e $(srcdir)/tmp; then \
# Copy relevant files
cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/tmp/VLC.app"
- cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/
+ cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ && cp -r extras/MacOSX/Delete\ Preferences.app $(top_builddir)/tmp/
# Create disk image
$(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp
| sort ; \
} > $(top_srcdir)/po/POTFILES.in
rm -f $(top_srcdir)/po/vlc.pot
- cd po && $(MAKE) POTFILES $(top_srcdir)/../po/vlc.pot update-po
+ cd po && $(MAKE) POTFILES vlc.pot update-po
#cd po && $(MAKE) update-po