X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=5f8046a2659e66c11f91a79b4a771123e9809e42;hb=1f95f0338d27a13ad3a01642e4829f5c6c113c48;hp=736007a3160cc6ef3da901d5b671ba010803d34e;hpb=ecbcf0b3126804a20cfc0d22f4a994cfc6cc6374;p=vlc diff --git a/Makefile b/Makefile index 736007a316..5f8046a265 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,9 @@ 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 @@ -14,12 +17,14 @@ endif # All possible plugin directories, needed for make clean # PLUGINS_DIR := a52 \ + a52_system \ aa \ ac3_adec \ ac3_spdif \ access \ alsa \ arts \ + avi \ beos \ chroma \ directx \ @@ -30,6 +35,7 @@ PLUGINS_DIR := a52 \ dvdread \ esd \ fb \ + ffmpeg \ filter \ fx \ ggi \ @@ -49,6 +55,7 @@ PLUGINS_DIR := a52 \ mpeg_adec \ mpeg_vdec \ network \ + ogg \ qnx \ qt \ satellite \ @@ -57,10 +64,12 @@ PLUGINS_DIR := a52 \ text \ vcd \ win32 \ - x11 + x11 \ + xosd PLUGINS_TARGETS := a52/a52 \ aa/aa \ + a52_system/a52_system \ ac3_adec/ac3_adec \ ac3_spdif/ac3_spdif \ access/file \ @@ -68,6 +77,7 @@ PLUGINS_TARGETS := a52/a52 \ access/http \ alsa/alsa \ arts/arts \ + avi/avi \ beos/beos \ chroma/chroma_i420_rgb \ chroma/chroma_i420_rgb_mmx \ @@ -88,11 +98,15 @@ PLUGINS_TARGETS := a52/a52 \ dvdread/dvdread \ esd/esd \ fb/fb \ + ffmpeg/ffmpeg \ + filter/filter_clone \ + filter/filter_crop \ filter/filter_deinterlace \ - filter/filter_transform \ - filter/filter_invert \ filter/filter_distort \ + filter/filter_invert \ + filter/filter_transform \ filter/filter_wall \ + filter/filter_clone \ fx/fx_scope \ ggi/ggi \ glide/glide \ @@ -123,13 +137,16 @@ PLUGINS_TARGETS := a52/a52 \ motion/motionmmxext \ motion/motion3dnow \ motion/motionaltivec \ + mpeg_system/mpeg_audio \ mpeg_system/mpeg_es \ mpeg_system/mpeg_ps \ mpeg_system/mpeg_ts \ + mpeg_system/mpeg_ts_dvbpsi \ mpeg_adec/mpeg_adec \ mpeg_vdec/mpeg_vdec \ network/ipv4 \ network/ipv6 \ + ogg/vorbis \ qnx/qnx \ qt/qt \ satellite/satellite \ @@ -140,34 +157,44 @@ PLUGINS_TARGETS := a52/a52 \ text/rc \ vcd/vcd \ win32/waveout \ - win32/win32 \ + win32/intfwin \ x11/x11 \ - x11/xvideo + x11/xvideo \ + xosd/xosd # # C Objects # -INTERFACE := main interface intf_msg intf_playlist intf_eject +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 VIDEO_OUTPUT := video_output video_text vout_pictures vout_subpictures AUDIO_OUTPUT := audio_output aout_ext-dec aout_pcm aout_spdif -MISC := mtime modules configuration netutils iso_lang +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) -C_OBJ += src/misc/symbols.o +LIBVLC_OBJ += src/misc/symbols.o endif ifeq ($(SYS),beos) @@ -175,15 +202,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 @@ -209,9 +237,7 @@ 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 @@ -223,7 +249,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" @@ -235,10 +261,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) @@ -247,21 +274,15 @@ 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} \ @@ -273,13 +294,16 @@ vlc-clean: 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 @@ -287,9 +311,9 @@ distclean: clean # # Install/uninstall rules # -install: libdvdcss-install vlc-install plugins-install po-install +install: vlc-install plugins-install po-install mozilla-install -uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall po-uninstall +uninstall: vlc-uninstall plugins-uninstall po-uninstall mozilla-uninstall vlc-install: mkdir -p $(DESTDIR)$(bindir) @@ -297,40 +321,38 @@ 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 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) -m 644 $(PLUGINS:%=plugins/%.so) $(DESTDIR)$(libdir)/vlc endif plugins-uninstall: - rm -f $(DESTDIR)$(libdir)/videolan/vlc/*.so - -libdvdcss-install: - -cd extras/libdvdcss && $(MAKE) install + rm -f $(DESTDIR)$(libdir)/vlc/*.so -libdvdcss-uninstall: - -cd extras/libdvdcss && $(MAKE) uninstall - -libdvdread-install: - -cd extras/libdvdread && $(MAKE) install +mozilla-install: +ifeq ($(MOZILLA),1) + -cd mozilla && $(MAKE) install +endif -libdvdread-uninstall: - -cd extras/libdvdread && $(MAKE) uninstall +mozilla-uninstall: +ifeq ($(MOZILLA),1) + -cd mozilla && $(MAKE) uninstall +endif po-install: -cd po && $(MAKE) install @@ -341,7 +363,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; \ @@ -355,9 +377,12 @@ 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 plugins -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 plugins/mad/$$i tmp/vlc/plugins/mad ; done # Copy plugin Makefiles find plugins -type f -name Makefile | while read i ; \ do cp $$i tmp/vlc/$$i ; done @@ -368,13 +393,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 \ @@ -382,43 +408,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 @@ -433,25 +432,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 vlc.exe tmp/ + $(STRIP) tmp/vlc.exe cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt - for file in AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \ - README README.libdvdcss FAQ TODO ; \ + 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/plugins + cp $(PLUGINS:%=plugins/%.so) tmp/plugins/ + # don't include these two + #rm -f tmp/plugins/gtk.so tmp/plugins/sdl.so +ifneq (,$(PLUGINS)) + for i in $(PLUGINS) ; do if test $$i != intfwin ; then $(STRIP) tmp/plugins/$$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 @@ -467,15 +467,19 @@ 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/plugins + cp $(PLUGINS:%=plugins/%.so) tmp/vlc/plugins/ + strip $(PLUGINS:%=tmp/vlc/plugins/%.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 @@ -489,51 +493,14 @@ package-macosx: # Copy relevant files cp -R vlc.app tmp/ - cp AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \ - README README.libdvdcss FAQ TODO tmp/ + cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf FAQ TODO tmp/ # Create disk image - ./macosx-dmg 0 "vlc-${VLC_QUICKVERSION}" tmp/* + ./macosx-dmg 0 "vlc-${VERSION}" 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 - 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 . - # Clean up - rm -Rf tmp - -deb: - dpkg-buildpackage -rfakeroot -us -uc - # # Gtk/Gnome/* aliases and OS X application # @@ -544,7 +511,7 @@ gnome-vlc gvlc kvlc qvlc: vlc 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 @@ -560,8 +527,8 @@ FORCE: # # Generic rules (see below) # -$(H_OBJ): Makefile.opts Makefile.dep Makefile -# @echo "regenerating $@" +src/misc/modules_builtin.h: Makefile.opts Makefile + @echo "make[$(MAKELEVEL)]: Creating \`$@'" @rm -f $@ && cp $@.in $@ ifneq (,$(BUILTINS)) @for i in $(BUILTINS) ; do \ @@ -592,13 +559,19 @@ $(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))) @@ -609,38 +582,50 @@ endif # # Main application target # -vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ) - $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(LIB_VLC) $(LIB_BUILTINS) $(LIB_COMMON) +vlc: Makefile.config Makefile.opts Makefile.dep Makefile $(VLC_OBJ) lib/libvlc.a $(BUILTIN_OBJ) + $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) lib/libvlc.a $(BUILTIN_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) $(builtins_LDFLAGS) ifeq ($(SYS),beos) xres -o $@ ./share/vlc_beos.rsrc mimeset -f $@ endif +# here are the rules for a dynamic link of libvlc: +#vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) lib/libvlc.so $(BUILTIN_OBJ) +# $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(builtins_LDFLAGS) -L./lib -lvlc + +# +# Main library target +# +lib/libvlc.a: Makefile.opts Makefile.dep Makefile $(LIBVLC_OBJ) + rm -f $@ + ar rc $@ $(LIBVLC_OBJ) + $(RANLIB) $@ + +#lib/libvlc.so: Makefile.opts Makefile.dep Makefile $(LIBVLC_OBJ) +# $(CC) -shared $(LIBVLC_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) -o $@ +# chmod a-x $@ + # # Plugins target # plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ) -$(PLUGIN_OBJ): FORCE +$(PLUGIN_OBJ): $(H_OBJ) FORCE @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 +$(BUILTIN_OBJ): $(H_OBJ) FORCE @cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) -f ../../Makefile.modules $(@:plugins/%=../%) # -# libdvdcss target +# Mozilla plugin target # -libdvdcss: Makefile.opts - @cd extras/libdvdcss && $(MAKE) - -# -# libdvdread 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