* ./configure.in: BeOS, liba52 and chroma plugin compilation fixes.

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index 5591ba9aa09e22f04bb9e37350733221e3f43755..1de7c112561d8a90415d17c2d5cb806eb81224bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,11 @@ endif
 # 
 # All possible plugin directories, needed for make clean
 #
-PLUGINS_DIR := ac3_adec \
+PLUGINS_DIR := a52 \
+               aa \
+               ac3_adec \
                ac3_spdif \
+               access \
                alsa \
                arts \
                beos \
@@ -28,13 +31,13 @@ PLUGINS_DIR :=      ac3_adec \
                esd \
                fb \
                filter \
+               fx \
                ggi \
                glide \
                gtk \
                idct \
                imdct \
                kde \
-               a52 \
                lirc \
                lpcm_adec \
                macosx \
@@ -45,7 +48,10 @@ PLUGINS_DIR :=       ac3_adec \
                mpeg_system \
                mpeg_adec \
                mpeg_vdec \
+               network \
+               qnx \
                qt \
+               satellite \
                sdl \
                spudec \
                text \
@@ -53,8 +59,13 @@ PLUGINS_DIR :=       ac3_adec \
                win32 \
                x11
 
-PLUGINS_TARGETS := ac3_adec/ac3_adec \
+PLUGINS_TARGETS := a52/a52 \
+               aa/aa \
+               ac3_adec/ac3_adec \
                ac3_spdif/ac3_spdif \
+               access/file \
+               access/udp \
+               access/http \
                alsa/alsa \
                arts/arts \
                beos/beos \
@@ -82,6 +93,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 \
@@ -95,7 +107,6 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                imdct/imdct3dn \
                imdct/imdctsse \
                kde/kde \
-               a52/a52 \
                lirc/lirc \
                lpcm_adec/lpcm_adec \
                macosx/macosx \
@@ -116,7 +127,11 @@ 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 \
+               satellite/satellite \
                sdl/sdl \
                spudec/spudec \
                text/logger \
@@ -132,10 +147,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) \
@@ -420,10 +435,14 @@ package-win32:
        sed -e 's#@VERSION@#'${VLC_QUICKVERSION}'#' < install-win32 > tmp/nsi
        # Copy relevant files
        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 ; \
+       cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt
+       for file in AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \
+               README README.libdvdcss FAQ TODO ; \
+                       do cp $$file tmp/$${file}.txt ; \
+                       unix2dos tmp/$${file}.txt ; done
+       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 ; \
@@ -521,7 +540,7 @@ gnome-vlc gvlc kvlc qvlc: vlc
        rm -f $@ && ln -s vlc $@
 
 .PHONY: vlc.app
-vlc.app: Makefile.opts
+vlc.app: vlc plugins
 ifneq (,$(findstring darwin,$(SYS)))
        rm -Rf vlc.app
        cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t'
@@ -590,7 +609,7 @@ endif
 # Main application target
 #
 vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ)
-       $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS)
+       $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(LIB_VLC) $(LIB_BUILTINS) $(LIB_COMMON)
 ifeq ($(SYS),beos)
        xres -o $@ ./share/vlc_beos.rsrc
        mimeset -f $@