X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=1ff8bced7c37434527786d6e740281baa2d60c9e;hb=c7b1c474c6a8687a0645553beb0e5c6f868d8c5c;hp=5d304367e7fd2c5cdf3d9ac013be6a375a8f1a89;hpb=d04d186e343ee397c133feb8ae150dc96d0a100b;p=vlc diff --git a/Makefile b/Makefile index 5d304367e7..1ff8bced7c 100644 --- a/Makefile +++ b/Makefile @@ -16,15 +16,17 @@ endif PLUGINS_DIR := ac3_adec \ ac3_spdif \ alsa \ - arts \ + arts \ beos \ - darwin \ + chroma \ directx \ dsp \ dummy \ dvd \ + dvdread \ esd \ fb \ + filter \ ggi \ glide \ gtk \ @@ -34,32 +36,46 @@ PLUGINS_DIR := ac3_adec \ kde \ lpcm_adec \ macosx \ + mad \ + memcpy \ mga \ motion \ - mpeg \ + mpeg_system \ mpeg_adec \ mpeg_vdec \ qt \ sdl \ - spu_dec \ + spudec \ text \ vcd \ - x11 \ - yuv + x11 PLUGINS_TARGETS := ac3_adec/ac3_adec \ ac3_spdif/ac3_spdif \ alsa/alsa \ - arts/arts \ + arts/arts \ beos/beos \ - darwin/darwin \ + chroma/chroma_i420_rgb \ + chroma/chroma_i420_rgb_mmx \ + chroma/chroma_i420_yuy2 \ + 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 \ dsp/dsp \ dummy/dummy \ dummy/null \ dvd/dvd \ + dvdread/dvdread \ esd/esd \ fb/fb \ + filter/filter_deinterlace \ + filter/filter_transform \ + filter/filter_invert \ + filter/filter_distort \ + filter/filter_wall \ ggi/ggi \ glide/glide \ gtk/gnome \ @@ -78,36 +94,40 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \ kde/kde \ lpcm_adec/lpcm_adec \ macosx/macosx \ - macosx/macosx_qt \ + mad/mad \ + memcpy/memcpy \ + memcpy/memcpymmx \ + memcpy/memcpymmxext \ + memcpy/memcpy3dn \ mga/mga \ + mga/xmga \ motion/motion \ motion/motionmmx \ motion/motionmmxext \ motion/motion3dnow \ motion/motionaltivec \ + mpeg_system/mpeg_es \ + mpeg_system/mpeg_ps \ + mpeg_system/mpeg_ts \ mpeg_adec/mpeg_adec \ mpeg_vdec/mpeg_vdec \ - mpeg/es \ - mpeg/ps \ - mpeg/ts \ qt/qt \ sdl/sdl \ - spu_dec/spu_dec \ + spudec/spudec \ text/ncurses \ text/rc \ vcd/vcd \ x11/x11 \ - x11/xvideo \ - yuv/yuv \ - yuv/yuvmmx + x11/xvideo + # # C Objects # -INTERFACE := main interface intf_msg intf_playlist intf_channels -INPUT := input input_ext-dec input_ext-intf input_dec input_programs input_netlist input_clock mpeg_system -VIDEO_OUTPUT := video_output video_text video_spu video_yuv +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 +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 tests modules netutils iso_lang +MISC := mtime modules netutils iso_lang C_OBJ := $(INTERFACE:%=src/interface/%.o) \ $(INPUT:%=src/input/%.o) \ @@ -142,6 +162,24 @@ 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 # @@ -161,8 +199,8 @@ endif # # Misc variables # -VLC_QUICKVERSION := $(shell grep '^ *VLC_VERSION=[0-9]' configure.in | head -1 | cut -f2 -d=) -LIBDVDCSS_QUICKVERSION := $(shell grep '^ *LIBDVDCSS_VERSION=[0-9]' configure.in | head -1 | cut -f2 -d=) +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 @@ -175,21 +213,22 @@ export # # Virtual targets # -all: Makefile.opts vlc ${ALIASES} vlc.app +all: Makefile.opts vlc ${ALIASES} vlc.app plugins po Makefile.opts: - @echo "**** No configuration found, running ./configure..." - ./configure - $(MAKE) $(MAKECMDGOALS) - exit + @echo "**** No configuration found, please run ./configure" + @exit 1 +# ./configure +# $(MAKE) $(MAKECMDGOALS) +# exit show: @echo CC: $(CC) @echo CFLAGS: $(CFLAGS) @echo DCFLAGS: $(DCFLAGS) - @echo LCFLAGS: $(LCFLAGS) + @echo LDFLAGS: $(LDFLAGS) @echo PCFLAGS: $(PCFLAGS) - @echo PLCFLAGS: $(PLCFLAGS) + @echo PLDFLAGS: $(PLDFLAGS) @echo C_OBJ: $(C_OBJ) @echo CPP_OBJ: $(CPP_OBJ) @echo PLUGIN_OBJ: $(PLUGIN_OBJ) @@ -198,7 +237,7 @@ show: # # Cleaning rules # -clean: libdvdcss-clean plugins-clean vlc-clean +clean: libdvdcss-clean libdvdread-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 @@ -207,10 +246,17 @@ clean: libdvdcss-clean plugins-clean vlc-clean 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} && $(MAKE) clean ) ; done - rm -f plugins/*/*.o plugins/*/*.moc plugins/*/*.bak + ( cd plugins/$${dir} \ + && $(MAKE) -f ../../Makefile.modules clean ) ; done + rm -f plugins/*/*.o plugins/*/*.lo plugins/*/*.moc plugins/*/*.bak vlc-clean: rm -f $(C_OBJ) $(CPP_OBJ) @@ -218,9 +264,10 @@ vlc-clean: rm -Rf vlc.app distclean: clean + -cd po && $(MAKE) maintainer-clean rm -f **/*.o **/*~ *.log rm -f Makefile.opts - rm -f include/defs.h include/config.h include/modules_builtin.h + rm -f include/defs.h include/modules_builtin.h rm -f src/misc/modules_builtin.h rm -f config*status config*cache config*log rm -f gmon.out core build-stamp @@ -230,9 +277,9 @@ distclean: clean # # Install/uninstall rules # -install: libdvdcss-install vlc-install plugins-install +install: libdvdcss-install vlc-install plugins-install po-install -uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall +uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall po-uninstall vlc-install: mkdir -p $(DESTDIR)$(bindir) @@ -269,6 +316,12 @@ libdvdcss-install: libdvdcss-uninstall: -cd extras/libdvdcss && $(MAKE) uninstall +po-install: + -cd po && $(MAKE) install + +po-uninstall: + -cd po && $(MAKE) uninstall + # # Package generation rules # @@ -298,11 +351,14 @@ snapshot-common: find tmp/vlc/extras tmp/vlc/doc \ -type d -name CVS -o -name '.*' -o -name '*.[o]' | \ while read i ; do rm -Rf $$i ; done + # Copy gettext stuff + cp po/*.po tmp/vlc/po + for i in Makefile.in.in POTFILES.in ; do cp po/$$i tmp/vlc/po ; done # Copy misc files 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 \ + config.sub config.guess acconfig.h aclocal.m4 mkinstalldirs \ tmp/vlc/ # Copy Debian control files for file in debian/*dirs debian/*docs debian/*menu debian/*desktop \ @@ -363,12 +419,12 @@ package-win32: # Create installation script sed -e 's#@VERSION@#'${VLC_QUICKVERSION}'#' < install-win32 > tmp/nsi # Copy relevant files - cp vlc.exe plugins/directx.so plugins/gtk.so plugins/sdl.so tmp/ + 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 ; \ - do cp ../win32-libs/$$file tmp/ ; done + do cp ${DLL_PATH}/$$file tmp/ ; done mkdir tmp/share for file in default8x16.psf default8x9.psf ; \ do cp share/$$file tmp/share/ ; done @@ -399,7 +455,7 @@ package-beos: mv tmp/vlc tmp/vlc-${VLC_QUICKVERSION} (cd tmp ; find vlc-${VLC_QUICKVERSION} | \ zip -9 -@ vlc-${VLC_QUICKVERSION}-beos.zip ) - mv tmp/vlc-${VLC_QUICKVERSION}-beos.zip . + mv tmp/vlc-${VLC_QUICKVERSION}-BeOS-x86.zip . # Clean up rm -Rf tmp @@ -411,7 +467,7 @@ libdvdcss-snapshot: snapshot-common rm -Rf tmp/vlc/ipkg # Remove useless headers rm -f tmp/vlc/include/* - for file in defs.h.in config.h.in common.h int_types.h ; \ + 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 @@ -451,8 +507,8 @@ ifneq (,$(findstring darwin,$(SYS))) rm -Rf vlc.app cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t' cp -r extras/MacOSX/build/vlc.bundle ./vlc.app - $(INSTALL) -d vlc vlc.app/Contents/MacOS/share - $(INSTALL) -d vlc vlc.app/Contents/MacOS/plugins + $(INSTALL) -d vlc.app/Contents/MacOS/share + $(INSTALL) -d vlc.app/Contents/MacOS/plugins $(INSTALL) vlc vlc.app/Contents/MacOS/ ifneq (,$(PLUGINS)) $(INSTALL) $(PLUGINS:%=plugins/%.so) vlc.app/Contents/MacOS/plugins @@ -465,38 +521,45 @@ FORCE: # # Generic rules (see below) # -$(C_DEP): %.d: FORCE - @$(MAKE) -s --no-print-directory -f Makefile.dep $@ - -$(CPP_DEP): %.dpp: FORCE - @$(MAKE) -s --no-print-directory -f Makefile.dep $@ - $(H_OBJ): Makefile.opts Makefile.dep Makefile - rm -f $@ && cp $@.in $@ +# @echo "regenerating $@" + @rm -f $@ && cp $@.in $@ ifneq (,$(BUILTINS)) - for i in $(BUILTINS) ; do \ - echo "int module_"$$i"_InitModule( module_t* );" >> $@ ; \ - echo "int module_"$$i"_ActivateModule( module_t* );" >> $@ ; \ - echo "int module_"$$i"_DeactivateModule( module_t* );" >> $@ ; \ + @for i in $(BUILTINS) ; do \ + echo "int InitModule__MODULE_"$$i"( module_t* );" >>$@; \ + echo "int ActivateModule__MODULE_"$$i"( module_t* );" >>$@; \ + echo "int DeactivateModule__MODULE_"$$i"( module_t* );" >>$@; \ done - echo "" >> $@ ; - printf "#define ALLOCATE_ALL_BUILTINS() do { " >> $@ ; - for i in $(BUILTINS) ; do \ - printf "ALLOCATE_BUILTIN("$$i"); " >> $@ ; \ + @echo "" >> $@ ; +endif + @echo "#define ALLOCATE_ALL_BUILTINS() \\" >> $@ ; + @echo " do \\" >> $@ ; + @echo " { \\" >> $@ ; +ifneq (,$(BUILTINS)) + @for i in $(BUILTINS) ; do \ + echo " ALLOCATE_BUILTIN("$$i"); \\" >> $@ ; \ done - echo "} while( 0 );" >> $@ ; - echo "" >> $@ ; endif + @echo " } while( 0 );" >> $@ ; + @echo "" >> $@ ; + +$(C_DEP): %.d: FORCE + @$(MAKE) -s --no-print-directory -f Makefile.dep $@ + +$(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: .dep/%.d $(C_OBJ): %.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< + $(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: .dep/%.dpp $(CPP_OBJ): %.o: %.cpp - $(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $< $(RESOURCE_OBJ): %.o: Makefile.dep Makefile ifneq (,(findstring mingw32,$(SYS))) @@ -507,8 +570,8 @@ endif # # Main application target # -vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(VLC_OBJ) $(BUILTIN_OBJ) plugins - $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LCFLAGS) +vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ) + $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) ifeq ($(SYS),beos) xres -o $@ ./share/vlc_beos.rsrc mimeset -f $@ @@ -519,17 +582,30 @@ endif # plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ) $(PLUGIN_OBJ): FORCE - cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%) + @cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) -f ../../Makefile.modules $(@:plugins/%=../%) # # Built-in modules target # 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) $(@:plugins/%=../%) + @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) + @cd extras/libdvdcss && $(MAKE) + +# +# libdvdread target +# +libdvdread: Makefile.opts + @cd extras/libdvdread && $(MAKE) + +# +# gettext target +# +po: FORCE + @cd po && $(MAKE) +