X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=a6a31bc45bee2358be94a4ed6a9cb8c23342066c;hb=66d7e1dacf4d1c9f9d393fb05f85651bb34c110c;hp=5d6b62419c76e43696c2c5b7252901ad3e55ed42;hpb=53b978f8650fd329bf5298a05c9f8a055ac56fe4;p=vlc diff --git a/Makefile b/Makefile index 5d6b62419c..a6a31bc45b 100644 --- a/Makefile +++ b/Makefile @@ -13,13 +13,17 @@ 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 \ chroma \ directx \ + downmix \ dsp \ dummy \ dvd \ @@ -27,13 +31,14 @@ PLUGINS_DIR := ac3_adec \ esd \ fb \ filter \ + fx \ ggi \ glide \ gtk \ - downmix \ idct \ imdct \ kde \ + lirc \ lpcm_adec \ macosx \ mad \ @@ -43,15 +48,25 @@ PLUGINS_DIR := ac3_adec \ mpeg_system \ mpeg_adec \ mpeg_vdec \ + network \ + ogg \ + qnx \ qt \ + satellite \ sdl \ spudec \ text \ vcd \ + 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 \ @@ -61,7 +76,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 +94,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 +108,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \ imdct/imdct3dn \ imdct/imdctsse \ kde/kde \ + lirc/lirc \ lpcm_adec/lpcm_adec \ macosx/macosx \ mad/mad \ @@ -97,7 +116,9 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \ memcpy/memcpymmx \ memcpy/memcpymmxext \ memcpy/memcpy3dn \ + memcpy/memcpyaltivec \ mga/mga \ + mga/xmga \ motion/motion \ motion/motionmmx \ motion/motionmmxext \ @@ -108,23 +129,31 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \ mpeg_system/mpeg_ts \ mpeg_adec/mpeg_adec \ mpeg_vdec/mpeg_vdec \ + network/ipv4 \ + network/ipv6 \ + ogg/vorbis \ + qnx/qnx \ qt/qt \ + satellite/satellite \ 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 +168,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 +192,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 # @@ -197,8 +212,6 @@ endif # Misc variables # VLC_QUICKVERSION := $(shell grep '^ *VLC_VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=) -LIBDVDCSS_QUICKVERSION := $(shell grep '^ *LIBDVDCSS_VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=) - # All symbols must be exported export @@ -234,21 +247,15 @@ show: # # Cleaning rules # -clean: libdvdcss-clean libdvdread-clean plugins-clean po-clean vlc-clean +clean: plugins-clean po-clean vlc-clean rm -f src/*/*.o extras/*/*.o rm -f lib/*.so* lib/*.a rm -f plugins/*.so plugins/*.a rm -rf extras/MacOSX/build -libdvdcss-clean: - -cd extras/libdvdcss && $(MAKE) clean - po-clean: -cd po && $(MAKE) clean -libdvdread-clean: - -cd extras/libdvdread && $(MAKE) clean - plugins-clean: for dir in $(PLUGINS_DIR) ; do \ ( cd plugins/$${dir} \ @@ -274,9 +281,9 @@ distclean: clean # # Install/uninstall rules # -install: libdvdcss-install vlc-install plugins-install po-install +install: vlc-install plugins-install po-install -uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall po-uninstall +uninstall: vlc-uninstall plugins-uninstall po-uninstall vlc-install: mkdir -p $(DESTDIR)$(bindir) @@ -307,12 +314,6 @@ endif plugins-uninstall: rm -f $(DESTDIR)$(libdir)/videolan/vlc/*.so -libdvdcss-install: - -cd extras/libdvdcss && $(MAKE) install - -libdvdcss-uninstall: - -cd extras/libdvdcss && $(MAKE) uninstall - po-install: -cd po && $(MAKE) install @@ -355,7 +356,7 @@ snapshot-common: cp FAQ AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \ Makefile Makefile.opts.in Makefile.dep Makefile.modules \ configure configure.in install-sh install-win32 vlc.spec \ - config.sub config.guess acconfig.h aclocal.m4 mkinstalldirs \ + config.sub config.guess aclocal.m4 mkinstalldirs \ tmp/vlc/ # Copy Debian control files for file in debian/*dirs debian/*docs debian/*menu debian/*desktop \ @@ -381,18 +382,12 @@ snapshot: snapshot-common rm -Rf tmp snapshot-nocss: snapshot-common - # Remove libdvdcss - rm -Rf tmp/vlc/extras/libdvdcss - rm -f tmp/vlc/*.libdvdcss # Fix debian information - rm -f tmp/vlc/debian/libdvdcss* rm -f tmp/vlc/debian/control sed -e 's#^ DVDs# unencrypted DVDs#' < debian/control \ - | awk '{if(gsub("Package: libdvdcss",$$0))a=1;if(a==0)print $$0;if(a==1&&$$0=="")a=0}' \ > tmp/vlc/debian/control rm -f tmp/vlc/debian/rules - sed -e 's#^\(export LIBDVDCSS_FLAGS=\).*#\1"--without-dvdcss"#' < debian/rules \ - | awk '{if($$0=="# libdvdcss start")a=1;if(a==0)print $$0;if($$0=="# libdvdcss stop")a=0}' \ + sed -e 's#^\(export DVDCSS_FLAGS=\).*#\1"--enable-dvd --without-dvdcss"#' < debian/rules \ > tmp/vlc/debian/rules chmod +x tmp/vlc/debian/rules # Build css-disabled archives @@ -417,10 +412,13 @@ 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 README 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 ; \ @@ -444,8 +442,7 @@ package-beos: mkdir -p tmp/vlc/share # Copy relevant files cp vlc tmp/vlc/ - cp AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \ - README README.libdvdcss FAQ TODO tmp/vlc/ + cp AUTHORS COPYING ChangeLog README FAQ TODO tmp/vlc/ for file in default8x16.psf default8x9.psf ; \ do cp share/$$file tmp/vlc/share/ ; done # Create package @@ -456,36 +453,21 @@ package-beos: # 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 - rm -Rf tmp/vlc/extras/GNUgetopt tmp/vlc/extras/MacOSX - rm -Rf tmp/vlc/debian - rm -Rf tmp/vlc/ipkg - # Remove useless headers - rm -f tmp/vlc/include/* - for file in defs.h.in config.h common.h int_types.h ; \ - do cp include/$$file tmp/vlc/include/ ; done - # Remove misc files (??? - maybe not really needed) - rm -f tmp/vlc/vlc.spec tmp/vlc/INSTALL-win32.txt - mv tmp/vlc/INSTALL.libdvdcss tmp/vlc/INSTALL - mv tmp/vlc/README.libdvdcss tmp/vlc/README - mv tmp/vlc/ChangeLog.libdvdcss tmp/vlc/ChangeLog - # Fix Makefile - rm -f tmp/vlc/Makefile - sed -e 's#^install:#install-unused:#' \ - -e 's#^uninstall:#uninstall-unused:#' \ - -e 's#^clean:#clean-unused:#' \ - -e 's#^all:.*#all: libdvdcss#' \ - -e 's#^libdvdcss-install:#install:#' \ - -e 's#^libdvdcss-uninstall:#uninstall:#' \ - -e 's#^libdvdcss-clean:#clean:#' \ - < Makefile > tmp/vlc/Makefile - # Build archives - F=libdvdcss-${LIBDVDCSS_QUICKVERSION}; \ - mv tmp/vlc tmp/$$F; (cd tmp ; tar cf $$F.tar $$F); \ - bzip2 -f -9 < tmp/$$F.tar > $$F.tar.bz2; \ - gzip -f -9 tmp/$$F.tar ; mv tmp/$$F.tar.gz . +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 README FAQ TODO tmp/ + + # Create disk image + ./macosx-dmg 0 "vlc-${VLC_QUICKVERSION}" tmp/* + # Clean up rm -Rf tmp @@ -499,7 +481,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' @@ -536,9 +518,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 +529,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 $@ $< @@ -568,7 +550,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 $@ @@ -588,18 +570,6 @@ builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ) $(BUILTIN_OBJ): FORCE @cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) -f ../../Makefile.modules $(@:plugins/%=../%) -# -# libdvdcss target -# -libdvdcss: Makefile.opts - @cd extras/libdvdcss && $(MAKE) - -# -# libdvdread target -# -libdvdread: Makefile.opts - @cd extras/libdvdread && $(MAKE) - # # gettext target #