X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=62c17d7beb33532173bf4e2eebd522424d5f886d;hb=c2f4acbe815814df61aed4852af5731e7ba49246;hp=f0e2a6bef853b139bd01a9e4ae29bef42abd7e70;hpb=7fd08bbacef54d6fef731e37c76517e07c4a6d25;p=vlc diff --git a/Makefile.am b/Makefile.am index f0e2a6bef8..62c17d7beb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,11 @@ NULL = # SUBDIRS stores the directories where a "make" is required when building # something. DIST_SUBDIRS stores the directories where nothing is built but # which have makefiles with distribution information. -SUBDIRS = intl modules . share po m4 +# - intl should come before modules and . because all the code uses gettext +# - 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 share m4 DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools EXTRA_DIST = \ @@ -22,7 +26,7 @@ EXTRA_DIST = \ vlc-config.in.in \ vlc.ebuild \ vlc.spec \ - vlc.spec.redhat \ + vlc.spec.mdk \ $(NULL) BUILT_SOURCES = @@ -67,6 +71,7 @@ HEADERS_include = \ include/darwin_specific.h \ include/codecs.h \ include/encoder.h \ + include/ninput.h \ include/input_ext-dec.h \ include/input_ext-intf.h \ include/input_ext-plugins.h \ @@ -106,13 +111,13 @@ HEADERS_include_built = \ $(NULL) include/vlc_symbols.h: Makefile $(HEADERS_include) - $(srcdir)/toolbox --update-includes + srcdir=$(srcdir) $(srcdir)/toolbox --update-includes src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include) - $(srcdir)/toolbox --update-includes + srcdir=$(srcdir) $(srcdir)/toolbox --update-includes src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in - $(srcdir)/toolbox --update-includes + srcdir=$(srcdir) $(srcdir)/toolbox --update-includes # These dependencies are mandatory $(SOURCES): include/vlc_symbols.h @@ -208,7 +213,7 @@ EXTRA_DIST += \ dist-hook: mv $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild - cd $(distdir) && $(srcdir)/toolbox --update-vc + cd $(distdir) && srcdir=$(srcdir) $(srcdir)/toolbox --update-vc ############################################################################### # Building libvlc @@ -286,6 +291,7 @@ SOURCES_libvlc_common = \ src/interface/intf_eject.c \ src/playlist/playlist.c \ src/input/input.c \ + src/input/stream.c \ src/input/input_ext-plugins.c \ src/input/input_ext-dec.c \ src/input/input_ext-intf.c \ @@ -370,13 +376,19 @@ endif # Install the modules and the symlinks install-exec-local: for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \ - echo $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`" ; \ - $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`" ; \ + echo $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`" ; \ + $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`" ; \ fi ; done - for i in "" `$(VLC_CONFIG) --target builtin` `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \ + for i in "" `$(VLC_CONFIG) --target builtin` ; do if test -n "$$i" ; then \ echo $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \ $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \ fi ; done +if BUILD_MOZILLA + for i in "" `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \ + echo $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \ + $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \ + fi ; done +endif for i in "" $(ALIASES) ; do if test -n "$$i" ; then \ rm -f "$(DESTDIR)$(bindir)/$$i" && \ ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \ @@ -398,8 +410,10 @@ VLC.app: vlc "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \ fi ; done $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share - $(INSTALL) -m 644 $(srcdir)/share/*.psf $(srcdir)/share/*.rle \ - $(srcdir)/VLC.app/Contents/MacOS/share + $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share/http + $(INSTALL) -m 644 $(srcdir)/share/http/*.html $(srcdir)/VLC.app/Contents/MacOS/share/http + $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share/http/admin + $(INSTALL) -m 644 $(srcdir)/share/http/admin/*.html $(srcdir)/VLC.app/Contents/MacOS/share/http/admin $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/locale for i in $(ALL_LINGUAS); do \ mkdir -p $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ @@ -458,8 +472,6 @@ package-win32: # Copy relevant files cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/tmp/" $(STRIP) "$(srcdir)/tmp/vlc$(EXEEXT)" - cp "$(srcdir)/INSTALL.win32" "$(srcdir)/tmp/INSTALL.txt" - unix2dos "$(srcdir)/tmp/INSTALL.txt" for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ do cp "$(srcdir)/$$file" "$(srcdir)/tmp/$${file}.txt" ; \ unix2dos "$(srcdir)/tmp/$${file}.txt" ; done @@ -473,9 +485,6 @@ package-win32: for i in "" $(srcdir)/tmp/plugins/*$(LIBEXT) ; \ do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done - mkdir -p "$(srcdir)/tmp/share" - cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ; - mkdir $(srcdir)/tmp/locale for i in $(ALL_LINGUAS); do \ mkdir -p "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES" ; \ @@ -491,6 +500,11 @@ package-win32: cp $$i $(srcdir)/tmp/skins/ || true ; \ done + mkdir -p "$(srcdir)/tmp/http/admin" + cp $(srcdir)/share/http/*.html $(srcdir)/tmp/http/ ; + cp $(srcdir)/share/http/admin/*.html $(srcdir)/tmp/http/admin/ ; + cp $(srcdir)/share/http/admin/.access $(srcdir)/tmp/http/admin/ ; + # Create package wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} $(srcdir)/tmp/nsi # Clean up @@ -519,7 +533,6 @@ package-beos: cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ done mkdir -p $(srcdir)/tmp/vlc/share - cp $(srcdir)/share/*.rle $(srcdir)/tmp/vlc/share/ # Create package with debug symbols mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/* @@ -559,95 +572,12 @@ package-macosx: # Clean up rm -Rf $(srcdir)/tmp -############################################################################### -# Building the Mozilla plugin -############################################################################### - -noinst_LIBRARIES = $(noinst_LIBRARIES_mozilla) - -MOSTLYCLEANFILES = $(LIBRARIES_mozilla) - -EXTRA_DIST += $(SOURCES_mozilla) mozilla/vlcintf.idl - -BUILT_SOURCES += $(BUILT_SOURCES_mozilla) - -SOURCES_mozilla = \ - mozilla/vlcshell.cpp \ - mozilla/vlcplugin.cpp \ - mozilla/vlcplugin.h \ - mozilla/vlcpeer.cpp \ - mozilla/vlcpeer.h \ - mozilla/support/classinfo.h \ - $(SOURCES_mozilla_win32) \ - $(SOURCES_mozilla_macosx) \ - $(SOURCES_mozilla_unix) \ - $(NULL) - -# Under Win32, Mozilla plugins need to be named NP******.DLL, but under Unix -# the common naming scheme is lib******plugin.so. Also, we need npwin.cpp -# under Win32 and npunix.c under Unix. -if HAVE_WIN32 -LIBRARIES_mozilla = mozilla/npvlc$(LIBEXT) -SOURCES_mozilla_win32 = mozilla/support/npwin.cpp -CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32 -else -if HAVE_DARWIN -# We don't define LIBRARIES_mozilla because we'll be using project builder -SOURCES_mozilla_macosx = mozilla/support/npmac.cpp -else -LIBRARIES_mozilla = mozilla/libvlcplugin$(LIBEXT) -SOURCES_mozilla_unix = mozilla/support/npunix.c -endif -endif - -if BUILD_MOZILLA -if UNTRUE -noinst_LIBRARIES_mozilla = mozilla/libplugin.a -endif - -mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla) -mozilla_libplugin_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \ - $(CPPFLAGS_mozilla_EXTRA) -Imozilla -mozilla_libplugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \ - $(CPPFLAGS_mozilla_EXTRA) -Imozilla -mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(DATA_npvlc_rc) - -BUILT_SOURCES_mozilla = mozilla/vlcintf.h -$(SOURCES_mozilla): mozilla/vlcintf.h - -mozilla_plugin_DATA = $(LIBRARIES_mozilla) -mozilla_plugindir = $(libdir)/mozilla/plugins -$(LIBRARIES_mozilla): $(mozilla_libplugin_a_OBJECTS) \ - $(mozilla_libplugin_a_DEPENDENCIES) stamp-pic - $(CXXLINK) $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \ - lib/libvlc_pic.a -shared \ - `$(VLC_CONFIG) --libs vlc mozilla builtin pic` - -mozilla_vlcintf_xpt_DATA = mozilla/vlcintf.xpt -mozilla_vlcintf_xptdir = $(libdir)/mozilla/components -mozilla/vlcintf.xpt: mozilla/vlcintf.idl - $(XPIDL) -I/usr/share/idl/mozilla -m typelib \ - -o mozilla/vlcintf $(srcdir)/mozilla/vlcintf.idl - -mozilla/vlcintf.h: mozilla/vlcintf.idl - $(XPIDL) -I/usr/share/idl/mozilla -m header \ - -o mozilla/vlcintf $(srcdir)/mozilla/vlcintf.idl - -if HAVE_WIN32 -DATA_npvlc_rc = $(noinst_mozilla_npvlc_rc_DATA) -noinst_mozilla_npvlc_rc_DATA = mozilla/npvlc_rc.$(OBJEXT) -noinst_mozilla_npvlc_rcdir = $(libdir) -mozilla/npvlc_rc.$(OBJEXT): mozilla/npvlc_rc.rc - $(WINDRES) --include-dir $(srcdir)/mozilla -i $< -o $@ -endif -endif - ############################################################################### # Stamp rules ############################################################################### -clean: clean-stamps +clean: clean-stamp clean-stamp: - rm -f stamp-builtin stamp-pic + rm -f stamp-builtin stamp-builtin: FORCE @for dep in "" `$(VLC_CONFIG) --target builtin`; do \ @@ -658,15 +588,6 @@ stamp-builtin: FORCE done @if test ! -f $@; then printf "" > $@; fi -stamp-pic: FORCE - @for dep in "" `$(VLC_CONFIG) --target builtin pic`; do \ - if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \ - rm -f $@; \ - break; \ - fi; \ - done - @if test ! -f $@; then printf "" > $@; fi - ############################################################################### # Force rule ###############################################################################