X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=aca16eb3897d086e1025ddb5b376db58ae5c347f;hb=50b8a062abf436a5dde7bdd11bf07b09db86a205;hp=26b1a13ebc43ab259570f573556de9e6a9b72b97;hpb=bf7ee74f8f7420cf471784a53f391abbee97a91d;p=vlc diff --git a/Makefile b/Makefile index 26b1a13ebc..aca16eb389 100644 --- a/Makefile +++ b/Makefile @@ -5,136 +5,47 @@ ifeq ($(shell [ ! -r Makefile.opts ] && echo 1),) include Makefile.opts endif +ifeq ($(shell [ ! -r Makefile.config ] && echo 1),) + include Makefile.config +endif ############################################################################### # Objects and files ############################################################################### -# -# All possible plugin directories, needed for make clean -# -PLUGINS_DIR := ac3_adec \ - ac3_spdif \ - alsa \ - arts \ - beos \ - chroma \ - directx \ - dsp \ - dummy \ - dvd \ - dvdread \ - esd \ - fb \ - filter \ - ggi \ - glide \ - gtk \ - downmix \ - idct \ - imdct \ - kde \ - lpcm_adec \ - macosx \ - mad \ - memcpy \ - mga \ - motion \ - mpeg_system \ - mpeg_adec \ - mpeg_vdec \ - qt \ - sdl \ - spudec \ - text \ - vcd \ - x11 - -PLUGINS_TARGETS := ac3_adec/ac3_adec \ - ac3_spdif/ac3_spdif \ - alsa/alsa \ - arts/arts \ - beos/beos \ - chroma/chroma_yv12_rgb8 \ - chroma/chroma_yv12_rgb16 \ - 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 \ - gtk/gtk \ - downmix/downmix \ - downmix/downmixsse \ - downmix/downmix3dn \ - idct/idct \ - idct/idctclassic \ - idct/idctmmx \ - idct/idctmmxext \ - idct/idctaltivec \ - imdct/imdct \ - imdct/imdct3dn \ - imdct/imdctsse \ - kde/kde \ - lpcm_adec/lpcm_adec \ - macosx/macosx \ - mad/mad \ - memcpy/memcpy \ - memcpy/memcpymmx \ - memcpy/memcpymmxext \ - memcpy/memcpy3dn \ - mga/mga \ - 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 \ - qt/qt \ - sdl/sdl \ - spudec/spudec \ - text/ncurses \ - text/rc \ - vcd/vcd \ - x11/x11 \ - x11/xvideo \ - yuv/yuv \ - yuv/yuvmmx - # # 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 +VLC := vlc +LIBVLC := libvlc +INTERFACE := interface intf_eject +PLAYLIST := playlist +INPUT := input input_ext-plugins input_ext-dec input_ext-intf input_dec input_programs input_clock mpeg_system input_info 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 threads cpu configuration netutils iso_lang messages objects extras -C_OBJ := $(INTERFACE:%=src/interface/%.o) \ +LIBVLC_OBJ := $(LIBVLC:%=src/%.o) \ + $(INTERFACE:%=src/interface/%.o) \ + $(PLAYLIST:%=src/playlist/%.o) \ $(INPUT:%=src/input/%.o) \ $(VIDEO_OUTPUT:%=src/video_output/%.o) \ $(AUDIO_OUTPUT:%=src/audio_output/%.o) \ $(MISC:%=src/misc/%.o) +VLC_OBJ := $(VLC:%=src/%.o) + +C_OBJ := $(VLC_OBJ) $(LIBVLC_OBJ) + # # Misc Objects # ifeq ($(NEED_GETOPT),1) -C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o +LIBVLC_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o +endif + +ifeq ($(NEED_SYMBOLS),1) +LIBVLC_OBJ += src/misc/symbols.o endif ifeq ($(SYS),beos) @@ -142,15 +53,16 @@ CPP_OBJ := src/misc/beos_specific.o endif ifneq (,$(findstring darwin,$(SYS))) -C_OBJ += src/misc/darwin_specific.o +LIBVLC_OBJ += src/misc/darwin_specific.o endif ifneq (,$(findstring mingw32,$(SYS))) -C_OBJ += src/misc/win32_specific.o +LIBVLC_OBJ += src/misc/win32_specific.o RESOURCE_OBJ := share/vlc_win32_rc.o endif -VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) +LIBVLC_OBJ += $(CPP_OBJ) $(M_OBJ) $(BUILTIN_OBJ) +VLC_OBJ += $(RESOURCE_OBJ) # # Generated header @@ -167,18 +79,16 @@ CPP_DEP := $(CPP_OBJ:%.o=.dep/%.dpp) # Translate plugin names # ifneq (,$(PLUGINS)) -PLUGIN_OBJ := $(shell for i in $(PLUGINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.*/\('$$i'\) .*@plugins/\1.so@' -e 's@^ .*@@' ; done) +PLUGIN_OBJ := $(PLUGINS:%=modules/%.so) endif ifneq (,$(BUILTINS)) -BUILTIN_OBJ := $(shell for i in $(BUILTINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.*/\('$$i'\) .*@plugins/\1.a@' -e 's@^ .*@@' ; done) +BUILTIN_OBJ := $(BUILTINS:%=modules/%.a) 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=) - +VERSION := $(shell grep '^ *VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=) # All symbols must be exported export @@ -190,7 +100,7 @@ export # # Virtual targets # -all: Makefile.opts vlc ${ALIASES} vlc.app plugins po +all: Makefile.opts vlc ${ALIASES} vlc.app plugins po mozilla/libvlcplugin.so Makefile.opts: @echo "**** No configuration found, please run ./configure" @@ -202,10 +112,11 @@ Makefile.opts: show: @echo CC: $(CC) @echo CFLAGS: $(CFLAGS) - @echo DCFLAGS: $(DCFLAGS) @echo LDFLAGS: $(LDFLAGS) - @echo PCFLAGS: $(PCFLAGS) - @echo PLDFLAGS: $(PLDFLAGS) + @echo plugins_CFLAGS: $(plugins_CFLAGS) + @echo plugins_LDFLAGS: $(plugins_LDFLAGS) + @echo builtins_CFLAGS: $(builtins_CFLAGS) + @echo builtins_LDFLAGS: $(builtins_LDFLAGS) @echo C_OBJ: $(C_OBJ) @echo CPP_OBJ: $(CPP_OBJ) @echo PLUGIN_OBJ: $(PLUGIN_OBJ) @@ -214,39 +125,33 @@ show: # # Cleaning rules # -clean: libdvdcss-clean libdvdread-clean plugins-clean po-clean vlc-clean +clean: plugins-clean po-clean vlc-clean mozilla-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 + rm -f plugins/*.so plugins/*.a plugins/*.lib plugins/*.tds + rm -Rf extras/MacOSX/build 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) -f ../../Makefile.modules clean ) ; done - rm -f plugins/*/*.o plugins/*/*.lo plugins/*/*.moc plugins/*/*.bak + for dir in $(shell echo $(PLUGIN_OBJ) $(BUILTIN_OBJ) | sed 's@\([^ ]*\)/[^ ]*@\1@g' ) ; do ( PARENT=`pwd` ; cd $${dir} && $(MAKE) -f $$PARENT/Makefile.modules clean PARENT=$$PARENT ) ; done vlc-clean: rm -f $(C_OBJ) $(CPP_OBJ) rm -f vlc gnome-vlc gvlc kvlc qvlc vlc.exe rm -Rf vlc.app +mozilla-clean: + -cd mozilla && $(MAKE) clean + distclean: clean -cd po && $(MAKE) maintainer-clean rm -f **/*.o **/*~ *.log - rm -f Makefile.opts + rm -f Makefile.opts Makefile.config 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 config*status config*cache config*log conftest* rm -f gmon.out core build-stamp rm -Rf .dep rm -f .gdb_history @@ -254,9 +159,9 @@ distclean: clean # # Install/uninstall rules # -install: libdvdcss-install vlc-install plugins-install po-install +install: vlc-install plugins-install builtins-install libvlc-install po-install mozilla-install -uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall po-uninstall +uninstall: vlc-uninstall plugins-uninstall builtins-uninstall libvlc-uninstall po-uninstall mozilla-uninstall vlc-install: mkdir -p $(DESTDIR)$(bindir) @@ -264,34 +169,63 @@ vlc-install: ifneq (,$(ALIASES)) for alias in $(ALIASES) ; do if test $$alias ; then rm -f $(DESTDIR)$(bindir)/$$alias && ln -s vlc $(DESTDIR)$(bindir)/$$alias ; fi ; done endif - mkdir -p $(DESTDIR)$(datadir)/videolan - $(INSTALL) -m 644 share/*.psf $(DESTDIR)$(datadir)/videolan - $(INSTALL) -m 644 share/*.png $(DESTDIR)$(datadir)/videolan - $(INSTALL) -m 644 share/*.xpm $(DESTDIR)$(datadir)/videolan + mkdir -p $(DESTDIR)$(datadir)/vlc + $(INSTALL) -m 644 share/*.psf $(DESTDIR)$(datadir)/vlc + $(INSTALL) -m 644 share/*.png $(DESTDIR)$(datadir)/vlc + $(INSTALL) -m 644 share/*.xpm $(DESTDIR)$(datadir)/vlc vlc-uninstall: rm -f $(DESTDIR)$(bindir)/vlc ifneq (,$(ALIASES)) for alias in $(ALIASES) ; do if test $$alias ; then rm -f $(DESTDIR)$(bindir)/$$alias ; fi ; done endif - rm -f $(DESTDIR)$(datadir)/videolan/*.psf - rm -f $(DESTDIR)$(datadir)/videolan/*.png - rm -f $(DESTDIR)$(datadir)/videolan/*.xpm + rm -f $(DESTDIR)$(datadir)/vlc/*.psf + rm -f $(DESTDIR)$(datadir)/vlc/*.png + rm -f $(DESTDIR)$(datadir)/vlc/*.xpm + -rmdir $(DESTDIR)$(datadir)/vlc plugins-install: - mkdir -p $(DESTDIR)$(libdir)/videolan/vlc + mkdir -p $(DESTDIR)$(libdir)/vlc ifneq (,$(PLUGINS)) - $(INSTALL) -m 644 $(PLUGINS:%=plugins/%.so) $(DESTDIR)$(libdir)/videolan/vlc + $(INSTALL) $(PLUGINS:%=modules/%.so) $(DESTDIR)$(libdir)/vlc endif plugins-uninstall: - rm -f $(DESTDIR)$(libdir)/videolan/vlc/*.so + rm -f $(DESTDIR)$(libdir)/vlc/*.so + -rmdir $(DESTDIR)$(libdir)/vlc -libdvdcss-install: - -cd extras/libdvdcss && $(MAKE) install +builtins-install: + mkdir -p $(DESTDIR)$(libdir)/vlc +ifneq (,$(BUILTINS)) + $(INSTALL) -m 644 $(BUILTINS:%=modules/%.a) $(DESTDIR)$(libdir)/vlc +endif + +builtins-uninstall: + rm -f $(DESTDIR)$(libdir)/vlc/*.a + -rmdir $(DESTDIR)$(libdir)/vlc -libdvdcss-uninstall: - -cd extras/libdvdcss && $(MAKE) uninstall +libvlc-install: + mkdir -p $(DESTDIR)$(bindir) + $(INSTALL) vlc-config $(DESTDIR)$(bindir) + mkdir -p $(DESTDIR)$(includedir)/vlc + $(INSTALL) -m 644 include/vlc/*.h $(DESTDIR)$(includedir)/vlc + mkdir -p $(DESTDIR)$(libdir) + $(INSTALL) -m 644 lib/libvlc.a $(DESTDIR)$(libdir) + +libvlc-uninstall: + rm -f $(DESTDIR)$(bindir)/vlc-config + rm -Rf $(DESTDIR)$(includedir)/vlc + rm -f $(DESTDIR)$(libdir)/libvlc.a + +mozilla-install: +ifeq ($(MOZILLA),1) + -cd mozilla && $(MAKE) install +endif + +mozilla-uninstall: +ifeq ($(MOZILLA),1) + -cd mozilla && $(MAKE) uninstall +endif po-install: -cd po && $(MAKE) install @@ -302,7 +236,7 @@ po-uninstall: # # Package generation rules # -snapshot-common: +dist: # Check that tmp isn't in the way @if test -e tmp; then \ echo "Error: please remove ./tmp, it is in the way"; false; \ @@ -316,11 +250,14 @@ snapshot-common: rm -Rf tmp/vlc/tmp find debian -mindepth 1 -maxdepth 1 -type d | \ while read i ; do rm -Rf tmp/vlc/$$i ; done - # Copy .c .h .in .cpp and .glade files - find include src plugins -type f -name '*.[chig]*' | while read i ; \ + # Copy .c .h .in .cpp .m and .glade files + find include src modules -type f -name '*.[bcdhigmrst]*' | while read i ; \ do cp $$i tmp/vlc/$$i ; done + # Grmbl... special case... + for i in API BUGS DESIGN TODO ; \ + do cp modules/mad/$$i tmp/vlc/modules/mad ; done # Copy plugin Makefiles - find plugins -type f -name Makefile | while read i ; \ + find modules -type f -name Makefile | while read i ; \ do cp $$i tmp/vlc/$$i ; done # Copy extra programs and documentation cp -a extras/* tmp/vlc/extras @@ -329,13 +266,14 @@ snapshot-common: -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 + cp po/ChangeLog po/vlc.pot 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 acconfig.h aclocal.m4 mkinstalldirs \ + ABOUT-NLS BUGS MODULES vlc.spec \ + Makefile Makefile.*.in Makefile.dep Makefile.modules \ + configure configure.in install-sh install-win32 macosx-dmg \ + config.sub config.guess aclocal.m4 mkinstalldirs \ tmp/vlc/ # Copy Debian control files for file in debian/*dirs debian/*docs debian/*menu debian/*desktop \ @@ -343,43 +281,16 @@ snapshot-common: for file in control changelog rules ; do \ cp debian/$$file tmp/vlc/debian/ ; done # Copy ipkg control files - for file in control rules ; do \ + for file in control rules patch ; do \ cp ipkg/$$file tmp/vlc/ipkg/ ; done # Copy fonts and icons - for file in share/*png share/*xpm share/*psf ; do \ + for file in share/*vlc* share/*psf; do \ cp $$file tmp/vlc/share ; done - for file in vlc_beos.rsrc vlc.icns gvlc_win32.ico vlc_win32_rc.rc ; do \ - cp share/$$file tmp/vlc/share/ ; done - -snapshot: snapshot-common # Build archives - F=vlc-${VLC_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 . - # Clean up - 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}' \ - > tmp/vlc/debian/rules - chmod +x tmp/vlc/debian/rules - # Build css-disabled archives - F=vlc-${VLC_QUICKVERSION}; G=vlc-${VLC_QUICKVERSION}-nocss; \ - mv tmp/vlc tmp/$$F; (cd tmp ; tar cf $$G.tar $$F); \ - bzip2 -f -9 < tmp/$$G.tar > $$G.tar.bz2; \ - gzip -f -9 tmp/$$G.tar ; mv tmp/$$G.tar.gz . + F=vlc-${VERSION}; \ + mv tmp/vlc tmp/$$F; (cd tmp ; \ + cd $$F && $(MAKE) distclean && cd .. ; \ + tar czf ../$$F.tar.gz $$F); # Clean up rm -Rf tmp @@ -394,21 +305,26 @@ package-win32: echo "OK."; mkdir tmp; \ fi # Create installation script - sed -e 's#@VERSION@#'${VLC_QUICKVERSION}'#' < install-win32 > tmp/nsi + cp 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 ; \ - do cp ${DLL_PATH}/$$file tmp/ ; done + cp vlc.exe tmp/ + $(STRIP) tmp/vlc.exe + 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 + mkdir tmp/modules + cp $(PLUGINS:%=modules/%.so) tmp/modules/ + # don't include these two + #rm -f tmp/modules/gtk.so tmp/modules/sdl.so +ifneq (,$(PLUGINS)) + for i in $(PLUGINS) ; do if test $$i != intfwin ; then $(STRIP) tmp/modules/$$i.so ; fi ; done +endif mkdir tmp/share for file in default8x16.psf default8x9.psf ; \ do cp share/$$file tmp/share/ ; done # Create package - wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe /CD tmp/nsi - mv tmp/vlc-${VLC_QUICKVERSION}.exe \ - vlc-${VLC_QUICKVERSION}-win32-installer.exe + wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} /CD tmp/nsi # Clean up rm -Rf tmp @@ -424,54 +340,40 @@ 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/ + strip tmp/vlc/vlc + xres -o tmp/vlc/vlc ./share/vlc_beos.rsrc + cp AUTHORS COPYING ChangeLog README FAQ TODO tmp/vlc/ for file in default8x16.psf default8x9.psf ; \ do cp share/$$file tmp/vlc/share/ ; done + mkdir tmp/vlc/modules + cp $(PLUGINS:%=modules/%.so) tmp/vlc/modules/ + strip $(PLUGINS:%=tmp/vlc/modules/%.so) # Create package - 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-x86.zip . + mv tmp/vlc tmp/vlc-${VERSION} + (cd tmp ; find vlc-${VERSION} | \ + zip -9 -@ vlc-${VERSION}-BeOS-x86.zip ) + mv tmp/vlc-${VERSION}-BeOS-x86.zip . # 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 README.MacOSX.rtf FAQ TODO tmp/ + + # Create disk image + ./macosx-dmg 0 "vlc-${VERSION}" tmp/* + # Clean up rm -Rf tmp -deb: - dpkg-buildpackage -rfakeroot -us -uc - # # Gtk/Gnome/* aliases and OS X application # @@ -479,16 +381,16 @@ 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' + cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t' | grep -v "^$$" cp -r extras/MacOSX/build/vlc.bundle ./vlc.app $(INSTALL) -d vlc.app/Contents/MacOS/share - $(INSTALL) -d vlc.app/Contents/MacOS/plugins + $(INSTALL) -d vlc.app/Contents/MacOS/modules $(INSTALL) vlc vlc.app/Contents/MacOS/ ifneq (,$(PLUGINS)) - $(INSTALL) $(PLUGINS:%=plugins/%.so) vlc.app/Contents/MacOS/plugins + $(INSTALL) $(PLUGINS:%=modules/%.so) vlc.app/Contents/MacOS/modules endif $(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share endif @@ -498,14 +400,12 @@ FORCE: # # Generic rules (see below) # -$(H_OBJ): Makefile.opts Makefile.dep Makefile -# @echo "regenerating $@" +src/misc/modules_builtin.h: Makefile.opts Makefile Makefile.config + @echo "make[$(MAKELEVEL)]: Creating \`$@'" @rm -f $@ && cp $@.in $@ ifneq (,$(BUILTINS)) @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* );" >>$@; \ + echo "int vlc_entry__"`basename $$i`"( module_t* );" >>$@; \ done @echo "" >> $@ ; endif @@ -514,11 +414,11 @@ endif @echo " { \\" >> $@ ; ifneq (,$(BUILTINS)) @for i in $(BUILTINS) ; do \ - echo " ALLOCATE_BUILTIN("$$i"); \\" >> $@ ; \ + echo " ALLOCATE_BUILTIN("`basename $$i`"); \\" >> $@ ; \ done +endif @echo " } while( 0 );" >> $@ ; @echo "" >> $@ ; -endif $(C_DEP): %.d: FORCE @$(MAKE) -s --no-print-directory -f Makefile.dep $@ @@ -526,15 +426,23 @@ $(C_DEP): %.d: FORCE $(CPP_DEP): %.dpp: FORCE @$(MAKE) -s --no-print-directory -f Makefile.dep $@ -$(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile $(H_OBJ) +$(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile +$(C_OBJ): %.o: $(H_OBJ) $(C_OBJ): %.o: .dep/%.d $(C_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $< + $(CC) $(CFLAGS) $(vlc_CFLAGS) -c -o $@ $< $(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile +$(CPP_OBJ): %.o: $(H_OBJ) $(CPP_OBJ): %.o: .dep/%.dpp $(CPP_OBJ): %.o: %.cpp - $(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $< + $(CC) $(CFLAGS) $(vlc_CFLAGS) -c -o $@ $< + +$(M_OBJ): %.o: Makefile.opts Makefile.dep Makefile +$(M_OBJ): %.o: $(H_OBJ) +$(M_OBJ): %.o: .dep/%.dm +$(M_OBJ): %.o: %.m + $(CC) $(CFLAGS) $(vlc_CFLAGS) -c -o $@ $< $(RESOURCE_OBJ): %.o: Makefile.dep Makefile ifneq (,(findstring mingw32,$(SYS))) @@ -545,38 +453,41 @@ endif # # Main application target # -vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ) - $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) +vlc: Makefile.config Makefile.opts Makefile.dep Makefile $(VLC_OBJ) lib/libvlc.a $(BUILTIN_OBJ) + $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) lib/libvlc.a $(LDFLAGS) $(vlc_LDFLAGS) $(BUILTIN_OBJ) $(builtins_LDFLAGS) ifeq ($(SYS),beos) xres -o $@ ./share/vlc_beos.rsrc mimeset -f $@ endif # -# Plugins target +# Main library target # -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) -f ../../Makefile.modules $(@:plugins/%=../%) +lib/libvlc.a: Makefile.opts Makefile.dep Makefile $(LIBVLC_OBJ) + rm -f $@ + ar rc $@ $(LIBVLC_OBJ) + $(RANLIB) $@ # -# Built-in modules target +# DO NOT DISTRIBUTE SHARED VERSIONS OF LIBVLC UNTIL THE ABI IS STABLE +# OR BURN IN HELL -- Sam # +#lib/libvlc.so: Makefile.opts Makefile.dep Makefile $(LIBVLC_OBJ) +# $(CC) -shared $(LIBVLC_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) -o $@ + 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/%=../%) +plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ) -# -# libdvdcss target -# -libdvdcss: Makefile.opts - @cd extras/libdvdcss && $(MAKE) +modules/%.a modules/%.so: $(H_OBJ) FORCE + @cd $(shell echo $@ | sed -e 's@\(.*\)/.*@\1@') && $(MAKE) -f $(shell echo $@ | sed -e 's@[^/]*/@../@g' -e 's@\(.*\)/.*@\1@')/Makefile.modules $(shell echo $@ | sed -e 's@.*/@@') PARENT=$(shell echo $@ | sed -e 's@[^/]*/@../@g' -e 's@\(.*\)/.*@\1@') # -# libdvdread target +# Mozilla plugin target # -libdvdread: Makefile.opts - @cd extras/libdvdread && $(MAKE) +mozilla/libvlcplugin.so: FORCE +ifeq ($(MOZILLA),1) + @cd mozilla && $(MAKE) builtins_LDFLAGS="$(builtins_LDFLAGS)" +endif # # gettext target