]> git.sesse.net Git - vlc/blobdiff - Makefile
Documentation updates.
[vlc] / Makefile
index 9ff7b72e9443e77facac3ddc42e005554c11092a..78df89177649be8eb17130a5bee2f781f922841d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,9 @@
 # vlc (VideoLAN Client) main Makefile - (c)1998 VideoLAN
 ###############################################################################
 
--include Makefile.opts
+ifeq ($(shell [ ! -r Makefile.opts ] && echo 1),)
+    include Makefile.opts
+endif
 
 ###############################################################################
 # Objects and files
 # 
 # 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
+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 \
+               vcd \
+               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_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 \
+               idct/idctaltivec \
+               imdct/imdct \
+               imdct/imdct3dn \
+               imdct/imdctsse \
+               kde/kde \
+               macosx/macosx \
+               macosx/macosx_qt \
+               mga/mga \
+               motion/motion \
+               motion/motionmmx \
+               motion/motionmmxext \
+               motion/motion3dnow \
+               motion/motionaltivec \
+               mpeg/es \
+               mpeg/ps \
+               mpeg/ts \
+               qt/qt \
+               sdl/sdl \
+               text/ncurses \
+               text/rc \
+               vcd/vcd \
+               x11/x11 \
+               x11/xvideo \
+               yuv/yuv \
+               yuv/yuvmmx
 
 #
 # C Objects
@@ -30,10 +102,8 @@ 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
-#GEN_DECODER := generic_decoder
-VIDEO_PARSER := video_parser vpar_headers vpar_blocks vpar_synchro video_fifo
-VIDEO_DECODER := video_decoder
-MISC := mtime tests modules netutils
+VIDEO_DECODER := video_parser vpar_headers vpar_blocks vpar_synchro vpar_pool video_decoder
+MISC := mtime tests modules netutils iso_lang
 
 C_OBJ :=       $(INTERFACE:%=src/interface/%.o) \
                $(INPUT:%=src/input/%.o) \
@@ -44,15 +114,13 @@ C_OBJ :=   $(INTERFACE:%=src/interface/%.o) \
                $(LPCM_DECODER:%=src/lpcm_decoder/%.o) \
                $(AUDIO_DECODER:%=src/audio_decoder/%.o) \
                $(SPU_DECODER:%=src/spu_decoder/%.o) \
-               $(GEN_DECODER:%=src/generic_decoder/%.o) \
-               $(VIDEO_PARSER:%=src/video_parser/%.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
 
@@ -68,6 +136,8 @@ ifneq (,$(findstring mingw32,$(SYS)))
 RESOURCE_OBJ :=        share/vlc_win32_rc.o
 endif
 
+VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
+
 #
 # Generated header
 #
@@ -89,6 +159,13 @@ ifneq (,$(BUILTINS))
 BUILTIN_OBJ := $(shell for i in $(BUILTINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.*/\('$$i'\) .*@plugins/\1.a@' -e 's@^ .*@@' ; done)
 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=)
+
+
 # All symbols must be exported
 export
 
@@ -99,15 +176,37 @@ export
 #
 # Virtual targets
 #
-all: vlc ${ALIASES} plugins vlc.app
+all: Makefile.opts vlc ${ALIASES} vlc.app
+
+Makefile.opts:
+       @echo "**** No configuration found, running ./configure..."
+       ./configure
+       $(MAKE) $(MAKECMDGOALS)
+       exit
 
+show:
+       @echo CC: $(CC)
+       @echo CFLAGS: $(CFLAGS)
+       @echo DCFLAGS: $(DCFLAGS)
+       @echo LCFLAGS: $(LCFLAGS)
+       @echo PCFLAGS: $(PCFLAGS)
+       @echo PLCFLAGS: $(PLCFLAGS)
+       @echo C_OBJ: $(C_OBJ)
+       @echo CPP_OBJ: $(CPP_OBJ)
+       @echo PLUGIN_OBJ: $(PLUGIN_OBJ)
+       @echo BUILTIN_OBJ: $(BUILTIN_OBJ)
+
+#
+# Cleaning rules
+#
 clean: libdvdcss-clean plugins-clean vlc-clean
        rm -f src/*/*.o extras/*/*.o
-       rm -f lib/*.so lib/*.so.* lib/*.a
-       rm -f plugins/*.so plugins/*.so.* plugins/*.a
+       rm -f lib/*.so* lib/*.a
+       rm -f plugins/*.so plugins/*.a
+       rm -rf extras/MacOSX/build
 
 libdvdcss-clean:
-       cd extras/libdvdcss && $(MAKE) clean
+       -cd extras/libdvdcss && $(MAKE) clean
 
 plugins-clean:
        for dir in $(PLUGINS_DIR) ; do \
@@ -116,7 +215,7 @@ plugins-clean:
 
 vlc-clean:
        rm -f $(C_OBJ) $(CPP_OBJ)
-       rm -f vlc gnome-vlc gvlc kvlc qvlc
+       rm -f vlc gnome-vlc gvlc kvlc qvlc vlc.exe
        rm -Rf vlc.app
 
 distclean: clean
@@ -129,8 +228,13 @@ distclean: clean
        rm -Rf .dep
        rm -f .gdb_history
 
+#
+# Install/uninstall rules
+#
 install: libdvdcss-install vlc-install plugins-install
 
+uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall
+
 vlc-install:
        mkdir -p $(DESTDIR)$(bindir)
        $(INSTALL) vlc $(DESTDIR)$(bindir)
@@ -142,134 +246,186 @@ endif
        $(INSTALL) -m 644 share/*.png $(DESTDIR)$(datadir)/videolan
        $(INSTALL) -m 644 share/*.xpm $(DESTDIR)$(datadir)/videolan
 
+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
+
 plugins-install:
        mkdir -p $(DESTDIR)$(libdir)/videolan/vlc
 ifneq (,$(PLUGINS))
        $(INSTALL) -m 644 $(PLUGINS:%=plugins/%.so) $(DESTDIR)$(libdir)/videolan/vlc
 endif
 
-libdvdcss-install:
-       cd extras/libdvdcss && $(MAKE) install
+plugins-uninstall:
+       rm -f $(DESTDIR)$(libdir)/videolan/vlc/*.so
 
-show:
-       @echo CC: $(CC)
-       @echo CFLAGS: $(CFLAGS)
-       @echo DCFLAGS: $(DCFLAGS)
-       @echo LCFLAGS: $(LCFLAGS)
-       @echo C_OBJ: $(C_OBJ)
-       @echo CPP_OBJ: $(CPP_OBJ)
-       @echo objects: $(objects)
-       @echo cppobjects: $(cppobjects)
-       @echo PLUGIN_OBJ: $(PLUGIN_OBJ)
-       @echo BUILTIN_OBJ: $(BUILTIN_OBJ)
+libdvdcss-install:
+       -cd extras/libdvdcss && $(MAKE) install
 
+libdvdcss-uninstall:
+       -cd extras/libdvdcss && $(MAKE) uninstall
 
-# ugliest of all, but I have no time to do it -- sam
-snapshot: clean Makefile.opts
-       rm -Rf /tmp/vlc-${PROGRAM_VERSION}* /tmp/vlc-${PROGRAM_VERSION}nocss*
-       # copy archive in /tmp
-       find -type d | grep -v CVS | grep -v '\.dep' | while read i ; \
-               do mkdir -p /tmp/vlc-${PROGRAM_VERSION}/$$i ; \
+#
+# Package generation rules
+#
+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-${PROGRAM_VERSION}/$$i ; done
-       # .c .h .in .cpp .glade
+               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-${PROGRAM_VERSION}/$$i ; done
-       # Makefiles
-       find . plugins -type f -name Makefile | while read i ; \
-               do cp $$i /tmp/vlc-${PROGRAM_VERSION}/$$i ; done
-       # extra files
-       cp -a extras/* /tmp/vlc-${PROGRAM_VERSION}/extras
-       cp -a doc/* /tmp/vlc-${PROGRAM_VERSION}/doc
-       find /tmp/vlc-${PROGRAM_VERSION}/extras \
-               /tmp/vlc-${PROGRAM_VERSION}/doc \
-               -type d -name CVS | while read i ; \
-                       do rm -Rf $$i ; \
-               done
-       # copy misc files
-       cp vlc.spec AUTHORS COPYING ChangeLog INSTALL INSTALL.libdvdcss \
-               README TODO todo.pl \
-               Makefile.opts.in Makefile.dep Makefile.modules \
+               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
+       # 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 -name '.*' -o -name '*.[o]' | \
+                       while read i ; do rm -Rf $$i ; done
+       # Copy misc files
+       cp vlc.spec 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-${PROGRAM_VERSION}/
-       for file in control control-css vlc-gtk.menu vlc.copyright vlc.docs \
-               changelog changelog-css rules rules-css vlc.dirs vlc.desktop \
-               gvlc.desktop gnome-vlc.desktop vlc.menu ; do \
-                       cp debian/$$file /tmp/vlc-${PROGRAM_VERSION}/debian/ ; \
-               done
-       for file in default8x16.psf default8x9.psf vlc_beos.rsrc vlc.icns ; do \
-               cp share/$$file /tmp/vlc-${PROGRAM_VERSION}/share/ ; done
-       for icon in vlc gvlc qvlc gnome-vlc kvlc ; do \
-               cp share/$$icon.xpm share/$$icon.png \
-                       /tmp/vlc-${PROGRAM_VERSION}/share/ ; done
-
-       # build css-enabled archives
-       (cd /tmp ; tar cf vlc-${PROGRAM_VERSION}.tar vlc-${PROGRAM_VERSION} ; \
-               bzip2 -f -9 < vlc-${PROGRAM_VERSION}.tar \
-                       > vlc-${PROGRAM_VERSION}.tar.bz2 ; \
-               gzip -f -9 vlc-${PROGRAM_VERSION}.tar )
-       mv /tmp/vlc-${PROGRAM_VERSION}.tar.gz \
-               /tmp/vlc-${PROGRAM_VERSION}.tar.bz2 ..
-
-       # clean up
-       rm -Rf /tmp/vlc-${PROGRAM_VERSION}*
-
-libdvdcss-snapshot: clean Makefile.opts
-       rm -Rf /tmp/libdvdcss-${LIBDVDCSS_VERSION}* \
-               /tmp/libdvdcss-${LIBDVDCSS_VERSION}nocss*
-       # copy archive in /tmp
-       find include extras doc lib -type d | grep -v CVS | grep -v '\.dep' | \
-               while read i ; do \
-                       mkdir -p /tmp/libdvdcss-${LIBDVDCSS_VERSION}/$$i ; \
-               done
-       # .c .h .in .cpp .glade
-       find include extras -type f -name '*.[chig]*' | while read i ; \
-               do cp $$i /tmp/libdvdcss-${LIBDVDCSS_VERSION}/$$i ; done
-       # Makefiles
+                       tmp/vlc/
+       # Copy Debian control files
+       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 fonts and icons
+       for file in share/*png share/*xpm 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 .
+       # 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/directx.so plugins/gtk.so plugins/sdl.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 ../vlc-win32/$$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
+
+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
+       # 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
+       # 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/libdvdcss-${LIBDVDCSS_VERSION}/Makefile
-       # extra files
-       cp -a extras/* /tmp/libdvdcss-${LIBDVDCSS_VERSION}/extras
-       cp -a doc/* /tmp/libdvdcss-${LIBDVDCSS_VERSION}/doc
-       find /tmp/libdvdcss-${LIBDVDCSS_VERSION}/extras \
-               /tmp/libdvdcss-${LIBDVDCSS_VERSION}/doc \
-               -type d -name CVS | while read i ; \
-                       do rm -Rf $$i ; \
-               done
-       # copy misc files
-       cp AUTHORS COPYING ChangeLog INSTALL INSTALL.libdvdcss README \
-               TODO todo.pl Makefile.opts.in Makefile.dep Makefile.modules \
-               configure configure.in install-sh config.sub config.guess \
-                       /tmp/libdvdcss-${LIBDVDCSS_VERSION}/
-
-       # build css-enabled archives
-       (cd /tmp ; tar cf libdvdcss-${LIBDVDCSS_VERSION}.tar \
-               libdvdcss-${LIBDVDCSS_VERSION} ; \
-               bzip2 -f -9 < libdvdcss-${LIBDVDCSS_VERSION}.tar \
-                       > libdvdcss-${LIBDVDCSS_VERSION}.tar.bz2 ; \
-               gzip -f -9 libdvdcss-${LIBDVDCSS_VERSION}.tar )
-       mv /tmp/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz \
-               /tmp/libdvdcss-${LIBDVDCSS_VERSION}.tar.bz2 ..
+               < 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
 
-       # clean up
-       rm -Rf /tmp/libdvdcss-${LIBDVDCSS_VERSION}*
+#
+# Gtk/Gnome/* aliases and OS X application
+#
+gnome-vlc gvlc kvlc qvlc: vlc
+       rm -f $@ && ln -s vlc $@
 
 .PHONY: vlc.app
-vlc.app:
+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 vlc.app/Contents/MacOS/share
+       $(INSTALL) -d vlc 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
@@ -278,13 +434,6 @@ endif
 
 FORCE:
 
-#
-# GTK/Gnome aliases - don't add too many aliases which could bloat
-# the namespace
-#
-gnome-vlc gvlc kvlc qvlc: vlc
-       rm -f $@ && ln -s vlc $@
-
 #
 # Generic rules (see below)
 #
@@ -302,16 +451,14 @@ ifneq (,$(BUILTINS))
                echo "int module_"$$i"_ActivateModule( module_t* );" >> $@ ; \
                echo "int module_"$$i"_DeactivateModule( module_t* );" >> $@ ; \
        done
-endif
-ifneq (,$(BUILTINS))
        echo "" >> $@ ;
        printf "#define ALLOCATE_ALL_BUILTINS() do { " >> $@ ;
        for i in $(BUILTINS) ; do \
                printf "ALLOCATE_BUILTIN("$$i"); " >> $@ ; \
        done
        echo "} while( 0 );" >> $@ ;
-endif
        echo "" >> $@ ;
+endif
 
 $(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
 $(C_OBJ): %.o: .dep/%.d
@@ -332,8 +479,8 @@ endif
 #
 # Main application target
 #
-vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
-       $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) $(LCFLAGS) $(LIB)
+vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(VLC_OBJ) $(BUILTIN_OBJ) plugins
+       $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LCFLAGS)
 ifeq ($(SYS),beos)
        xres -o $@ ./share/vlc_beos.rsrc
        mimeset -f $@
@@ -344,18 +491,17 @@ 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) $(@:%=../../%)
+       cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@: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) $(@:%=../../%)
+       cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%)
 
 #
 # libdvdcss target
 #
-libdvdcss:
+libdvdcss: Makefile.opts
        cd extras/libdvdcss && $(MAKE)
-