X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.in;h=60001e3a68ae26737f0d043388e489109b9f40bf;hb=420ec3aac36002aa56f10f980f2127d5925062c1;hp=df4a6fb93e4b45be7b35f1c5db74c3a0ab9cf32b;hpb=174e05473738ae94b77a12a36f6501a03c7f07a4;p=vlc

diff --git a/Makefile.in b/Makefile.in
index df4a6fb93e..60001e3a68 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,6 +23,9 @@ prefix=@prefix@
 CC=@CC@
 SHELL=@SHELL@
 
+LIB_SDL=@LIB_SDL@
+LIB_GLIDE=@LIB_GLIDE@
+LIB_GGI=@LIB_GGI@
 
 #----------------- do not change anything below this line ----------------------
 
@@ -50,7 +53,7 @@ PROGRAM_BUILD = `date` $(USER)
 
 # DEFINE will contain some of the constants definitions decided in Makefile, 
 # including SYS_xx. It will be passed to C compiler.
-DEFINE += -DSYS_$(shell echo $(SYS) | sed 's/-.*//' | tr a-z A-Z)
+DEFINE += -DSYS_$(shell echo $(SYS) | sed 's/-.*//' | tr a-z. A-Z_)
 
 ################################################################################
 # Tuning and other variables - do not change anything except if you know
@@ -79,7 +82,7 @@ LIB += -lpthread -ldl
 endif
 
 ifneq (,$(findstring solaris,$(SYS)))
-LIB += -ldl -lsocket -lnsl -lposix4 -lpthread
+LIB += -ldl -lsocket -lnsl -lpthread
 endif
 
 ifeq ($(SYS),beos)
@@ -104,20 +107,18 @@ endif
 # Optimizations : don't compile debug versions with them
 ifeq ($(OPTIMS),1)
 CFLAGS += -O6
-CFLAGS += -ffast-math -funroll-loops -fargument-noalias-global
-CFLAGS += -funroll-all-loops -fstrict-aliasing
+CFLAGS += -ffast-math -funroll-loops -funroll-all-loops
 CFLAGS += -fomit-frame-pointer
+CFLAGS += @BIZARRE_OPTIMS@
 
 # Optimizations for x86 familiy
 ifneq (,$(findstring 86,$(ARCH)))
 CFLAGS += -malign-double
 # Optional Pentium Pro optimizations
 ifneq (,$(findstring ppro,$(ARCH)))
-ifneq ($(SYS), BSD)
-CFLAGS += -march=pentiumpro
-endif
+CFLAGS += -march=pentiumpro -mcpu=pentiumpro
 else
-CFLAGS += -march=pentium
+CFLAGS += -march=pentium -mcpu=pentium
 endif
 endif
 
@@ -147,9 +148,7 @@ endif
 #
 # C compiler flags: plugin compilation
 #
-ifneq (,$(findstring solaris,$(SYS)))
 PCFLAGS += -fPIC
-endif
 
 #
 # C compiler flags: dependancies
@@ -187,6 +186,8 @@ INTERFACE =	src/interface/main.o \
 
 INPUT =		src/input/input_ps.o \
 		src/input/input_ts.o \
+		src/input/dvd_ifo.o \
+		src/input/input_dvd.o \
 		src/input/mpeg_system.o \
 		src/input/input_ext-dec.o \
 		src/input/input_dec.o \
@@ -239,12 +240,12 @@ endif
 
 VIDEO_DECODER =	src/video_decoder/video_decoder.o \
 		src/video_decoder/vdec_motion.o \
-		src/video_decoder/vdec_idct.o \
 		$(vdec_motion_inner)
 
 MISC =		src/misc/mtime.o \
 		src/misc/tests.o \
 		src/misc/rsc_files.o \
+		src/misc/modules.o \
 		src/misc/netutils.o \
 		src/misc/playlist.o \
 		src/misc/plugins.o
@@ -276,8 +277,8 @@ endif
 # 
 ifneq (,$(findstring 86,$(ARCH)))
 ifneq (,$(findstring mmx,$(ARCH)))
-ASM_OBJ = 	src/video_decoder/vdec_idctmmx.o \
-		src/video_output/video_yuv_mmx.o
+ASM_OBJ =		src/video_output/video_yuv_mmx.o
+STD_PLUGIN_ASM = 	plugins/idct/idctmmx_asm.o
 endif
 endif
 
@@ -314,6 +315,8 @@ PLUGIN_SDL =	plugins/sdl/sdl.o \
 #		plugins/sdl/video_yuv.o \
 #		plugins/sdl/video_yuvall.o
 
+PLUGIN_NULL =	plugins/null/null.o
+
 PLUGIN_GLIDE =	plugins/glide/glide.o \
 		plugins/glide/intf_glide.o \
 		plugins/glide/vout_glide.o
@@ -349,6 +352,16 @@ PLUGIN_YUVMMX = plugins/yuvmmx/yuvmmx.o \
 		plugins/yuvmmx/video_yuv24.o \
 		plugins/yuvmmx/video_yuv32.o
 
+PLUGIN_IDCT =	plugins/idct/idct.o \
+		plugins/idct/idct_common.o
+
+PLUGIN_IDCTCLASSIC =	plugins/idct/idctclassic.o \
+			plugins/idct/idct_common.o
+
+PLUGIN_IDCTMMX =	plugins/idct/idctmmx.o \
+			plugins/idct/idct_common.o \
+			plugins/idct/idctmmx_asm.o
+
 PLUGIN_ALSA =	plugins/alsa/alsa.o \
 		plugins/alsa/aout_alsa.o
 
@@ -362,13 +375,23 @@ STD_PLUGIN_OBJ =$(PLUGIN_BEOS) \
 		$(PLUGIN_X11) \
 		$(PLUGIN_YUV) \
 		$(PLUGIN_YUVMMX) \
+		$(PLUGIN_IDCT) \
+		$(PLUGIN_IDCTMMX) \
 		$(PLUGIN_SDL) \
-		$(PLUGIN_ALSA)
+		$(PLUGIN_ALSA) \
+		$(PLUGIN_NULL)
+
+# list duplicates
+STD_PLUGIN_COMMON =	plugins/idct/idct_common.o
+
+# filter out duplicates from the plugin object lists
+STD_PLUGIN_OBJ :=	$(filter-out $(STD_PLUGIN_COMMON) $(STD_PLUGIN_ASM), \
+				 $(STD_PLUGIN_OBJ)) $(STD_PLUGIN_COMMON)
 
 #
 # Other lists of files
 #
-objects := $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ)
+objects := $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ) $(STD_PLUGIN_ASM)
 dependancies := $(objects:%.o=.dep/%.d)
 
 # All symbols must be exported
@@ -393,16 +416,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
+	for alias in "" @ALIASES@ ; do if test $$alias ; then rm -f $(prefix)/bin/$$alias && ln -s vlc $(prefix)/bin/$$alias ; fi ; done
 	mkdir -p $(prefix)/lib/videolan/vlc
-	$(INSTALL) -m 644 $(PLUGINS) $(prefix)/lib/videolan/vlc
+	$(INSTALL) -m 644 $(PLUGINS:%=lib/%.so) $(prefix)/lib/videolan/vlc
 	mkdir -p $(prefix)/share/videolan
 	$(INSTALL) -m 644 share/*.psf $(prefix)/share/videolan
 	$(INSTALL) -m 644 share/*.png $(prefix)/share/videolan
@@ -412,6 +433,7 @@ show:
 	@echo CFLAGS: $(CFLAGS)
 	@echo DCFLAGS: $(DCFLAGS)
 	@echo LCFLAGS: $(LCFLAGS)
+	@echo STD_PLUGIN_OBJ: $(STD_PLUGIN_OBJ)
 
 # ugliest of all, but I have no time to do it -- sam
 snapshot:
@@ -466,78 +488,108 @@ $(STD_PLUGIN_OBJ): %.o: .dep/%.d
 $(STD_PLUGIN_OBJ): %.o: %.c
 	$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
 
+$(STD_PLUGIN_ASM): %.o: Makefile.dep
+$(STD_PLUGIN_ASM): %.o: %.S
+	$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
+
 $(PLUGIN_GNOME): %.o: Makefile.dep
 $(PLUGIN_GNOME): %.o: %.c
-	$(CC) $(CFLAGS) `gnome-config --cflags gnomeui` -c -o $@ $<
+	$(CC) $(CFLAGS) $(PCFLAGS) `gnome-config --cflags gnomeui` -c -o $@ $<
 
 $(PLUGIN_GLIDE): %.o: Makefile.dep
 $(PLUGIN_GLIDE): %.o: %.c
-	$(CC) $(CFLAGS) -I/usr/include/glide -c -o $@ $<
+	$(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/glide -c -o $@ $<
 
 #
-# Real targets
+# Main application target
 #
+
 vlc: $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
 ifeq ($(SYS),beos)
 	$(CC) $(CFLAGS) $(LCFLAGS) -Xlinker -soname=_APP_ -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
 	rm -f ./plugins/_APP_
 	ln -s ../vlc ./plugins/_APP_
 else
-	$(CC) $(CFLAGS) $(LCFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)	
+	$(CC) $(CFLAGS) $(LCFLAGS) --export-dynamic @DYNAMIC_FLAG@ -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)	
 endif
 
+#
+# Plugin targets
+#
+
 lib/beos.so: $(PLUGIN_BEOS)
-	$(CC) $(CFLAGS) $(LCFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+	$(CC) $(PCFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
 
 lib/esd.so: $(PLUGIN_ESD)
 ifneq (,$(findstring bsd,$(SYS)))
-	$(CC) -shared -lesd -o $@ $^
+	$(CC) $(PCFLAGS) -shared -o $@ $^ -lesd
 else
-	$(CC) -shared -laudiofile -lesd -o $@ $^
+	$(CC) $(PCFLAGS) -shared -o $@ $^ -laudiofile -lesd
 endif
 
 lib/dsp.so: $(PLUGIN_DSP)
-	$(CC) -shared -o $@ $^
+	$(CC) $(PCFLAGS) -shared -o $@ $^
 
 lib/alsa.so: $(PLUGIN_ALSA)
-	$(CC) -shared -o $@ $^
+	$(CC) $(PCFLAGS) -shared -o $@ $^ -lasound
+
+lib/null.so: $(PLUGIN_NULL)
+	$(CC) $(PCFLAGS) -shared -o $@ $^
 
 lib/dummy.so: $(PLUGIN_DUMMY)
-	$(CC) -shared -o $@ $^
+	$(CC) $(PCFLAGS) -shared -o $@ $^
 
 lib/fb.so: $(PLUGIN_FB)
-	$(CC) -shared -o $@ $^
+	$(CC) $(PCFLAGS) -shared -o $@ $^
 
 lib/x11.so: $(PLUGIN_X11)
-	$(CC) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
+	$(CC) $(PCFLAGS) -shared -o $@ $^ -L/usr/X11R6/lib -lX11 -lXext
 
 lib/mga.so: $(PLUGIN_MGA)
-	$(CC) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
+	$(CC) $(PCFLAGS) -shared -o $@ $^ -L/usr/X11R6/lib -lX11 -lXext
 
 lib/gnome.so: $(PLUGIN_GNOME)
-	$(CC) -shared `gnome-config --libs gnomeui | sed 's,-rdynamic,,'` -o $@ $^
+	$(CC) $(PCFLAGS) -shared -o $@ $^ `gnome-config --libs gnomeui | sed 's,-rdynamic,,'`
 
 lib/glide.so: $(PLUGIN_GLIDE)
-	$(CC) -shared -lglide2x -o $@ $^
+	$(CC) $(PCFLAGS) -shared -o $@ $^ $(LIB_GLIDE)
 
 lib/ggi.so: $(PLUGIN_GGI)
-	$(CC) -shared -lggi -o $@ $^
+	$(CC) $(PCFLAGS) -shared -o $@ $^ $(LIB_GGI)
 
 lib/sdl.so: $(PLUGIN_SDL)
-	$(CC) -shared -lSDL -o $@ $^
+	$(CC) $(PCFLAGS) -shared -o $@ $^ $(LIB_SDL)
 
-lib/yuv.so: $(PLUGIN_YUV)
 ifeq ($(SYS),beos)
-	$(CC) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
-else
-	$(CC) -shared -o $@ $^
-endif
+lib/idct.so: $(PLUGIN_IDCT)
+	$(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
+lib/yuv.so: $(PLUGIN_YUV)
+	$(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
 
 lib/yuvmmx.so: $(PLUGIN_YUVMMX)
-ifeq ($(SYS),beos)
-	$(CC) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+	$(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
+lib/idctclassic.so: $(PLUGIN_IDCTCLASSIC)
+	$(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
+lib/idctmmx.so: $(PLUGIN_IDCTMMX)
+	$(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
 else
-	$(CC) $(LCFLAGS) -shared -o $@ $^
+lib/yuv.so: $(PLUGIN_YUV)
+	$(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/yuvmmx.so: $(PLUGIN_YUVMMX)
+	$(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/idct.so: $(PLUGIN_IDCT)
+	$(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/idctclassic.so: $(PLUGIN_IDCTCLASSIC)
+	$(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/idctmmx.so: $(PLUGIN_IDCTMMX)
+	$(CC) $(PCFLAGS) -shared -o $@ $^
 endif
 
 ################################################################################