X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=6859762499e345aad00b81869482863ec71415dc;hb=5658c1d96012ec697d4a8f0930111ab9c9a6c9f4;hp=5d6b62419c76e43696c2c5b7252901ad3e55ed42;hpb=53b978f8650fd329bf5298a05c9f8a055ac56fe4;p=vlc diff --git a/Makefile b/Makefile index 5d6b62419c..6859762499 100644 --- 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 \ @@ -61,7 +71,12 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \ chroma/chroma_i420_yuy2_mmx \ chroma/chroma_i422_yuy2 \ chroma/chroma_i422_yuy2_mmx \ + chroma/chroma_i420_ymga \ + chroma/chroma_i420_ymga_mmx \ directx/directx \ + downmix/downmix \ + downmix/downmixsse \ + downmix/downmix3dn \ dsp/dsp \ dummy/dummy \ dummy/null \ @@ -74,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 \ @@ -90,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 \ @@ -98,6 +113,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \ memcpy/memcpymmxext \ memcpy/memcpy3dn \ mga/mga \ + mga/xmga \ motion/motion \ motion/motionmmx \ motion/motionmmxext \ @@ -108,23 +124,29 @@ 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 # # C Objects # -INTERFACE := main interface intf_msg intf_playlist -INPUT := input input_ext-dec input_ext-intf input_dec input_programs input_clock mpeg_system +INTERFACE := main interface intf_msg intf_playlist intf_eject +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) \ @@ -139,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 @@ -159,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 # @@ -313,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 @@ -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 @@ -536,9 +570,9 @@ ifneq (,$(BUILTINS)) @for i in $(BUILTINS) ; do \ echo " ALLOCATE_BUILTIN("$$i"); \\" >> $@ ; \ done +endif @echo " } while( 0 );" >> $@ ; @echo "" >> $@ ; -endif $(C_DEP): %.d: FORCE @$(MAKE) -s --no-print-directory -f Makefile.dep $@ @@ -547,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 $@ $<