]> git.sesse.net Git - vlc/blobdiff - Makefile
* ./BUGS: added a list of known bugs. Please add your findings!
[vlc] / Makefile
index 6e41c550b8d1edc1e660051924ca8957896ed1a9..5d6b62419c76e43696c2c5b7252901ad3e55ed42 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,44 +13,129 @@ endif
 # 
 # All possible plugin directories, needed for make clean
 #
-PLUGINS_DIR := alsa beos darwin directx dsp dummy dvd esd fb ggi glide gtk downmix idct imdct kde macosx mga motion mpeg qt sdl text x11 yuv
-
-#
-# All possible plugin objects
-#
-PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin directx/directx dsp/dsp dummy/dummy dummy/null dvd/dvd esd/esd fb/fb ggi/ggi glide/glide gtk/gnome gtk/gtk downmix/downmix downmix/downmixsse downmix/downmix3dn idct/idct idct/idctclassic idct/idctmmx idct/idctmmxext imdct/imdct imdct/imdct3dn imdct/imdctsse kde/kde macosx/macosx mga/mga motion/motion motion/motionmmx motion/motionmmxext mpeg/es mpeg/ps mpeg/ts qt/qt sdl/sdl text/ncurses text/rc x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx
+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_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 \
+               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
 
 #
 # 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
+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
-AC3_DECODER := ac3_decoder_thread ac3_decoder ac3_parse ac3_exponent ac3_bit_allocate ac3_mantissa ac3_rematrix ac3_imdct
-AC3_SPDIF := ac3_spdif ac3_iec958
-LPCM_DECODER := lpcm_decoder_thread
-AUDIO_DECODER := audio_decoder adec_generic adec_layer1 adec_layer2 adec_math
-SPU_DECODER := spu_decoder
-VIDEO_DECODER := video_parser vpar_headers vpar_blocks vpar_synchro vpar_pool video_decoder
-MISC := mtime tests modules netutils
+MISC := mtime modules netutils iso_lang
 
 C_OBJ :=       $(INTERFACE:%=src/interface/%.o) \
                $(INPUT:%=src/input/%.o) \
                $(VIDEO_OUTPUT:%=src/video_output/%.o) \
                $(AUDIO_OUTPUT:%=src/audio_output/%.o) \
-               $(AC3_DECODER:%=src/ac3_decoder/%.o) \
-               $(AC3_SPDIF:%=src/ac3_spdif/%.o) \
-               $(LPCM_DECODER:%=src/lpcm_decoder/%.o) \
-               $(AUDIO_DECODER:%=src/audio_decoder/%.o) \
-               $(SPU_DECODER:%=src/spu_decoder/%.o) \
-               $(VIDEO_DECODER:%=src/video_decoder/%.o) \
                $(MISC:%=src/misc/%.o)
 
 #
 # Misc Objects
 # 
-ifeq ($(GETOPT),1)
+ifeq ($(NEED_GETOPT),1)
 C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o 
 endif
 
@@ -63,14 +148,35 @@ C_OBJ +=   src/misc/darwin_specific.o
 endif
 
 ifneq (,$(findstring mingw32,$(SYS)))
+C_OBJ +=       src/misc/win32_specific.o
 RESOURCE_OBJ :=        share/vlc_win32_rc.o
 endif
 
+VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
+
 #
 # Generated header
 #
 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
 #
@@ -90,8 +196,8 @@ endif
 #
 # Misc variables
 #
-VLC_QUICKVERSION := $(shell grep 'VLC_VERSION=' configure.in | cut -f2 -d=)
-LIBDVDCSS_QUICKVERSION := $(shell grep 'LIBDVDCSS_VERSION=' configure.in | 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
@@ -104,22 +210,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
-
-# Include Makefile.opts again in case we just generated it
-ifneq (1,$(HAVE_MAKEFILE_OPTS))
-    -include Makefile.opts
-endif
+       @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 PLDFLAGS: $(PLDFLAGS)
        @echo C_OBJ: $(C_OBJ)
        @echo CPP_OBJ: $(CPP_OBJ)
        @echo PLUGIN_OBJ: $(PLUGIN_OBJ)
@@ -128,18 +234,26 @@ 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
+       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} && $(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)
@@ -147,9 +261,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
@@ -159,9 +274,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)
@@ -175,7 +290,7 @@ endif
        $(INSTALL) -m 644 share/*.xpm $(DESTDIR)$(datadir)/videolan
 
 vlc-uninstall:
-       rm vlc $(DESTDIR)$(bindir)/vlc
+       rm -f $(DESTDIR)$(bindir)/vlc
 ifneq (,$(ALIASES))
        for alias in $(ALIASES) ; do if test $$alias ; then rm -f $(DESTDIR)$(bindir)/$$alias ; fi ; done
 endif
@@ -198,90 +313,166 @@ libdvdcss-install:
 libdvdcss-uninstall:
        -cd extras/libdvdcss && $(MAKE) uninstall
 
+po-install:
+       -cd po && $(MAKE) install
+
+po-uninstall:
+       -cd po && $(MAKE) uninstall
+
 #
 # Package generation rules
 #
-snapshot-common: clean
-       rm -Rf /tmp/vlc
-       # Copy directory structure in /tmp
-       find -type d | grep -v CVS | grep -v '\.dep' | while read i ; \
-               do mkdir -p /tmp/vlc/$$i ; \
+snapshot-common:
+       # 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 directory structure in tmp
+       find -type d | grep -v '\(\.dep\|snapshot\|CVS\)' | while read i ; \
+               do mkdir -p tmp/vlc/$$i ; \
        done
+       rm -Rf tmp/vlc/tmp
        find debian -mindepth 1 -maxdepth 1 -type d | \
-               while read i ; do rm -Rf /tmp/vlc/$$i ; done
+               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 ; \
-               do cp $$i /tmp/vlc/$$i ; done
+               do cp $$i tmp/vlc/$$i ; done
        # Copy plugin Makefiles
        find plugins -type f -name Makefile | while read i ; \
-               do cp $$i /tmp/vlc/$$i ; done
+               do cp $$i tmp/vlc/$$i ; done
        # Copy extra programs and documentation
-       cp -a extras/* /tmp/vlc/extras
-       cp -a doc/* /tmp/vlc/doc
-       find /tmp/vlc/extras /tmp/vlc/doc \
-               -type d -name CVS -o -type f -name '.*' | while read i ; \
-                       do rm -Rf $$i ; done
+       cp -a extras/* tmp/vlc/extras
+       cp -a doc/* tmp/vlc/doc
+       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 vlc.spec AUTHORS COPYING TODO todo.pl ChangeLog README* INSTALL* \
+       cp FAQ AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \
                Makefile Makefile.opts.in Makefile.dep Makefile.modules \
-               configure configure.in install-sh config.sub config.guess \
-                       /tmp/vlc/
+               configure configure.in install-sh install-win32 vlc.spec \
+               config.sub config.guess acconfig.h aclocal.m4 mkinstalldirs \
+                       tmp/vlc/
        # Copy Debian control files
-       for file in debian/*dirs debian/*menu debian/*desktop ; do \
-               cp $$file /tmp/vlc/debian ; done
-       for file in control changelog rules vlc.copyright vlc.docs ; do \
-               cp debian/$$file /tmp/vlc/debian/ ; done
+       for file in debian/*dirs debian/*docs debian/*menu debian/*desktop \
+               debian/*copyright ; do cp $$file tmp/vlc/debian ; done
+       for file in control changelog rules ; do \
+               cp debian/$$file tmp/vlc/debian/ ; done
+       # Copy ipkg control files
+       for file in control rules ; do \
+               cp ipkg/$$file tmp/vlc/ipkg/ ; done
        # Copy fonts and icons
        for file in share/*png share/*xpm share/*psf ; do \
-               cp $$file /tmp/vlc/share ; done
+               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
+                       cp share/$$file tmp/vlc/share/ ; done
 
 snapshot: snapshot-common
-       # Build archives and clean up
+       # Build archives
        F=vlc-${VLC_QUICKVERSION}; \
-       rm -Rf /tmp/$$F ; mv /tmp/vlc /tmp/$$F; \
-       (cd /tmp ; tar cf $$F.tar $$F ; bzip2 -f -9 < $$F.tar > $$F.tar.bz2; \
-               gzip -f -9 $$F.tar ); mv /tmp/$$F.tar.gz /tmp/$$F.tar.bz2 ..; \
-       rm -Rf /tmp/$$F
+       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
+       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
+       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
+               > 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 and clean up
+               > tmp/vlc/debian/rules
+       chmod +x tmp/vlc/debian/rules
+       # Build css-disabled archives
        F=vlc-${VLC_QUICKVERSION}; G=vlc-${VLC_QUICKVERSION}-nocss; \
-       rm -Rf /tmp/$$F ; mv /tmp/vlc /tmp/$$F; \
-       (cd /tmp ; tar cf $$G.tar $$F ; bzip2 -f -9 < $$G.tar > $$G.tar.bz2; \
-               gzip -f -9 $$G.tar ); mv /tmp/$$G.tar.gz /tmp/$$G.tar.bz2 ..; \
-       rm -Rf /tmp/$$F
+       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 .
+       # Clean up
+       rm -Rf tmp
+
+package-win32:
+       # XXX: this rule is probably only useful to you if you have exactly
+       # the same setup as me. Contact sam@zoy.org if you need to use it.
+       #
+       # 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
+       # Create installation script
+       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 ; \
+                       do cp ${DLL_PATH}/$$file tmp/ ; done
+       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
+       # Clean up
+       rm -Rf tmp
+
+package-beos:
+       # 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
+       
+       # Create dir
+       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/
+       for file in default8x16.psf default8x9.psf ; \
+               do cp share/$$file tmp/vlc/share/ ; done
+       # 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 .
+       # 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_app
-       rm -Rf /tmp/vlc/debian
+       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.in common.h int_types.h ; \
-               do cp include/$$file /tmp/vlc/include/ ; done
+       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
+       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
+       rm -f tmp/vlc/Makefile
        sed -e 's#^install:#install-unused:#' \
                -e 's#^uninstall:#uninstall-unused:#' \
                -e 's#^clean:#clean-unused:#' \
@@ -289,13 +480,14 @@ libdvdcss-snapshot: snapshot-common
                -e 's#^libdvdcss-install:#install:#' \
                -e 's#^libdvdcss-uninstall:#uninstall:#' \
                -e 's#^libdvdcss-clean:#clean:#' \
-               < Makefile > /tmp/vlc/Makefile
-       # Build archives and clean up
+               < Makefile > tmp/vlc/Makefile
+       # Build archives
        F=libdvdcss-${LIBDVDCSS_QUICKVERSION}; \
-       rm -Rf /tmp/$$F ; mv /tmp/vlc /tmp/$$F; \
-       (cd /tmp ; tar cf $$F.tar $$F ; bzip2 -f -9 < $$F.tar > $$F.tar.bz2; \
-               gzip -f -9 $$F.tar ); mv /tmp/$$F.tar.gz /tmp/$$F.tar.bz2 ..; \
-       rm -Rf /tmp/$$F
+       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
@@ -310,13 +502,11 @@ gnome-vlc gvlc kvlc qvlc: vlc
 vlc.app: Makefile.opts
 ifneq (,$(findstring darwin,$(SYS)))
        rm -Rf vlc.app
-       mkdir -p vlc.app/Contents/Resources
-       mkdir -p vlc.app/Contents/MacOS/lib
-       mkdir -p vlc.app/Contents/MacOS/share
-       $(INSTALL) -m 644 extras/MacOSX_app/Contents/Info.plist vlc.app/Contents/
-       $(INSTALL) -m 644 extras/MacOSX_app/Contents/PkgInfo vlc.app/Contents/
+       cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t'
+       cp -r extras/MacOSX/build/vlc.bundle ./vlc.app
+       $(INSTALL) -d vlc.app/Contents/MacOS/share
+       $(INSTALL) -d vlc.app/Contents/MacOS/plugins
        $(INSTALL) vlc vlc.app/Contents/MacOS/
-       $(INSTALL) share/vlc.icns vlc.app/Contents/Resources/
 ifneq (,$(PLUGINS))
        $(INSTALL) $(PLUGINS:%=plugins/%.so) vlc.app/Contents/MacOS/plugins
 endif
@@ -328,38 +518,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 "" >> $@ ;
+       @echo "    } while( 0 );" >> $@ ;
+       @echo "" >> $@ ;
 endif
 
+$(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)))
@@ -370,8 +567,8 @@ endif
 #
 # Main application target
 #
-vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) plugins
-       $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_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 $@
@@ -382,18 +579,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)