X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=2def78fcb6fd20853c1477332e4e27411b241e8b;hb=9679481fdcc6594f30313e91dac683c0ca4e3acf;hp=251f76420a66ccc7af2f067ae36ccc272ee72ba5;hpb=36ac163c85ad618a41f903da87c1e8e3eeb458af;p=vlc

diff --git a/Makefile b/Makefile
index 251f76420a..2def78fcb6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+# Generated automatically from Makefile.in by configure.
+# Generated automatically from Makefile.in by configure.
 ################################################################################
 # vlc (VideoLAN Client) main makefile
 # (c)1998 VideoLAN
@@ -5,31 +7,41 @@
 # This makefile is the main makefile for the VideoLAN client.
 ################################################################################
 
+CC = egcc
+
 ################################################################################
 # Configuration
 ################################################################################
 
-# Environment
-CC=egcc
-SHELL=/bin/sh
-
 # Audio output settings
-AUDIO = dsp
+AOUT = dsp
+#AOUT += esd
 # Not yet supported
-AUDIO += esd
+#AOUT += alsa
 # Fallback method that should always work
-AUDIO += dummy
+AOUT += dummy
 
 # Video output settings
-VIDEO = x11
-VIDEO += fb
-#VIDEO += ggi
-VIDEO += glide
+VOUT = x11
+#VOUT += fb
+#VOUT += ggi
+#VOUT += glide
+# Not yet supported
+#VOUT = beos
+#VOUT += dga
+# Fallback method that should always work
+VOUT += dummy
+
+# Interface settings
+INTF = x11
+#INTF += fb
+#INTF += ggi
+#INTF += glide
 # Not yet supported
-#VIDEO += beos
-#VIDEO += dga
+#INTF = beos
+#INTF += dga
 # Fallback method that should always work
-VIDEO += dummy
+INTF += dummy
 
 # Target architecture
 ARCH=X86
@@ -38,12 +50,15 @@ ARCH=X86
 
 # Target operating system
 SYS=LINUX
+#SYS=GNU
 #SYS=BSD
 #SYS=BEOS
 
 # For x86 architecture, choose MMX support
-MMX=YES
-#MMX=NO
+ARCH += MMX
+# For x86 architecture, optimize for Pentium Pro
+# (choose NO if you get `Invalid instruction' errors)
+ARCH += PPRO
 
 # Decoder choice - ?? old decoder will be removed soon
 #DECODER=old
@@ -58,35 +73,28 @@ DEBUG=0
 # Configuration pre-processing
 ################################################################################
 
-# Program version - may only be changed by the project leader
-PROGRAM_VERSION = 0.1.99
-
-# audio options
-audio := $(shell echo $(AUDIO) | tr 'A-Z' 'a-z')
-AUDIO := $(shell echo $(AUDIO) | tr 'a-z' 'A-Z')
-
-# video options
-video := $(shell echo $(VIDEO) | tr 'A-Z' 'a-z')
-VIDEO := $(shell echo $(VIDEO) | tr 'a-z' 'A-Z')
-
 # PROGRAM_OPTIONS is an identification string of the compilation options
-PROGRAM_OPTIONS = $(ARCH) $(SYS)
+PROGRAM_OPTIONS = $(SYS) $(ARCH)
 ifeq ($(DEBUG),1)
 PROGRAM_OPTIONS += DEBUG
 endif
 
 # PROGRAM_BUILD is a complete identification of the build
-PROGRAM_BUILD = `date -R` $(USER)@`hostname`
+# ( we can't use fancy options with date since OSes like Solaris
+# or FreeBSD have strange date implementations )
+PROGRAM_BUILD = `date` $(USER)
+# XXX: beos does not support hostname
+#PROGRAM_BUILD = `date` $(USER)@`hostname`
 
 # DEFINE will contain some of the constants definitions decided in Makefile, 
 # including ARCH_xx and SYS_xx. It will be passed to C compiler.
-DEFINE += -DARCH_$(ARCH)
+DEFINE += -DARCH_$(shell echo $(ARCH) | cut -f1 -d' ')
 DEFINE += -DSYS_$(SYS)
-DEFINE += -DAUDIO_OPTIONS="\"$(audio)\""
-DEFINE += -DVIDEO_OPTIONS="\"$(video)\""
-DEFINE += -DPROGRAM_VERSION="\"$(PROGRAM_VERSION)\""
-DEFINE += -DPROGRAM_OPTIONS="\"$(PROGRAM_OPTIONS)\""
-DEFINE += -DPROGRAM_BUILD="\"$(PROGRAM_BUILD)\""
+DEFINE += -DPLUGIN_PATH="\"$(PREFIX)/lib/videolan/vlc\""
+DEFINE += -DPROGRAM_VERSION="\"0.1.99\""
+DEFINE += -DPROGRAM_CODENAME="\"Onatopp\""
+#DEFINE += -DPROGRAM_OPTIONS="\"$(shell echo $(PROGRAM_OPTIONS) | tr 'A-Z' 'a-z')\""
+#DEFINE += -DPROGRAM_BUILD="\"$(PROGRAM_BUILD)\""
 ifeq ($(DEBUG),1)
 DEFINE += -DDEBUG
 endif
@@ -99,14 +107,30 @@ endif
 #
 # C headers directories
 #
-INCLUDE += -Iinclude
+INCLUDE += -Iinclude -I/usr/local/include -I/usr/X11R6/include
 
 #
 # Libraries
 #
-LIB += -lpthread
+
+ifeq ($(SYS),GNU)
+LIB += -lthreads -ldl
+endif
+
+ifeq ($(SYS),BSD)
+LIB += -pthread -lgnugetopt
+LIB += -L/usr/local/lib
+endif
+
+ifeq ($(SYS),LINUX)
+LIB += -lpthread -ldl
+endif
+
+ifeq ($SYS),BEOS)
+LIB += -llibroot -llibgame -llibbe
+endif
+
 LIB += -lm
-LIB += -ldl
 
 #
 # C compiler flags: compilation
@@ -122,19 +146,28 @@ CCFLAGS += -ffast-math -funroll-loops -fargument-noalias-global
 CCFLAGS += -fomit-frame-pointer
 
 # Optimizations for x86 familiy
-ifeq ($(ARCH),X86)
+ifneq (,$(findstring X86,$(ARCH)))
 CCFLAGS += -malign-double
-CCFLAGS += -march=pentiumpro
 #CCFLAGS += -march=pentium
+# Eventual Pentium Pro optimizations
+ifneq (,$(findstring PPRO,$(ARCH)))
+ifneq ($(SYS), BSD)
+CCFLAGS += -march=pentiumpro
+endif
+endif
+# Eventual MMX optimizations for x86
+ifneq (,$(findstring MMX,$(ARCH)))
+CFLAGS += -DHAVE_MMX
+endif
 endif
 
 # Optimizations for PowerPC
-ifeq ($(ARCH),PPC)
+ifneq (,$(findstring PPC,$(ARCH)))
 CCFLAGS += -mcpu=604e -mmultiple -mhard-float -mstring
 endif
 
 # Optimizations for Sparc
-ifeq ($(ARCH),SPARC)
+ifneq (,$(findstring SPARC,$(ARCH)))
 CCFLAGS += -mhard-float
 endif
 
@@ -151,17 +184,6 @@ LCFLAGS += $(LIB)
 LCFLAGS += -Wall
 #LCFLAGS += -s
 
-#
-# C compiler flags: common flags
-#
-
-# Eventual MMX optimizations for x86
-ifeq ($(ARCH),X86)
-ifeq ($(MMX), YES)
-CFLAGS += -DHAVE_MMX
-endif
-endif
-
 #
 # Additionnal debugging flags
 #
@@ -211,7 +233,8 @@ ac3_decoder_obj =		ac3_decoder/ac3_decoder_thread.o \
 						ac3_decoder/ac3_imdct.o \
 						ac3_decoder/ac3_downmix.o
 
-audio_decoder_obj =		audio_decoder/audio_decoder.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
@@ -241,12 +264,14 @@ video_parser_obj = 		video_parser/video_parser.o \
 
 video_decoder_obj =		video_decoder/video_decoder.o \
 						video_decoder/vdec_motion.o \
+						video_decoder/vdec_motion_inner.o \
 			                        video_decoder/vdec_idct.o
 endif
 
 misc_obj =			misc/mtime.o \
 						misc/rsc_files.o \
 						misc/netutils.o \
+						misc/plugins.o \
 						misc/decoder_fifo.o
 
 C_OBJ = $(interface_obj) \
@@ -265,8 +290,8 @@ C_OBJ = $(interface_obj) \
 #
 # Assembler Objects
 # 
-ifeq ($(ARCH),X86)
-ifeq ($(MMX), YES)
+ifneq (,$(findstring X86,$(ARCH)))
+ifneq (,$(findstring MMX,$(ARCH)))
 ifeq ($(DECODER),new)
 ASM_OBJ = 			video_decoder/vdec_idctmmx.o \
 						video_output/video_yuv_mmx.o
@@ -280,19 +305,19 @@ endif
 #
 # Plugins
 #
-interface_plugin =	$(video:%=interface/intf_%.so)
-audio_plugin =		$(audio:%=audio_output/aout_%.so)
-video_plugin = 		$(video:%=video_output/vout_%.so)
+intf_plugin =           $(INTF:%=plugins/intf/intf_%.so)
+aout_plugin =           $(AOUT:%=plugins/aout/aout_%.so)
+vout_plugin =           $(VOUT:%=plugins/vout/vout_%.so)
 
-PLUGIN_OBJ = $(interface_plugin) \
-                $(audio_plugin) \
-                $(video_plugin) \
+PLUGIN_OBJ = $(intf_plugin) $(aout_plugin) $(vout_plugin)
 
 #
 # Other lists of files
 #
+C_OBJ := $(C_OBJ:%.o=src/%.o)
+ASM_OBJ := $(ASM_OBJ:%.o=src/%.o)
 sources := $(C_OBJ:%.o=%.c) $(PLUGIN_OBJ:%.so=%.c)
-dependancies := $(sources:%.c=dep/%.d)
+dependancies := $(sources:%.c=.dep/%.d)
 
 # All symbols must be exported
 export
@@ -311,8 +336,14 @@ clean:
 
 distclean: clean
 	rm -f **/*.o **/*.so **/*~ *.log
+	rm -f Makefile include/defs.h config.cache config.log
 	rm -f vlc gmon.out core
-	rm -rf dep
+	rm -rf .dep
+
+install:
+	$(INSTALL) vlc $(PREFIX)/bin
+	mkdir -p $(PREFIX)/lib/videolan/vlc
+	$(INSTALL) $(PLUGIN_OBJ) $(PREFIX)/lib/videolan/vlc
 
 show:
 	@echo "Command line for C objects:"
@@ -327,7 +358,7 @@ FORCE:
 # Real targets
 #
 vlc: $(C_OBJ) $(ASM_OBJ) $(PLUGIN_OBJ)
-	$(CC) $(LCFLAGS) $(CFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(ASM_OBJ)	
+	$(CC) $(CCFLAGS) $(LCFLAGS) $(CFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(ASM_OBJ)	
 
 #
 # Generic rules (see below)
@@ -336,7 +367,7 @@ $(dependancies): %.d: FORCE
 	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
 
 $(C_OBJ): %.o: Makefile.dep
-$(C_OBJ): %.o: dep/%.d
+$(C_OBJ): %.o: .dep/%.d
 $(C_OBJ): %.o: %.c
 	@echo "compiling $*.o from $*.c"
 	@$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
@@ -347,38 +378,44 @@ $(ASM_OBJ): %.o: %.S
 	@$(CC) $(CFLAGS) -c -o $@ $<
 
 $(PLUGIN_OBJ): %.so: Makefile.dep
-$(PLUGIN_OBJ): %.so: dep/%.d
+$(PLUGIN_OBJ): %.so: .dep/%.d
 
 # audio plugins
-audio_output/aout_dummy.so \
-	audio_output/aout_dsp.so: %.so: %.c
+plugins/aout/aout_dummy.so plugins/aout/aout_dsp.so: %.so: %.c
 		@echo "compiling $*.so from $*.c"
+ifeq ($(SYS), BEOS)
+		@$(CC) $(CCFLAGS) $(CFLAGS) -nostart -o $@ $<
+else
 		@$(CC) $(CCFLAGS) $(CFLAGS) -shared -o $@ $<
+endif
 
-audio_output/aout_esd.so: %.so: %.c
+plugins/aout/aout_esd.so: %.so: %.c
 		@echo "compiling $*.so from $*.c"
+ifeq ($(SYS), BSD)
+		@$(CC) $(CCFLAGS) $(CFLAGS) -lesd -shared -o $@ $<
+else
 		@$(CC) $(CCFLAGS) $(CFLAGS) -laudiofile -lesd -shared -o $@ $<
+endif
 
 # video plugins
-interface/intf_dummy.so \
-	video_output/vout_dummy.so \
-	interface/intf_fb.so \
-	video_output/vout_fb.so: %.so: %.c
+plugins/intf/intf_dummy.so plugins/vout/vout_dummy.so \
+	plugins/intf/intf_fb.so plugins/vout/vout_fb.so: %.so: %.c
 		@echo "compiling $*.so from $*.c"
+ifeq ($(SYS), BEOS)
+		@$(CC) $(CCFLAGS) $(CFLAGS) -nostart -o $@ $<
+else
 		@$(CC) $(CCFLAGS) $(CFLAGS) -shared -o $@ $<
+endif
 
-interface/intf_x11.so \
-	video_output/vout_x11.so: %.so: %.c
+plugins/intf/intf_x11.so plugins/vout/vout_x11.so: %.so: %.c
 		@echo "compiling $*.so from $*.c"
 		@$(CC) $(CCFLAGS) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lX11 -lXext -shared -o $@ $<
 
-interface/intf_glide.so \
-	video_output/vout_glide.so: %.so: %.c
+plugins/intf/intf_glide.so plugins/vout/vout_glide.so: %.so: %.c
 		@echo "compiling $*.so from $*.c"
 		@$(CC) $(CCFLAGS) $(CFLAGS) -I/usr/include/glide -lglide2x -shared -o $@ $<
 
-interface/intf_ggi.so \
-	video_output/vout_ggi.so: %.so: %.c
+plugins/intf/intf_ggi.so plugins/vout/vout_ggi.so: %.so: %.c
 		@echo "compiling $*.so from $*.c"
 		@$(CC) $(CCFLAGS) $(CFLAGS) -lggi -shared -o $@ $<
 
@@ -388,15 +425,15 @@ interface/intf_ggi.so \
 ################################################################################
 
 # 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/ 
+# 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 
+# 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 
+# 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,