]> git.sesse.net Git - vlc/blobdiff - Makefile.am
* configure.ac : added --enable-goom and --with-goom-tree. Btw, I use a
[vlc] / Makefile.am
index 41237077267f00d801b1d9d4d24fa2fdcac4a510..2fc6b8fba714378b26ef082ee3f9ec58d24905ff 100644 (file)
@@ -69,8 +69,10 @@ HEADERS_include = \
        include/beos_specific.h \
        include/configuration.h \
        include/darwin_specific.h \
+       include/charset.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 \
@@ -86,9 +88,9 @@ HEADERS_include = \
        include/os_specific.h \
        include/stream_control.h \
        include/stream_output.h \
-       include/announce.h \
        include/variables.h \
        include/video_output.h \
+       include/vlc_block.h \
        include/vlc_common.h \
        include/vlc_config.h \
        include/vlc_cpu.h \
@@ -290,6 +292,8 @@ SOURCES_libvlc_common = \
        src/interface/intf_eject.c \
        src/playlist/playlist.c \
        src/input/input.c \
+       src/input/stream.c \
+       src/input/demux.c \
        src/input/input_ext-plugins.c \
        src/input/input_ext-dec.c \
        src/input/input_ext-intf.c \
@@ -312,8 +316,9 @@ SOURCES_libvlc_common = \
        src/audio_output/output.c \
        src/audio_output/intf.c \
        src/stream_output/stream_output.c \
-       src/stream_output/announce.c \
+       src/misc/charset.c \
        src/misc/mtime.c \
+       src/misc/block.c \
        src/misc/modules.c \
        src/misc/threads.c \
        src/misc/cpu.c \
@@ -397,31 +402,35 @@ if HAVE_DARWIN
 vlc_app_DATA = VLC.app
 vlc_appdir = $(bindir)
 VLC.app: vlc
+       cd $(top_builddir)
        rm -Rf VLC.app
-       cd $(srcdir)/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
-       cp -r $(srcdir)/extras/MacOSX/build/vlc.bundle $(srcdir)/VLC.app
-       $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS
-       $(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC
-       $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules
+       mkdir extras || true
+       cp -r $(srcdir)/extras/MacOSX extras || true
+       cd extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
+       cd $(top_builddir)
+       cp -r extras/MacOSX/build/vlc.bundle VLC.app
+       $(INSTALL) -d VLC.app/Contents/MacOS
+       $(INSTALL) vlc VLC.app/Contents/MacOS/VLC
+       $(INSTALL) -d VLC.app/Contents/MacOS/modules
        for i in "" `$(VLC_CONFIG) --target plugin` ; do \
-         if test -n "$$i" ; then $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \
-           "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \
+         if test -n "$$i" ; then $(INSTALL) "$$i$(LIBEXT)" \
+           "VLC.app/Contents/MacOS/modules" ; \
          fi ; done
-       $(INSTALL) -d $(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
+       $(INSTALL) -d VLC.app/Contents/MacOS/share
+       $(INSTALL) -d VLC.app/Contents/MacOS/share/http
+       $(INSTALL) -m 644 $(srcdir)/share/http/*.html VLC.app/Contents/MacOS/share/http
+       $(INSTALL) -d VLC.app/Contents/MacOS/share/http/admin
+       $(INSTALL) -m 644 $(srcdir)/share/http/admin/*.html VLC.app/Contents/MacOS/share/http/admin
+       $(INSTALL) -d VLC.app/Contents/MacOS/locale
        for i in $(ALL_LINGUAS); do \
-         mkdir -p $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
-         cp $(srcdir)/po/$${i}.gmo $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
-         mkdir -p $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
-         ln -sf ../English.lproj/InfoPlist.strings $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
-         ln -sf ../English.lproj/MainMenu.nib $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
-         ln -sf ../English.lproj/vlc.scriptTerminology $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+         mkdir -p VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
+         cp $(srcdir)/po/$${i}.gmo VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+         mkdir -p VLC.app/Contents/Resources/$${i}.lproj ; \
+         ln -sf ../English.lproj/InfoPlist.strings VLC.app/Contents/Resources/$${i}.lproj ; \
+         ln -sf ../English.lproj/MainMenu.nib VLC.app/Contents/Resources/$${i}.lproj ; \
+         ln -sf ../English.lproj/vlc.scriptTerminology VLC.app/Contents/Resources/$${i}.lproj ; \
        done
-       printf "APPLVLC#" >| $(srcdir)/VLC.app/Contents/PkgInfo
+       printf "APPLVLC#" >| VLC.app/Contents/PkgInfo
 endif
 
 if HAVE_WIN32
@@ -521,7 +530,7 @@ package-beos:
        mkdir -p $(srcdir)/tmp/vlc
        cd $(srcdir) && \
          cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
-# We cannot use ${PLUGIN_FILES}, it looks like it is too long for the BeOS shell...
+# We cannot use ${PLUGIN_FILES} as it looks like it is too "long" for the BeOS shell...
        if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \
          mkdir -p $(srcdir)/tmp/vlc/plugins; \
          find $(srcdir)/modules -name "lib*_plugin.so" | xargs -i{} cp {} $(srcdir)/tmp/vlc/plugins/; \
@@ -530,7 +539,6 @@ package-beos:
          mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \
          cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
        done
-       mkdir -p $(srcdir)/tmp/vlc/share
 
 # Create package with debug symbols
        mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*
@@ -539,12 +547,14 @@ package-beos:
        mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/
 
 # Create package without debug symbols
-       strip $(srcdir)/tmp/vlc-${VERSION}/vlc
-       if [ -d $(srcdir)/tmp/vlc-${VERSION}/plugins ]; then \
-         strip $(srcdir)/tmp/vlc-${VERSION}/plugins/lib*_plugin.so; \
+       mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc
+       strip $(srcdir)/tmp/vlc/vlc
+       if [ -d $(srcdir)/tmp/vlc/plugins ]; then \
+         strip $(srcdir)/tmp/vlc/plugins/lib*_plugin.so; \
        fi
-       xres -o $(srcdir)/tmp/vlc-${VERSION}/vlc $(srcdir)/share/vlc_beos.rsrc
-       mimeset -f $(srcdir)/tmp/vlc-${VERSION}/* $(srcdir)/tmp/vlc-${VERSION}/*/*
+       xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc
+       mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*
+       mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION}
        (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
        mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/