X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=2b3eb1b7a9b26b6c33c93fe39bef0f91de7978ba;hb=6116299e395a1d8a27c1a7280749a0a7d59d0d66;hp=e035f41d1fe11babe44ec03e19c1f38b21c5ae0b;hpb=d81e21d51453a17b665902e801aacb394588d79f;p=vlc

diff --git a/Makefile b/Makefile
index e035f41d1f..2b3eb1b7a9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,299 +1,341 @@
-################################################################################
-# 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
-################################################################################
+-include Makefile.opts
 
-# Environment
-#CC = gcc
-#SHELL = /bin/sh
-
-# Video output settings
-VIDEO=X11
-#VIDEO=DGA (not yet supported)
-#VIDEO=FB
-#VIDEO=GGI
-#VIDEO=BEOS (not yet supported)
-
-# Target architecture and optimization
-#ARCH=
-ARCH=MMX
-#ARCH=PPC
-
-# Decoder choice - ?? old decoder will be removed soon
-DECODER=old
-#DECODER=new
-
-#----------------- do not change anything below this line ----------------------
-
-################################################################################
-# Configuration pre-processing
-################################################################################
-
-# DEFINE will contain all the constants definitions decided in Makefile
-DEFINE = -DVIDEO_$(VIDEO)
-
-# video is a lowercase version of VIDEO used for filenames
-video = $(shell echo $(VIDEO) | tr 'A-Z' 'a-z')
-
-################################################################################
-# Tunning and other variables
-################################################################################
+###############################################################################
+# Objects and files
+###############################################################################
 
+# 
+# All possible plugin directories, needed for make clean
 #
-# Transformation for video decompression (Fourier or cosine)
-#
-TRANSFORM=vdec_idct
-#TRANSFORM=vdec_idft
+PLUGINS_DIR :=	alsa beos darwin dsp dummy \
+		dvd esd fb ggi glide gnome gtk \
+		idct \
+		macosx mga \
+		motion \
+		mpeg null qt sdl \
+		text x11 yuv
 
 #
-# C headers directories
+# All possible plugin objects
 #
-INCLUDE += -Iinclude
+PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin dsp/dsp dummy/dummy \
+		dvd/dvd esd/esd fb/fb ggi/ggi glide/glide gnome/gnome gtk/gtk \
+		idct/idct idct/idctclassic idct/idctmmx idct/idctmmxext \
+		macosx/macosx mga/mga \
+		motion/motion motion/motionmmx motion/motionmmxext \
+		mpeg/ps mpeg/ts null/null qt/qt sdl/sdl \
+		text/text x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx
 
-ifeq ($(VIDEO),X11)
-INCLUDE += -I/usr/X11R6/include
-endif
-
-#
-# Libraries
 #
-LIB += -lpthread
-
-ifeq ($(VIDEO),X11)
-LIB += -L/usr/X11R6/lib
-LIB += -lX11
-LIB += -lXext 
-endif
-ifeq ($(VIDEO),GGI)
-LIB += -lggi
-endif
-
-# System dependant libraries
-#??LIB += -lXxf86dga
+# C Objects
+# 
+INTERFACE =	src/interface/main.o \
+		src/interface/interface.o \
+		src/interface/intf_msg.o \
+		src/interface/intf_cmd.o \
+		src/interface/intf_ctrl.o \
+		src/interface/intf_playlist.o \
+		src/interface/intf_channels.o \
+		src/interface/intf_console.o \
+		src/interface/intf_urldecode.o \
+
+INPUT =		src/input/input_ext-dec.o \
+		src/input/input_ext-intf.o \
+		src/input/input_dec.o \
+		src/input/input_programs.o \
+		src/input/input_netlist.o \
+		src/input/input_clock.o \
+		src/input/input.o \
+		src/input/mpeg_system.o
+
+AUDIO_OUTPUT = 	src/audio_output/audio_output.o \
+		src/audio_output/aout_fifo.o \
+		src/audio_output/aout_u8.o \
+		src/audio_output/aout_s8.o \
+		src/audio_output/aout_u16.o \
+		src/audio_output/aout_s16.o
+
+VIDEO_OUTPUT = 	src/video_output/video_output.o \
+		src/video_output/video_text.o \
+		src/video_output/video_spu.o \
+		src/video_output/video_yuv.o
+
+AC3_DECODER =	src/ac3_decoder/ac3_decoder_thread.o \
+		src/ac3_decoder/ac3_decoder.o \
+		src/ac3_decoder/ac3_parse.o \
+		src/ac3_decoder/ac3_exponent.o \
+		src/ac3_decoder/ac3_bit_allocate.o \
+		src/ac3_decoder/ac3_mantissa.o \
+		src/ac3_decoder/ac3_rematrix.o \
+		src/ac3_decoder/ac3_imdct.o \
+		src/ac3_decoder/ac3_downmix.o \
+		src/ac3_decoder/ac3_downmix_c.o
+
+LPCM_DECODER =	src/lpcm_decoder/lpcm_decoder_thread.o \
+		src/lpcm_decoder/lpcm_decoder.o
+
+AUDIO_DECODER =	src/audio_decoder/audio_decoder.o \
+		src/audio_decoder/adec_generic.o \
+		src/audio_decoder/adec_layer1.o \
+		src/audio_decoder/adec_layer2.o \
+		src/audio_decoder/adec_math.o
+
+SPU_DECODER =	src/spu_decoder/spu_decoder.o
+
+#GEN_DECODER =	src/generic_decoder/generic_decoder.o
+
+VIDEO_PARSER = 	src/video_parser/video_parser.o \
+		src/video_parser/vpar_headers.o \
+		src/video_parser/vpar_blocks.o \
+		src/video_parser/vpar_synchro.o \
+		src/video_parser/video_fifo.o
+
+VIDEO_DECODER =	src/video_decoder/video_decoder.o
+
+MISC =		src/misc/mtime.o \
+		src/misc/tests.o \
+		src/misc/rsc_files.o \
+		src/misc/modules.o \
+		src/misc/netutils.o
+
+C_OBJ =		$(INTERFACE) \
+		$(INPUT) \
+		$(VIDEO_OUTPUT) \
+		$(AUDIO_OUTPUT) \
+		$(AC3_DECODER) \
+		$(LPCM_DECODER) \
+		$(AUDIO_DECODER) \
+		$(SPU_DECODER) \
+		$(GEN_DECODER) \
+		$(VIDEO_PARSER) \
+		$(VIDEO_DECODER) \
+		$(MISC)
 
 #
-# C compiler flags: compilation
-#
-CCFLAGS += $(DEFINE) $(INCLUDE)
-CCFLAGS += -Wall
-CCFLAGS += -D_REENTRANT
-CCFLAGS += -D_GNU_SOURCE
-
-# Optimizations : don't compile debug versions with them
-CCFLAGS += -O6
-CCFLAGS += -ffast-math -funroll-loops -fargument-noalias-global
-CCFLAGS += -fomit-frame-pointer
-#CCFLAGS += -fomit-frame-pointer -s
-
-# Optimizations for x86 familiy, without MMX
-ifeq ($(ARCH),)
-CCFLAGS += -malign-double
-CCFLAGS += -march=pentiumpro
-#CCFLAGS += -march=pentium
+# Misc Objects
+# 
+ifeq ($(GETOPT),1)
+C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o 
 endif
 
-# Optimization for x86 with MMX support
-ifeq ($(ARCH),MMX)
-CCFLAGS += -malign-double
-CCFLAGS += -march=pentiumpro
+ifeq ($(SYS),beos)
+CPP_OBJ =	src/misc/beos_specific.o
 endif
 
-# Optimizations for PowerPC
-ifeq ($(ARCH),PPC)
-CCFLAGS += -mcpu=604e -mmultiple -mhard-float -mstring
+ifneq (,$(findstring darwin,$(SYS)))
+C_OBJ +=	src/misc/darwin_specific.o
 endif
 
 #
-# C compiler flags: dependancies
+# Generated header
 #
-DCFLAGS += $(INCLUDE)
-DCFLAGS += -MM
+H_OBJ =		include/modules_builtin.h
 
 #
-# C compiler flags: linking
-#
-LCFLAGS += $(LIB)
-LCFLAGS += -Wall
-#LCFLAGS += -s
-
-#
-# C compiler flags: common flags
-#
-
-# Optimizations for x86 with MMX support
-ifeq ($(ARCH),MMX)
-CFLAGS += -DHAVE_MMX
-endif
-
-#
-# Additionnal debugging flags
-#
-# 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
-
-#################################################################################
-# Objects and files
-#################################################################################
-
+# Other lists of files
 #
-# 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
-
-audio_decoder_obj =		audio_decoder/audio_decoder.o \
-						audio_decoder/audio_math.o
-
-#??generic_decoder_obj =		generic_decoder/generic_decoder.o
-# remeber to add it to OBJ 
-
-ifeq ($(DECODER),old)
-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
-endif
-
-misc_obj =			misc/mtime.o \
-						misc/rsc_files.o \
-						misc/netutils.o
-
-ifeq ($(VIDEO),X11)
-misc_obj+=			misc/xutils.o
-endif
-
-ifeq ($(ARCH),MMX)
-ASM_OBJ = 			video_decoder_ref/idctmmx.o \
-						video_output/yuv_mmx.o
-endif
-
-C_OBJ = $(interface_obj) \
-		$(input_obj) \
-		$(audio_output_obj) \
-		$(video_output_obj) \
-		$(audio_decoder_obj) \
-		$(generic_decoder_obj) \
-		$(video_parser_obj) \
-		$(video_decoder_obj) \
-		$(vlan_obj) \
-		$(misc_obj)
+C_DEP := $(C_OBJ:%.o=.dep/%.d)
+CPP_DEP := $(CPP_OBJ:%.o=.dep/%.dpp)
 
 #
-# Other lists of files
+# Translate plugin names
 #
-sources := $(C_OBJ:%.o=%.c)
-dependancies := $(sources:%.c=dep/%.d)
+PLUGIN_OBJ := $(shell for i in : $(PLUGINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.*/\('$$i'\) .*@lib/\1.so@' -e 's@^ .*@@' ; done)
+BUILTIN_OBJ := $(shell for i in : $(BUILTINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.*/\('$$i'\) .*@lib/\1.a@' -e 's@^ .*@@' ; done)
 
 # All symbols must be exported
 export
 
-################################################################################
+###############################################################################
 # Targets
-################################################################################
+###############################################################################
 
 #
 # Virtual targets
 #
-all: vlc
+all: vlc ${ALIASES} plugins vlc.app
 
 clean:
-	rm -f $(C_OBJ) $(ASM_OBJ)
+	for d in $(PLUGINS_DIR) ; do ( cd plugins/$${d} && $(MAKE) clean ) ; done
+	rm -f plugins/*/*.o plugins/*/*.moc plugins/*/*.bak
+	rm -f $(C_OBJ) $(CPP_OBJ)
+	rm -f src/*/*.o extras/*/*.o
+	rm -f lib/*.so lib/*.a vlc gnome-vlc gvlc kvlc qvlc
+	rm -rf vlc.app
 
 distclean: clean
 	rm -f **/*.o **/*~ *.log
-	rm -f vlc gmon.out core
-	rm -rf dep
+	rm -f Makefile.opts Makefile.modules
+	rm -f include/defs.h include/config.h include/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
+
+install:
+	mkdir -p $(DESTDIR)$(bindir)
+	$(INSTALL) vlc $(DESTDIR)$(bindir)
+# ugly
+	for alias in "" ${ALIASES} ; do if test $$alias ; then rm -f $(DESTDIR)$(bindir)/$$alias && ln -s vlc $(DESTDIR)$(bindir)/$$alias ; fi ; done
+	mkdir -p $(DESTDIR)$(libdir)/videolan/vlc
+	$(INSTALL) -m 644 $(PLUGINS:%=lib/%.so) $(DESTDIR)$(libdir)/videolan/vlc
+	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
+
+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)
+
+
+# ugliest of all, but I have no time to do it -- sam
+snapshot:
+	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 ; \
+	done
+	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
+	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 README TODO todo.pl \
+		Makefile.opts.in Makefile.dep Makefile.modules.in \
+		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.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}*
+
+.PHONY: vlc.app
+vlc.app:
+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/
+	$(INSTALL) $(PLUGINS:%=lib/%.so) vlc.app/Contents/MacOS/lib
+	$(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share
+endif
 
 FORCE:
 
 #
-# Real targets
+# GTK/Gnome aliases - don't add too many aliases which could bloat
+# the namespace
 #
-vlc: $(C_OBJ) $(ASM_OBJ)
-	$(CC) $(LCFLAGS) $(CFLAGS) -o $@ $(C_OBJ) $(ASM_OBJ)
+gnome-vlc gvlc kvlc qvlc: vlc
+	rm -f $@ && ln -s vlc $@
 
 #
 # Generic rules (see below)
 #
-$(dependancies): %.d: FORCE
+$(C_DEP): %.d: FORCE
 	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
 
-$(C_OBJ): %.o: dep/%.d
+$(CPP_DEP): %.dpp: FORCE
+	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
 
+$(H_OBJ): Makefile.opts Makefile.dep Makefile
+	rm -f $@ && cp $@.in $@
+	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 "#define ALLOCATE_ALL_BUILTINS() \\" >> $@ ;
+	echo "{ \\" >> $@ ;
+	for i in $(BUILTINS) ; do \
+	echo "    ALLOCATE_BUILTIN("$$i"); \\" >> $@ ; \
+	done
+	echo "};" >> $@ ;
+
+$(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
+$(C_OBJ): %.o: .dep/%.d
 $(C_OBJ): %.o: %.c
-	$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
-$(ASM_OBJ): %.o: %.S
+ifneq (,$(findstring darwin,$(SYS)))
+#this is uglier of all
+	@if test "src/ac3_decoder/ac3_imdct.c" = "$<"; then $(CC) `echo $(CFLAGS) | sed -e 's/-O3/-O/'` -c -o $@ $<; echo "(CC) `echo $(CFLAGS) | sed -e 's/-O3/-O/'` -c -o $@ $<"; else $(CC) $(CFLAGS) -c -o $@ $<; echo "$(CC) $(CFLAGS) -c -o $@ $<"; fi
+else
+	$(CC) $(CFLAGS) -c -o $@ $<
+endif
+
+$(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile
+$(CPP_OBJ): %.o: .dep/%.dpp
+$(CPP_OBJ): %.o: %.cpp
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-################################################################################
-# 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.
+#
+# Main application target
+#
+vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ)
+	$(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS)
+ifeq ($(SYS),beos)
+	rm -f ./lib/_APP_
+	ln -s ../vlc ./lib/_APP_
+	xres -o $@ ./share/vlc_beos.rsrc
+	mimeset -f $@
+endif
+
+#
+# Plugins target
+#
+plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ)
+$(PLUGIN_OBJ): FORCE
+	cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:lib/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%)
+
+#
+# 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@.* \([^/]*/\)'$(@:lib/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%)
+