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

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index 1ff8bced7c37434527786d6e740281baa2d60c9e..6859762499e345aad00b81869482863ec71415dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,11 +15,13 @@ endif
 #
 PLUGINS_DIR := ac3_adec \
                ac3_spdif \
+               access \
                alsa \
                arts \
                beos \
                chroma \
                directx \
+               downmix \
                dsp \
                dummy \
                dvd \
@@ -27,13 +29,15 @@ PLUGINS_DIR :=      ac3_adec \
                esd \
                fb \
                filter \
+               fx \
                ggi \
                glide \
                gtk \
-               downmix \
                idct \
                imdct \
                kde \
+               a52 \
+               lirc \
                lpcm_adec \
                macosx \
                mad \
@@ -43,15 +47,21 @@ PLUGINS_DIR :=      ac3_adec \
                mpeg_system \
                mpeg_adec \
                mpeg_vdec \
+               network \
+               qnx \
                qt \
                sdl \
                spudec \
                text \
                vcd \
+               win32 \
                x11
 
 PLUGINS_TARGETS := ac3_adec/ac3_adec \
                ac3_spdif/ac3_spdif \
+               access/file \
+               access/udp \
+               access/http \
                alsa/alsa \
                arts/arts \
                beos/beos \
@@ -64,6 +74,9 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                chroma/chroma_i420_ymga \
                chroma/chroma_i420_ymga_mmx \
                directx/directx \
+               downmix/downmix \
+               downmix/downmixsse \
+               downmix/downmix3dn \
                dsp/dsp \
                dummy/dummy \
                dummy/null \
@@ -76,13 +89,11 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                filter/filter_invert \
                filter/filter_distort \
                filter/filter_wall \
+               fx/fx_scope \
                ggi/ggi \
                glide/glide \
                gtk/gnome \
                gtk/gtk \
-               downmix/downmix \
-               downmix/downmixsse \
-               downmix/downmix3dn \
                idct/idct \
                idct/idctclassic \
                idct/idctmmx \
@@ -92,6 +103,8 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                imdct/imdct3dn \
                imdct/imdctsse \
                kde/kde \
+               a52/a52 \
+               lirc/lirc \
                lpcm_adec/lpcm_adec \
                macosx/macosx \
                mad/mad \
@@ -111,12 +124,18 @@ 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 \
+               win32/waveout \
+               win32/win32 \
                x11/x11 \
                x11/xvideo
 
@@ -124,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_ext-dec aout_u8 aout_s8 aout_u16 aout_s16 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) \
@@ -142,6 +161,10 @@ ifeq ($(NEED_GETOPT),1)
 C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o 
 endif
 
+ifeq ($(NEED_SYMBOLS),1)
+C_OBJ += src/misc/symbols.o
+endif
+
 ifeq ($(SYS),beos)
 CPP_OBJ :=     src/misc/beos_specific.o
 endif
@@ -162,24 +185,6 @@ VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
 #
 H_OBJ :=       src/misc/modules_builtin.h
 
-#
-# Included headers which don't get noticed by Makefile.dep
-#
-H_DEP :=       videolan/vlc.h \
-               defs.h \
-               config.h \
-               int_types.h \
-               modules_inner.h \
-               common.h \
-               beos_specific.h \
-               darwin_specific.h \
-               win32_specific.h \
-               intf_msg.h \
-               threads.h \
-               mtime.h \
-               modules.h \
-               main.h
-
 #
 # Other lists of files
 #
@@ -316,6 +321,12 @@ libdvdcss-install:
 libdvdcss-uninstall:
        -cd extras/libdvdcss && $(MAKE) uninstall
 
+libdvdread-install:
+       -cd extras/libdvdread && $(MAKE) install
+
+libdvdread-uninstall:
+       -cd extras/libdvdread && $(MAKE) uninstall
+
 po-install:
        -cd po && $(MAKE) install
 
@@ -422,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 ; \
@@ -459,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
@@ -550,13 +581,13 @@ $(CPP_DEP): %.dpp: FORCE
        @$(MAKE) -s --no-print-directory -f Makefile.dep $@
 
 $(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
-$(C_OBJ): %.o: $(H_OBJ) $(H_DEP:%=include/%)
+$(C_OBJ): %.o: $(H_OBJ)
 $(C_OBJ): %.o: .dep/%.d
 $(C_OBJ): %.o: %.c
        $(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<
 
 $(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile
-$(CPP_OBJ): %.o: $(H_OBJ) $(H_DEP:%=include/%)
+$(CPP_OBJ): %.o: $(H_OBJ)
 $(CPP_OBJ): %.o: .dep/%.dpp
 $(CPP_OBJ): %.o: %.cpp
        $(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<