* IPv6 network module, courtesy of Alexis Guillard <alexis.guillard@bt.com>,

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index bb05865213b92d89f9581c7b23df98c39638521b..6859762499e345aad00b81869482863ec71415dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ endif
 #
 PLUGINS_DIR := ac3_adec \
                ac3_spdif \
+               access \
                alsa \
                arts \
                beos \
@@ -28,13 +29,15 @@ PLUGINS_DIR :=      ac3_adec \
                esd \
                fb \
                filter \
+               fx \
                ggi \
                glide \
                gtk \
                idct \
                imdct \
                kde \
-               liba52_adec \
+               a52 \
+               lirc \
                lpcm_adec \
                macosx \
                mad \
@@ -44,6 +47,8 @@ PLUGINS_DIR :=        ac3_adec \
                mpeg_system \
                mpeg_adec \
                mpeg_vdec \
+               network \
+               qnx \
                qt \
                sdl \
                spudec \
@@ -54,6 +59,9 @@ PLUGINS_DIR :=        ac3_adec \
 
 PLUGINS_TARGETS := ac3_adec/ac3_adec \
                ac3_spdif/ac3_spdif \
+               access/file \
+               access/udp \
+               access/http \
                alsa/alsa \
                arts/arts \
                beos/beos \
@@ -81,6 +89,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                filter/filter_invert \
                filter/filter_distort \
                filter/filter_wall \
+               fx/fx_scope \
                ggi/ggi \
                glide/glide \
                gtk/gnome \
@@ -94,7 +103,8 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                imdct/imdct3dn \
                imdct/imdctsse \
                kde/kde \
-               liba52_adec/liba52_adec \
+               a52/a52 \
+               lirc/lirc \
                lpcm_adec/lpcm_adec \
                macosx/macosx \
                mad/mad \
@@ -114,9 +124,13 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                mpeg_system/mpeg_ts \
                mpeg_adec/mpeg_adec \
                mpeg_vdec/mpeg_vdec \
+               network/ipv4 \
+               network/ipv6 \
+               qnx/qnx \
                qt/qt \
                sdl/sdl \
                spudec/spudec \
+               text/logger \
                text/ncurses \
                text/rc \
                vcd/vcd \
@@ -129,10 +143,10 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
 # C Objects
 # 
 INTERFACE := main interface intf_msg intf_playlist intf_eject
-INPUT := input input_ext-dec input_ext-intf input_dec input_programs input_clock mpeg_system
+INPUT := input input_ext-plugins input_ext-dec input_ext-intf input_dec input_programs input_clock mpeg_system
 VIDEO_OUTPUT := video_output video_text vout_pictures vout_subpictures
-AUDIO_OUTPUT := audio_output aout_common aout_ext-dec aout_spdif
-MISC := mtime modules netutils iso_lang
+AUDIO_OUTPUT := audio_output aout_ext-dec aout_pcm aout_spdif
+MISC := mtime modules configuration netutils iso_lang
 
 C_OBJ :=       $(INTERFACE:%=src/interface/%.o) \
                $(INPUT:%=src/input/%.o) \
@@ -419,8 +433,9 @@ package-win32:
        cp vlc.exe $(PLUGINS:%=plugins/%.so) tmp/ 
        cp INSTALL-win32.txt AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \
                README README.libdvdcss FAQ TODO tmp/
-       for file in gtk-1.3.dll gdk-1.3.dll glib-1.3.dll gmodule-1.3.dll \
-               gnu-intl.dll SDL.dll README-SDL.txt ; \
+       for file in iconv.dll libgmodule-1.3-12.dll libgtk-0.dll libgdk-0.dll \
+               libgobject-1.3-12.dll libintl-1.dll libglib-1.3-12.dll \
+               libgthread-1.3-12.dll SDL.dll README-SDL.txt ; \
                        do cp ${DLL_PATH}/$$file tmp/ ; done
        mkdir tmp/share
        for file in default8x16.psf default8x9.psf ; \
@@ -456,6 +471,25 @@ package-beos:
        # Clean up
        rm -Rf tmp
 
+package-macosx:
+       # Check that tmp isn't in the way
+       @if test -e tmp; then \
+               echo "Error: please remove ./tmp, it is in the way"; false; \
+       else \
+               echo "OK."; mkdir tmp; \
+       fi
+
+       # Copy relevant files 
+       cp -R vlc.app tmp/
+       cp AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \
+               README README.libdvdcss FAQ TODO tmp/
+
+       # Create disk image 
+       ./macosx-dmg 0 "vlc-${VLC_QUICKVERSION}" tmp/* 
+
+       # Clean up
+       rm -Rf tmp
+
 libdvdcss-snapshot: snapshot-common
        # Remove vlc sources and icons, doc, debian directory...
        rm -Rf tmp/vlc/src tmp/vlc/share tmp/vlc/plugins tmp/vlc/doc