X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=68ea8378226045751ad0db5938ebb41672917eaa;hb=3007c6b8853dcac1d84cf978d1075d64e941a434;hp=2185b5e52242626b7a7dd801a13ba9fb3d5b0536;hpb=ee589c5962d012203a64eb63926c894360ba0bd8;p=vlc

diff --git a/Makefile b/Makefile
index 2185b5e522..68ea837822 100644
--- a/Makefile
+++ b/Makefile
@@ -1,313 +1,406 @@
-################################################################################
-# vlc (VideoLAN Client) main makefile
-# (c)1998 VideoLAN
-################################################################################
-# This makefile is the main makefile for the VideoLAN client.
-################################################################################
+###############################################################################
+# vlc (VideoLAN Client) main Makefile - (c)1998 VideoLAN
+###############################################################################
 
-################################################################################
-# Configuration
-################################################################################
-
-# Environment
-#CC = gcc
-#SHELL = /bin/sh
+ifeq ($(shell [ ! -r Makefile.opts ] && echo 1),)
+    include Makefile.opts
+endif
 
-# Video output settings
-#VIDEO=X11
-#VIDEO=DGA (not yet supported)
-VIDEO=FB
-#VIDEO=GGI
-#VIDEO=BEOS (not yet supported)
+###############################################################################
+# Objects and files
+###############################################################################
 
-# Target architecture and optimization
-#ARCH=
-ARCH=MMX
-#ARCH=PPC
+# 
+# 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
 
-# Decoder choice - ?? old decoder will be removed soon
-DECODER=old
-#DECODER=new
-# !!! don't forget to run this command after changing decoder type !!!
-# touch input/input.c input/input_ctrl.c include/vlc.h include/video_decoder.h
+#
+# 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
 
-#----------------- do not change anything below this line ----------------------
+#
+# 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
+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
+
+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)
 
-################################################################################
-# Configuration pre-processing
-################################################################################
+#
+# Misc Objects
+# 
+ifeq ($(GETOPT),1)
+C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o 
+endif
 
-# DEFINE will contain all the constants definitions decided in Makefile
-DEFINE = -DVIDEO_$(VIDEO)
+ifeq ($(SYS),beos)
+CPP_OBJ :=	src/misc/beos_specific.o
+endif
 
-# video is a lowercase version of VIDEO used for filenames
-video = $(shell echo $(VIDEO) | tr 'A-Z' 'a-z')
+ifneq (,$(findstring darwin,$(SYS)))
+C_OBJ +=	src/misc/darwin_specific.o
+endif
 
-################################################################################
-# Tunning and other variables
-################################################################################
+ifneq (,$(findstring mingw32,$(SYS)))
+RESOURCE_OBJ :=	share/vlc_win32_rc.o
+endif
 
 #
-# Transformation for video decompression (Fourier or cosine)
+# Generated header
 #
-TRANSFORM=vdec_idct
-#TRANSFORM=vdec_idft
+H_OBJ :=	src/misc/modules_builtin.h
 
 #
-# C headers directories
+# Other lists of files
 #
-INCLUDE += -Iinclude
-
-ifeq ($(VIDEO),X11)
-INCLUDE += -I/usr/X11R6/include
-endif
+C_DEP := $(C_OBJ:%.o=.dep/%.d)
+CPP_DEP := $(CPP_OBJ:%.o=.dep/%.dpp)
 
 #
-# Libraries
+# Translate plugin names
 #
-LIB += -lpthread
-LIB += -lm
-
-ifeq ($(VIDEO),X11)
-LIB += -L/usr/X11R6/lib
-LIB += -lX11
-LIB += -lXext 
+ifneq (,$(PLUGINS))
+PLUGIN_OBJ := $(shell for i in $(PLUGINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.*/\('$$i'\) .*@plugins/\1.so@' -e 's@^ .*@@' ; done)
 endif
-ifeq ($(VIDEO),GGI)
-LIB += -lggi
+ifneq (,$(BUILTINS))
+BUILTIN_OBJ := $(shell for i in $(BUILTINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.*/\('$$i'\) .*@plugins/\1.a@' -e 's@^ .*@@' ; done)
 endif
 
-# System dependant libraries
-#??LIB += -lXxf86dga
-
 #
-# C compiler flags: compilation
+# Misc variables
 #
-CCFLAGS += $(DEFINE) $(INCLUDE)
-CCFLAGS += -Wall
-CCFLAGS += -D_REENTRANT
-CCFLAGS += -D_GNU_SOURCE
-
-# Optimizations : don't compile debug versions with them
-#CCFLAGS += -g
-CCFLAGS += -O6
-CCFLAGS += -ffast-math -funroll-loops -fargument-noalias-global
-CCFLAGS += -fomit-frame-pointer
+VLC_QUICKVERSION := $(shell grep '^ *VLC_VERSION=' configure.in | cut -f2 -d=)
+LIBDVDCSS_QUICKVERSION := $(shell grep '^ *LIBDVDCSS_VERSION=' configure.in | cut -f2 -d=)
 
-# Optimizations for x86 familiy, without MMX
-ifeq ($(ARCH),)
-CCFLAGS += -malign-double
-CCFLAGS += -march=pentiumpro
-#CCFLAGS += -march=pentium
-endif
 
-# Optimization for x86 with MMX support
-ifeq ($(ARCH),MMX)
-CCFLAGS += -malign-double
-CCFLAGS += -march=pentiumpro
-endif
+# All symbols must be exported
+export
 
-# Optimizations for PowerPC
-ifeq ($(ARCH),PPC)
-CCFLAGS += -mcpu=604e -mmultiple -mhard-float -mstring
-endif
+###############################################################################
+# Targets
+###############################################################################
 
 #
-# C compiler flags: dependancies
+# Virtual targets
 #
-DCFLAGS += $(INCLUDE)
-DCFLAGS += -MM
+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)
 
 #
-# C compiler flags: linking
+# Cleaning rules
 #
-LCFLAGS += $(LIB)
-LCFLAGS += -Wall
-#LCFLAGS += -s
+clean: libdvdcss-clean plugins-clean vlc-clean
+	rm -f src/*/*.o extras/*/*.o
+	rm -f lib/*.so* lib/*.a
+	rm -f plugins/*.so plugins/*.a
 
-#
-# C compiler flags: common flags
-#
+libdvdcss-clean:
+	-cd extras/libdvdcss && $(MAKE) clean
 
-# Optimizations for x86 with MMX support
-ifeq ($(ARCH),MMX)
-CFLAGS += -DHAVE_MMX
-endif
+plugins-clean:
+	for dir in $(PLUGINS_DIR) ; do \
+		( cd plugins/$${dir} && $(MAKE) clean ) ; done
+	rm -f plugins/*/*.o plugins/*/*.moc plugins/*/*.bak
+
+vlc-clean:
+	rm -f $(C_OBJ) $(CPP_OBJ)
+	rm -f vlc gnome-vlc gvlc kvlc qvlc vlc.exe
+	rm -Rf vlc.app
+
+distclean: clean
+	rm -f **/*.o **/*~ *.log
+	rm -f Makefile.opts
+	rm -f include/defs.h include/config.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
+	rm -Rf .dep
+	rm -f .gdb_history
 
 #
-# Additionnal debugging flags
+# Install/uninstall rules
 #
-# Debugging settings: electric fence, debuging symbols and profiling support. 
-# Note that electric fence and accurate profiling are quite uncompatible.
-#CCFLAGS += -g
-#CCFLAGS += -pg
-#LCFLAGS += -g 
-#LCFLAGS += -pg
-#LIB += -ldmalloc
-#LIB += -lefence
+install: libdvdcss-install vlc-install plugins-install
 
-#################################################################################
-# Objects and files
-#################################################################################
+uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall
 
-#
-# Objects
-# 
-interface_obj =  		interface/main.o \
-						interface/interface.o \
-						interface/intf_msg.o \
-						interface/intf_cmd.o \
-						interface/intf_ctrl.o \
-						interface/control.o \
-						interface/intf_console.o \
-						interface/intf_$(video).o
-
-input_obj =         		input/input_vlan.o \
-						input/input_file.o \
-						input/input_netlist.o \
-						input/input_network.o \
-						input/input_ctrl.o \
-						input/input_pcr.o \
-						input/input_psi.o \
-						input/input.o
-
-audio_output_obj = 		audio_output/audio_output.o \
-						audio_output/audio_dsp.o
-
-video_output_obj = 		video_output/video_output.o \
-						video_output/video_$(video).o \
-						video_output/video_yuv.o
-
-ac3_decoder_obj =		ac3_decoder/ac3_decoder.o \
-						ac3_decoder/ac3_parse.o \
-						ac3_decoder/ac3_exponent.o \
-						ac3_decoder/ac3_bit_allocate.o \
-						ac3_decoder/ac3_mantissa.o \
-						ac3_decoder/ac3_rematrix.o \
-						ac3_decoder/ac3_imdct.o \
-						ac3_decoder/ac3_downmix.o
-
-audio_decoder_obj =		audio_decoder/audio_decoder.o \
-						audio_decoder/audio_math.o
-
-subtitle_decoder_obj =		subtitle_decoder/subtitle_decoder.o
-
-#??generic_decoder_obj =		generic_decoder/generic_decoder.o
-# remeber to add it to OBJ 
-
-ifeq ($(DECODER),old)
-CFLAGS += -DOLD_DECODER
-video_decoder_obj =		video_decoder_ref/video_decoder.o \
-						video_decoder_ref/display.o \
-						video_decoder_ref/getblk.o \
-						video_decoder_ref/gethdr.o \
-						video_decoder_ref/getpic.o \
-						video_decoder_ref/getvlc.o \
-						video_decoder_ref/idct.o \
-						video_decoder_ref/motion.o \
-						video_decoder_ref/mpeg2dec.o \
-						video_decoder_ref/recon.o \
-						video_decoder_ref/spatscal.o
-else
-video_parser_obj = 		video_parser/video_parser.o \
-						video_parser/vpar_headers.o \
-						video_parser/vpar_blocks.o \
-						video_parser/vpar_motion.o \
-						video_parser/vpar_synchro.o \
-						video_parser/video_fifo.o
-
-video_decoder_obj =		video_decoder/video_decoder.o \
-						video_decoder/vdec_motion.o \
-                        video_decoder/$(TRANSFORM).o
+vlc-install:
+	mkdir -p $(DESTDIR)$(bindir)
+	$(INSTALL) vlc $(DESTDIR)$(bindir)
+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
+
+vlc-uninstall:
+	rm vlc $(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
 
-misc_obj =			misc/mtime.o \
-						misc/rsc_files.o \
-						misc/netutils.o
+plugins-uninstall:
+	rm -f $(DESTDIR)$(libdir)/videolan/vlc/*.so
 
-ifeq ($(ARCH),MMX)
-ASM_OBJ = 			video_decoder_ref/idctmmx.o \
-						video_output/video_yuv_mmx.o
-endif
+libdvdcss-install:
+	-cd extras/libdvdcss && $(MAKE) install
 
-C_OBJ = $(interface_obj) \
-		$(input_obj) \
-		$(audio_output_obj) \
-		$(video_output_obj) \
-		$(ac3_decoder_obj) \
-		$(audio_decoder_obj) \
-		$(subtitle_decoder_obj) \
-		$(generic_decoder_obj) \
-		$(video_parser_obj) \
-		$(video_decoder_obj) \
-		$(vlan_obj) \
-		$(misc_obj)
+libdvdcss-uninstall:
+	-cd extras/libdvdcss && $(MAKE) uninstall
 
 #
-# Other lists of files
+# Package generation rules
 #
-sources := $(C_OBJ:%.o=%.c)
-dependancies := $(sources:%.c=dep/%.d)
+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
+	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 ; \
+		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/
+	# 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
+
+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
+	# 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
+	# 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
 
-# All symbols must be exported
-export
+#
+# Gtk/Gnome/* aliases and OS X application
+#
+gnome-vlc gvlc kvlc qvlc: vlc
+	rm -f $@ && ln -s vlc $@
+
+.PHONY: 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/
+	$(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
+	$(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share
+endif
 
-################################################################################
-# Targets
-################################################################################
+FORCE:
 
 #
-# Virtual targets
+# Generic rules (see below)
 #
-all: vlc
+$(C_DEP): %.d: FORCE
+	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
 
-clean:
-	rm -f $(C_OBJ) $(ASM_OBJ)
+$(CPP_DEP): %.dpp: FORCE
+	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
 
-distclean: clean
-	rm -f **/*.o **/*~ *.log
-	rm -f vlc gmon.out core
-	rm -rf dep
+$(H_OBJ): Makefile.opts Makefile.dep Makefile
+	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* );" >> $@ ; \
+	done
+	echo "" >> $@ ;
+	printf "#define ALLOCATE_ALL_BUILTINS() do { " >> $@ ;
+	for i in $(BUILTINS) ; do \
+		printf "ALLOCATE_BUILTIN("$$i"); " >> $@ ; \
+	done
+	echo "} while( 0 );" >> $@ ;
+	echo "" >> $@ ;
+endif
 
-FORCE:
+$(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
+$(C_OBJ): %.o: .dep/%.d
+$(C_OBJ): %.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+$(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile
+$(CPP_OBJ): %.o: .dep/%.dpp
+$(CPP_OBJ): %.o: %.cpp
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+$(RESOURCE_OBJ): %.o: Makefile.dep Makefile
+ifneq (,(findstring mingw32,$(SYS)))
+$(RESOURCE_OBJ): %.o: %.rc
+	$(WINDRES) -i $< -o $@
+endif
 
 #
-# Real targets
+# Main application target
 #
-vlc: $(C_OBJ) $(ASM_OBJ)
-	$(CC) $(LCFLAGS) $(CFLAGS) -o $@ $(C_OBJ) $(ASM_OBJ)
+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)
+ifeq ($(SYS),beos)
+	xres -o $@ ./share/vlc_beos.rsrc
+	mimeset -f $@
+endif
 
 #
-# Generic rules (see below)
+# Plugins target
 #
-$(dependancies): %.d: FORCE
-	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
+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/%=../%)
 
-$(C_OBJ): %.o: dep/%.d
+#
+# 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/%=../%)
 
-$(C_OBJ): %.o: %.c
-	$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
-$(ASM_OBJ): %.o: %.S
-	$(CC) $(CFLAGS) -c -o $@ $<
+#
+# libdvdcss target
+#
+libdvdcss: Makefile.opts
+	cd extras/libdvdcss && $(MAKE)
 
-################################################################################
-# Note on generic rules and dependancies
-################################################################################
-
-# Note on dependancies: each .c file is associated with a .d file, which
-# depends of it. The .o file associated with a .c file depends of the .d, of the 
-# .c itself, and of Makefile. The .d files are stored in a separate dep/ 
-# directory.
-# The dep directory should be ignored by CVS.
-
-# Note on inclusions: depending of the target, the dependancies files must 
-# or must not be included. The problem is that if we ask make to include a file,
-# and this file does not exist, it is made before it can be included. In a 
-# general way, a .d file should be included if and only if the corresponding .o 
-# needs to be re-made.
-
-# Two makefiles are used: the main one (this one) has regular generic rules,
-# except for .o files, for which it calls the object Makefile. Dependancies
-# are not included in this file.
-# The object Makefile known how to make a .o from a .c, and includes
-# dependancies for the target, but only those required.