X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.in;h=b28ad739d2f1a5a9fd1e749e55ab516740c152f0;hb=a7dd995f4c336251841143f56ef14450ce04f491;hp=2d37bbc60eeff9791146ccb111e863be75c493f7;hpb=ab70628c90bd8c45f2295f8d8b92459510614ffa;p=vlc

diff --git a/Makefile.in b/Makefile.in
index 2d37bbc60e..b28ad739d2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,12 +10,15 @@
 ################################################################################
 
 # Debugging mode on or off (set to 1 to activate)
-DEBUG=0
+DEBUG=@DEBUG@
+STATS=@STATS@
+OPTIMS=@OPTIMS@
 
 SYS=@SYS@
 PLUGINS=@PLUGINS@
 SNAPSHOTDIR=vlc-@VLC_VERSION@
 INSTALL=@INSTALL@
+ARCH=@ARCH@
 prefix=@prefix@
 
 #----------------- do not change anything below this line ----------------------
@@ -30,6 +33,10 @@ ifeq ($(DEBUG),1)
 PROGRAM_OPTIONS += DEBUG
 DEFINE += -DDEBUG
 endif
+ifeq ($(STATS),1)
+PROGRAM_OPTIONS += DEBUG
+DEFINE += -DSTATS
+endif
 
 # PROGRAM_BUILD is a complete identification of the build
 # ( we can't use fancy options with date since OSes like Solaris
@@ -78,49 +85,60 @@ endif
 #
 # C compiler flags: compilation
 #
-CCFLAGS += $(DEFINE) $(INCLUDE)
-CCFLAGS += -Wall
-CCFLAGS += -D_REENTRANT
-CCFLAGS += -D_GNU_SOURCE
+CFLAGS += $(DEFINE) $(INCLUDE)
+CFLAGS += -Wall -Winline
+CFLAGS += -D_REENTRANT
+CFLAGS += -D_GNU_SOURCE
 
 # flags needed for clean beos compilation
-CCFLAGS += -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual
+ifeq ($(SYS),beos)
+CFLAGS += -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual
+endif
 
 # Optimizations : don't compile debug versions with them
-ifeq ($(DEBUG),0)
-CCFLAGS += -O6
-CCFLAGS += -ffast-math -funroll-loops -fargument-noalias-global
-CCFLAGS += -fomit-frame-pointer
+ifeq ($(OPTIMS),1)
+CFLAGS += -O6
+CFLAGS += -ffast-math -funroll-loops -fargument-noalias-global
+CFLAGS += -fomit-frame-pointer
 
 # Optimizations for x86 familiy
 ifneq (,$(findstring 86,$(ARCH)))
-CCFLAGS += -malign-double
-#CCFLAGS += -march=pentium
-# Eventual Pentium Pro optimizations
-ifneq (,$(findstring pentiumpro,$(ARCH)))
+CFLAGS += -malign-double
+# Optional Pentium Pro optimizations
+ifneq (,$(findstring ppro,$(ARCH)))
 ifneq ($(SYS), BSD)
-CCFLAGS += -march=pentiumpro
+CFLAGS += -march=pentiumpro
 endif
-endif
-# Eventual MMX optimizations for x86
-ifneq (,$(findstring mmx,$(ARCH)))
-CFLAGS += -DHAVE_MMX
+else
+CFLAGS += -march=pentium
 endif
 endif
 
 # Optimizations for PowerPC
-ifneq (,$(findstring ppc,$(ARCH)))
-CCFLAGS += -mcpu=604e -mmultiple -mhard-float -mstring
+ifneq (,$(findstring powerpc,$(ARCH)))
+# 604e
+CFLAGS += -mcpu=604e -mmultiple -mhard-float -mstring
+# G3
+#CFLAGS += -mcpu=750 -mmultiple -mhard-float -mstring
+# G4
+#CFLAGS += -mcpu=7400 -mmultiple -mhard-float -mstring
 endif
 
 # Optimizations for Sparc
 ifneq (,$(findstring sparc,$(ARCH)))
-CCFLAGS += -mhard-float
+CFLAGS += -mhard-float
 endif
 
-# End of optimizations
+# /debug
 endif
 
+# Optional MMX optimizations for x86
+ifneq (,$(findstring mmx,$(ARCH)))
+CFLAGS += -DHAVE_MMX
+endif
+
+# End of optimizations
+
 #
 # C compiler flags: dependancies
 #
@@ -139,12 +157,8 @@ LCFLAGS += -Wall
 #
 
 # Debugging and profiling support
-ifneq ($(DEBUG),0)
-ifeq ($(SYS),beos)
+ifneq ($(OPTIMS),0)
 CFLAGS += -g
-else
-CFLAGS += -pg
-endif
 endif
 
 #################################################################################
@@ -154,68 +168,75 @@ endif
 #
 # C Objects
 # 
-interface_obj =  		interface/main.o \
-						interface/interface.o \
-						interface/intf_msg.o \
-						interface/intf_cmd.o \
-						interface/intf_ctrl.o \
-						interface/intf_console.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
-
-video_output_obj = 		video_output/video_output.o \
-						video_output/video_text.o \
-						video_output/video_spu.o \
-						video_output/video_yuv.o
-
-ac3_decoder_obj =		ac3_decoder/ac3_decoder_thread.o \
-						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
+interface_obj =  	interface/main.o \
+				interface/interface.o \
+				interface/intf_msg.o \
+				interface/intf_cmd.o \
+				interface/intf_ctrl.o \
+				interface/intf_console.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
+
+video_output_obj = 	video_output/video_output.o \
+				video_output/video_text.o \
+				video_output/video_spu.o \
+				video_output/video_yuv.o
+
+ac3_decoder_obj =	ac3_decoder/ac3_decoder_thread.o \
+				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
 						
-lpcm_decoder_obj =		lpcm_decoder/lpcm_decoder_thread.o \
-						lpcm_decoder/lpcm_decoder.o
+lpcm_decoder_obj =	lpcm_decoder/lpcm_decoder_thread.o \
+				lpcm_decoder/lpcm_decoder.o
 
-audio_decoder_obj =		audio_decoder/audio_decoder_thread.o \
-						audio_decoder/audio_decoder.o \
-						audio_decoder/audio_math.o
+audio_decoder_obj =	audio_decoder/audio_decoder_thread.o \
+				audio_decoder/audio_decoder.o \
+				audio_decoder/audio_math.o
 
-spu_decoder_obj =		spu_decoder/spu_decoder.o
+spu_decoder_obj =	spu_decoder/spu_decoder.o
 
 #??generic_decoder_obj =		generic_decoder/generic_decoder.o
 # remeber to add it to OBJ 
 
-video_parser_obj = 		video_parser/video_parser.o \
-						video_parser/vpar_headers.o \
-						video_parser/vpar_blocks.o \
-						video_parser/vpar_synchro.o \
-						video_parser/video_fifo.o
+video_parser_obj = 	video_parser/video_parser.o \
+				video_parser/vpar_headers.o \
+				video_parser/vpar_blocks.o \
+				video_parser/vpar_synchro.o \
+				video_parser/video_fifo.o
+
+ifneq (,$(findstring mmx,$(ARCH)))
+	vdec_motion_inner = video_decoder/vdec_motion_inner_mmx.o
+else
+	vdec_motion_inner = video_decoder/vdec_motion_inner.o
+endif
 
-video_decoder_obj =		video_decoder/video_decoder.o \
-						video_decoder/vdec_motion.o \
-						video_decoder/vdec_motion_inner.o \
-			                        video_decoder/vdec_idct.o
+video_decoder_obj =	video_decoder/video_decoder.o \
+				video_decoder/vdec_motion.o \
+				video_decoder/vdec_idct.o \
+				$(vdec_motion_inner)
 
-misc_obj =			misc/mtime.o \
-						misc/rsc_files.o \
-						misc/netutils.o \
-						misc/playlist.o \
-						misc/plugins.o \
-						misc/decoder_fifo.o
+misc_obj =		misc/mtime.o \
+				misc/tests.o \
+				misc/rsc_files.o \
+				misc/netutils.o \
+				misc/playlist.o \
+				misc/plugins.o \
+				misc/decoder_fifo.o
 
 
 C_OBJ = $(interface_obj) \
@@ -275,6 +296,13 @@ PLUGIN_GGI    = plugins/ggi/ggi.o \
 		plugins/ggi/intf_ggi.o \
 		plugins/ggi/vout_ggi.o
 
+PLUGIN_SDL    = plugins/sdl/sdl.o \
+		plugins/sdl/intf_sdl.o \
+		plugins/sdl/vout_sdl.o 
+#		plugins/sdl/video_yuv.o \
+#		plugins/sdl/video_yuvall.o
+
+
 PLUGIN_GLIDE  = plugins/glide/glide.o \
 		plugins/glide/intf_glide.o \
 		plugins/glide/vout_glide.o
@@ -302,6 +330,7 @@ PLUGIN_YUV    = plugins/yuv/yuv.o \
 		plugins/yuv/video_yuv24.o \
 		plugins/yuv/video_yuv32.o
 
+
 PLUGIN_YUVMMX = plugins/yuvmmx/yuvmmx.o \
 		plugins/yuvmmx/video_yuv.o \
 		plugins/yuvmmx/video_yuv8.o \
@@ -310,9 +339,13 @@ PLUGIN_YUVMMX = plugins/yuvmmx/yuvmmx.o \
 		plugins/yuvmmx/video_yuv24.o \
 		plugins/yuvmmx/video_yuv32.o
 
+PLUGIN_ALSA = plugins/alsa/alsa.o \
+	      plugins/alsa/aout_alsa.o
+
 PLUGIN_OBJ = $(PLUGIN_BEOS) $(PLUGIN_DSP) $(PLUGIN_DUMMY) $(PLUGIN_ESD) \
 		$(PLUGIN_FB) $(PLUGIN_GGI) $(PLUGIN_GLIDE) $(PLUGIN_GNOME) \
-		$(PLUGIN_MGA) $(PLUGIN_X11) $(PLUGIN_YUV) $(PLUGIN_YUVMMX)
+		$(PLUGIN_MGA) $(PLUGIN_X11) $(PLUGIN_YUV) $(PLUGIN_YUVMMX) \
+		$(PLUGIN_SDL) $(PLUGIN_ALSA)
 #
 # Other lists of files
 #
@@ -344,10 +377,14 @@ distclean: clean
 	rm -f config.status config.cache config.log
 	rm -f gmon.out core build-stamp
 	rm -rf .dep
+	rm -rf debian/tmp debian/files debian/*.debhelper debian/*.substvars
+	find debian/* -type d -maxdepth 0 -name 'vlc-*' | xargs rm -rf
 
 install:
 	mkdir -p $(prefix)/bin
 	$(INSTALL) vlc $(prefix)/bin
+	# ugly
+	for alias in "" @ALIASES@ ; do if test $$alias ; then ln -s vlc $(prefix)/bin/$$alias ; fi ; done
 	mkdir -p $(prefix)/lib/videolan/vlc
 	$(INSTALL) -m 644 $(PLUGINS) $(prefix)/lib/videolan/vlc
 	mkdir -p $(prefix)/share/videolan
@@ -356,19 +393,20 @@ install:
 
 show:
 	@echo CC: $(CC)
-	@echo CCFLAGS: $(CCFLAGS)
+	@echo CFLAGS: $(CFLAGS)
 	@echo DCFLAGS: $(DCFLAGS)
-	@echo LCFLAGS: $(CCFLAGS)
+	@echo LCFLAGS: $(LCFLAGS)
 
 # ugliest of all, but I have no time to do it -- sam
 snapshot:
 	rm -rf /tmp/${SNAPSHOTDIR}
 	mkdir /tmp/${SNAPSHOTDIR}
-	cp -r * /tmp/${SNAPSHOTDIR}
+	cp -a * /tmp/${SNAPSHOTDIR}
 		(cd /tmp/${SNAPSHOTDIR} ; \
 		make distclean ; \
 		find . -type d -name CVS | xargs rm -rf ; \
 		find . -type f -name '.*.swp' | xargs rm -f ; \
+		find . -type f -name '.cvsignore' | xargs rm -f ; \
 		cd .. ; \
 		tar czvf ${SNAPSHOTDIR}.tar.gz ${SNAPSHOTDIR} ; \
 		tar cIvf ${SNAPSHOTDIR}.tar.bz2 ${SNAPSHOTDIR} )
@@ -384,14 +422,18 @@ FORCE:
 #
 vlc: $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
 ifeq ($(SYS),beos)
-	$(CC) $(CCFLAGS) $(LCFLAGS) $(CFLAGS) -Xlinker -soname=_APP_ -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
+	$(CC) $(CFLAGS) $(LCFLAGS) -Xlinker -soname=_APP_ -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
 	rm -f ./plugins/_APP_
 	ln -s ../vlc ./plugins/_APP_
 else
-	$(CC) $(CCFLAGS) $(LCFLAGS) $(CFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)	
+	$(CC) $(CFLAGS) $(LCFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)	
 endif
 
-gvlc xvlc fbvlc ggivlc glidevlc: vlc
+#
+# Gnome and Framebuffer aliases - don't add new aliases which could bloat
+# the namespace
+#
+gvlc fbvlc: vlc
 	rm -f $@ && ln -s vlc $@
 
 plugins: $(PLUGINS)
@@ -405,10 +447,10 @@ $(dependancies): %.d: FORCE
 $(C_OBJ): %.o: Makefile.dep
 $(C_OBJ): %.o: .dep/%.d
 $(C_OBJ): %.o: %.c
-	$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 $(CPP_OBJ): %.o: %.cpp
-	$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 $(ASM_OBJ): %.o: Makefile.dep
 $(ASM_OBJ): %.o: %.S
@@ -418,9 +460,9 @@ $(ASM_OBJ): %.o: %.S
 #$(PLUGIN_OBJ): %.so: .dep/%.d
 
 lib/beos.so: $(PLUGIN_BEOS)
-	$(CC) $(CCFLAGS) $(CFLAGS) $(LCFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+	$(CC) $(CFLAGS) $(LCFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
 $(PLUGIN_BEOS): %.o: %.cpp
-	$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 lib/esd.so: $(PLUGIN_ESD)
 ifneq (,$(findstring bsd,$(SYS)))
@@ -429,51 +471,61 @@ else
 	ld -shared -laudiofile -lesd -o $@ $^
 endif
 $(PLUGIN_ESD): %.o: %.c
-	$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 lib/dsp.so: $(PLUGIN_DSP)
 	ld -shared -o $@ $^
 $(PLUGIN_DSP): %.o: %.c
-	$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+lib/alsa.so: $(PLUGIN_ALSA)
+	ld -shared -o $@ $^
+$(PLUGIN_ALSA): %.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 lib/dummy.so: $(PLUGIN_DUMMY)
 	ld -shared -o $@ $^
 $(PLUGIN_DUMMY): %.o: %.c
-	$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 lib/fb.so: $(PLUGIN_FB)
 	ld -shared -o $@ $^
 $(PLUGIN_FB): %.o: %.c
-	$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 lib/x11.so: $(PLUGIN_X11)
 	ld -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
 $(PLUGIN_X11): %.o: %.c
-	$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 lib/mga.so: $(PLUGIN_MGA)
 	ld -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
 $(PLUGIN_MGA): %.o: %.c
-	$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 lib/gnome.so: $(PLUGIN_GNOME)
 	ld -shared `gnome-config --libs gnomeui | sed 's,-rdynamic,,'` -o $@ $^
 $(PLUGIN_GNOME): %.o: %.c
-	$(CC) $(CCFLAGS) $(CFLAGS) `gnome-config --cflags gnomeui` -c -o $@ $<
+	$(CC) $(CFLAGS) `gnome-config --cflags gnomeui` -c -o $@ $<
 
 lib/glide.so: $(PLUGIN_GLIDE)
 	ld -shared -lglide2x -o $@ $^
 $(PLUGIN_GLIDE): %.o: %.c
-	$(CC) $(CCFLAGS) $(CFLAGS) -I/usr/include/glide -c -o $@ $<
+	$(CC) $(CFLAGS) -I/usr/include/glide -c -o $@ $<
 
 lib/ggi.so: $(PLUGIN_GGI)
 	ld -shared -lggi -o $@ $^
 $(PLUGIN_GGI): %.o: %.c
-	$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+lib/sdl.so: $(PLUGIN_SDL)
+	ld -shared -lSDL -o $@ $^
+$(PLUGIN_SDL): %.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 lib/yuv.so: $(PLUGIN_YUV)
 ifeq ($(SYS),beos)
-	$(CC) $(CCFLAGS) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+	$(CC) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
 else
 	ld -shared -o $@ $^
 endif
@@ -482,12 +534,12 @@ $(PLUGIN_YUV): %.o: %.c
 
 lib/yuvmmx.so: $(PLUGIN_YUVMMX)
 ifeq ($(SYS),beos)
-	$(CC) $(CCFLAGS) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+	$(CC) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
 else
 	ld -shared -o $@ $^
 endif
 $(PLUGIN_YUVMMX): %.o: %.c
-	$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 ################################################################################
 # Note on generic rules and dependancies