X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.in;h=0af35ed0e9e09084bd4175fe3d22d0d2cc2468e0;hb=dbbaf8dd5efc0cf12418cabf780da3129ee4a142;hp=e5bcc41982707b9784e9f146002b242c3566cddb;hpb=1c99dc85d66afd4d80e3fe3f48e4b1cbae0e93d8;p=vlc

diff --git a/Makefile.in b/Makefile.in
index e5bcc41982..0af35ed0e9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,13 @@ SYS=@SYS@
 PLUGINS=@PLUGINS@
 INSTALL=@INSTALL@
 ARCH=@ARCH@
+
+exec_prefix=@exec_prefix@
 prefix=@prefix@
+bindir=@bindir@
+datadir=@datadir@
+libdir=@libdir@
+
 CC=@CC@
 SHELL=@SHELL@
 
@@ -212,7 +218,8 @@ AC3_DECODER =	src/ac3_decoder/ac3_decoder_thread.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.o \
+		src/ac3_decoder/ac3_downmix_c.o
 
 LPCM_DECODER =	src/lpcm_decoder/lpcm_decoder_thread.o \
 		src/lpcm_decoder/lpcm_decoder.o
@@ -269,30 +276,21 @@ endif
 ifneq (,$(findstring 86,$(ARCH)))
 ifneq (,$(findstring mmx,$(ARCH)))
 ASM_OBJ =		
-STD_PLUGIN_ASM = 	
 endif
 endif
 
 #
 # Plugins
 #
-PLUGIN_NULL =	plugins/null/null.o
-
-PLUGIN_PS =	plugins/mpeg/ps.o \
-		plugins/mpeg/input_ps.o
-
-PLUGIN_TS =	plugins/mpeg/ts.o \
-		plugins/mpeg/input_ts.o
-
-PLUGIN_DVD =	plugins/dvd/dvd.o \
-		plugins/dvd/input_dvd.o \
-		plugins/dvd/dvd_ifo.o \
-	        plugins/dvd/dvd_css.o
+PLUGIN_ALSA =	plugins/alsa/alsa.o \
+		plugins/alsa/aout_alsa.o
 
 PLUGIN_BEOS =	plugins/beos/beos.o \
 		plugins/beos/aout_beos.o \
 		plugins/beos/intf_beos.o \
-		plugins/beos/vout_beos.o
+		plugins/beos/vout_beos.o \
+		plugins/beos/DrawingTidbits.o \
+		plugins/beos/TransportButton.o
 
 PLUGIN_DSP =	plugins/dsp/dsp.o \
 		plugins/dsp/aout_dsp.o
@@ -302,45 +300,56 @@ PLUGIN_DUMMY =	plugins/dummy/dummy.o \
 		plugins/dummy/intf_dummy.o \
 		plugins/dummy/vout_dummy.o
 
+PLUGIN_DVD =	plugins/dvd/dvd.o \
+		plugins/dvd/input_dvd.o \
+		plugins/dvd/dvd_netlist.o \
+		plugins/dvd/dvd_ioctl.o \
+		plugins/dvd/dvd_ifo.o \
+		plugins/dvd/dvd_udf.o \
+		plugins/dvd/dvd_css.o
+
 PLUGIN_ESD =	plugins/esd/esd.o \
 		plugins/esd/aout_esd.o
 
 PLUGIN_FB =	plugins/fb/fb.o \
-		plugins/fb/intf_fb.o \
 		plugins/fb/vout_fb.o
 
 PLUGIN_GGI =	plugins/ggi/ggi.o \
-		plugins/ggi/intf_ggi.o \
 		plugins/ggi/vout_ggi.o
 
-PLUGIN_SDL =	plugins/sdl/sdl.o \
-		plugins/sdl/vout_sdl.o \
-		plugins/sdl/aout_sdl.o 
-
 PLUGIN_GLIDE =	plugins/glide/glide.o \
-		plugins/glide/intf_glide.o \
 		plugins/glide/vout_glide.o
 
+PLUGIN_GTK =	plugins/gtk/gtk.o \
+		plugins/gtk/intf_gtk.o \
+		plugins/gtk/gtk_callbacks.o \
+		plugins/gtk/gtk_interface.o \
+		plugins/gtk/gtk_support.o
+
 PLUGIN_GNOME =	plugins/gnome/gnome.o \
 		plugins/gnome/intf_gnome.o \
 		plugins/gnome/gnome_callbacks.o \
 		plugins/gnome/gnome_interface.o \
 		plugins/gnome/gnome_support.o
 
-PLUGIN_MGA =	plugins/mga/mga.o \
-		plugins/mga/intf_mga.o \
-		plugins/mga/vout_mga.o
+PLUGIN_KDE =	plugins/kde/kde.o \
+		plugins/kde/intf_kde.o \
+		plugins/kde/kvlc.o
 
-PLUGIN_X11=	plugins/x11/x11.o \
-		plugins/x11/vout_x11.o
+PLUGIN_IDCT =	plugins/idct/idct.o \
+		plugins/idct/idct_common.o
 
-PLUGIN_YUV =	plugins/yuv/yuv.o \
-		plugins/yuv/video_yuv.o \
-		plugins/yuv/transforms_yuv.o
+PLUGIN_IDCTCLASSIC =	plugins/idct/idctclassic.o \
+			plugins/idct/idct_common.o
 
-PLUGIN_YUVMMX =	plugins/yuv/yuvmmx.o \
-		plugins/yuv/video_yuvmmx.o \
-		plugins/yuv/transforms_yuvmmx.o
+PLUGIN_IDCTMMX =	plugins/idct/idctmmx.o \
+			plugins/idct/idct_common.o
+
+PLUGIN_IDCTMMXEXT =	plugins/idct/idctmmxext.o \
+			plugins/idct/idct_common.o
+
+PLUGIN_MGA =	plugins/mga/mga.o \
+		plugins/mga/vout_mga.o
 
 PLUGIN_MOTION =	plugins/motion/motion.o \
 		plugins/motion/vdec_motion_common.o \
@@ -354,55 +363,81 @@ PLUGIN_MOTIONMMXEXT =	plugins/motion/motionmmxext.o \
 			plugins/motion/vdec_motion_common.o \
 			plugins/motion/vdec_motion_inner_mmxext.o
 
-PLUGIN_IDCT =	plugins/idct/idct.o \
-		plugins/idct/idct_common.o
+PLUGIN_NCURSES =	plugins/text/ncurses.o \
+			plugins/text/intf_ncurses.o
 
-PLUGIN_IDCTCLASSIC =	plugins/idct/idctclassic.o \
-			plugins/idct/idct_common.o
+PLUGIN_NULL =	plugins/null/null.o
 
-PLUGIN_IDCTMMX =	plugins/idct/idctmmx.o \
-			plugins/idct/idct_common.o
+PLUGIN_PS =	plugins/mpeg/ps.o \
+		plugins/mpeg/input_ps.o
 
-PLUGIN_IDCTMMXEXT =	plugins/idct/idctmmxext.o \
-			plugins/idct/idct_common.o
+PLUGIN_SDL =	plugins/sdl/sdl.o \
+		plugins/sdl/vout_sdl.o \
+		plugins/sdl/aout_sdl.o 
 
-PLUGIN_ALSA =	plugins/alsa/alsa.o \
-		plugins/alsa/aout_alsa.o
+PLUGIN_TS =	plugins/mpeg/ts.o \
+		plugins/mpeg/input_ts.o
+
+PLUGIN_X11=	plugins/x11/x11.o \
+		plugins/x11/vout_x11.o
 
-STD_PLUGIN_OBJ =$(PLUGIN_BEOS) \
+PLUGIN_YUV =	plugins/yuv/yuv.o \
+		plugins/yuv/video_yuv.o \
+		plugins/yuv/transforms_yuv.o
+
+PLUGIN_YUVMMX =	plugins/yuv/yuvmmx.o \
+		plugins/yuv/video_yuvmmx.o \
+		plugins/yuv/transforms_yuvmmx.o
+
+STD_PLUGIN_OBJ = \
+		$(PLUGIN_ALSA) \
 		$(PLUGIN_DSP) \
 		$(PLUGIN_DUMMY) \
+		$(PLUGIN_DVD) \
 		$(PLUGIN_ESD) \
 		$(PLUGIN_FB) \
 		$(PLUGIN_GGI) \
-		$(PLUGIN_MGA) \
-		$(PLUGIN_X11) \
-		$(PLUGIN_YUV) \
-		$(PLUGIN_YUVMMX) \
-		$(PLUGIN_MOTION) \
-		$(PLUGIN_MOTIONMMX) \
-		$(PLUGIN_MOTIONMMXEXT) \
 		$(PLUGIN_IDCT) \
 		$(PLUGIN_IDCTCLASSIC) \
 		$(PLUGIN_IDCTMMX) \
 		$(PLUGIN_IDCTMMXEXT) \
+		$(PLUGIN_MGA) \
+		$(PLUGIN_MOTION) \
+		$(PLUGIN_MOTIONMMX) \
+		$(PLUGIN_MOTIONMMXEXT) \
+		$(PLUGIN_NCURSES) \
+		$(PLUGIN_NULL) \
+		$(PLUGIN_PS) \
 		$(PLUGIN_SDL) \
-		$(PLUGIN_ALSA) \
-		$(PLUGIN_NULL)
+		$(PLUGIN_TS) \
+		$(PLUGIN_X11) \
+		$(PLUGIN_YUV) \
+		$(PLUGIN_YUVMMX)
 
 # list duplicates
 STD_PLUGIN_COMMON =	plugins/idct/idct_common.o \
 			plugins/motion/vdec_motion_common.o
 
 # filter out duplicates from the plugin object lists
-STD_PLUGIN_OBJ :=	$(filter-out $(STD_PLUGIN_COMMON) $(STD_PLUGIN_ASM), \
+STD_PLUGIN_OBJ :=	$(filter-out $(STD_PLUGIN_COMMON), \
 				 $(STD_PLUGIN_OBJ)) $(STD_PLUGIN_COMMON)
 
+NONSTD_PLUGIN_OBJ = \
+		$(PLUGIN_GLIDE) \
+		$(PLUGIN_GTK) \
+		$(PLUGIN_GNOME)
+
+NONSTD_CPP_PLUGIN_OBJ = \
+		$(PLUGIN_BEOS) \
+		$(PLUGIN_KDE)
+
 #
 # Other lists of files
 #
-objects := $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ) $(STD_PLUGIN_ASM)
-dependancies := $(objects:%.o=.dep/%.d)
+objects := $(C_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ) $(NONSTD_PLUGIN_OBJ)
+cdependancies := $(objects:%.o=.dep/%.d)
+cppobjects := $(CPP_OBJ) $(NONSTD_CPP_PLUGIN_OBJ)
+cppdependancies := $(cppobjects:%.o=.dep/%.dpp)
 
 # All symbols must be exported
 export
@@ -419,7 +454,7 @@ all: vlc @ALIASES@ plugins
 clean:
 	rm -f $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ)
 	rm -f plugins/*/*.o src/*/*.o lib/*.so
-	rm -f vlc @ALIASES@
+	rm -f vlc kvlc gvlc
 
 distclean: clean
 	rm -f src/*/*.o plugins/*/*.o **/*~ *.log
@@ -429,36 +464,39 @@ distclean: clean
 	rm -rf .dep
 
 install:
-	mkdir -p $(prefix)/bin
-	$(INSTALL) vlc $(prefix)/bin
+	mkdir -p $(DESTDIR)$(bindir)
+	$(INSTALL) vlc $(DESTDIR)$(bindir)
 # ugly
-	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:%=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
+	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 STD_PLUGIN_OBJ: $(STD_PLUGIN_OBJ)
+	@echo NONSTD_PLUGIN_OBJ: $(NONSTD_PLUGIN_OBJ)
+	@echo NONSTD_CPP_PLUGIN_OBJ: $(NONSTD_CPP_PLUGIN_OBJ)
+	@echo objects: $(objects)
+	@echo cppobjects: $(cppobjects)
 
 # ugliest of all, but I have no time to do it -- sam
 snapshot:
-	rm -rf /tmp/vlc-@VLC_VERSION@ /tmp/vlc-@VLC_VERSION@nocss
+	rm -rf /tmp/vlc-@VLC_VERSION@* /tmp/vlc-@VLC_VERSION@nocss*
 	# copy archive in /tmp
-	find -type d | while read i ; \
+	find -type d | grep -v CVS | grep -v '^\.dep' | while read i ; \
 		do mkdir -p /tmp/vlc-@VLC_VERSION@/$$i ; \
 	done
-	find debian -mindepth 1 -maxdepth 1 -type d | grep -v CVS | \
+	find debian -mindepth 1 -maxdepth 1 -type d | \
 		while read i ; do rm -rf /tmp/vlc-@VLC_VERSION@/$$i ; done
-	# CVS entries
-	find . -type f | grep CVS | while read i ; \
-		do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \
-	done
 	# .c .h .in .cpp
 	find include src plugins -type f -name '*.[chi]*' | while read i ; \
 		do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \
@@ -468,11 +506,13 @@ snapshot:
 		Makefile.in Makefile.dep configure configure.in install-sh \
 		config.sub config.guess todo.pl \
 			/tmp/vlc-@VLC_VERSION@/
-	for file in control vlc-gnome.menu vlc.copyright vlc.docs changelog \
-		rules vlc.1 vlc.dirs vlc.menu ; do \
+	for file in control control-css vlc-gtk.menu vlc.copyright vlc.docs \
+		changelog changelog-css rules rules-css vlc.1 vlc.dirs \
+		vlc.menu ; do \
 			cp debian/$$file /tmp/vlc-@VLC_VERSION@/debian/ ; done
-	for file in default8x16.psf default8x9.psf gvlc.png vlc.png ; do \
-		cp share/$$file /tmp/vlc-@VLC_VERSION@/share/ ; done
+	for file in default8x16.psf default8x9.psf gvlc.png vlc.png \
+		gvlc.xpm vlc.xpm ; do \
+			cp share/$$file /tmp/vlc-@VLC_VERSION@/share/ ; done
 
 	# build css-enabled archives
 	(cd /tmp ; tar cf vlc-@VLC_VERSION@.tar vlc-@VLC_VERSION@ ; \
@@ -481,47 +521,28 @@ snapshot:
 		gzip -f -9 vlc-@VLC_VERSION@.tar )
 	mv /tmp/vlc-@VLC_VERSION@.tar.gz /tmp/vlc-@VLC_VERSION@.tar.bz2 ..
 
-	# removing CSS stuff
-	find /tmp/vlc-@VLC_VERSION@ -type f -name '*css*' | xargs rm -f
-	for x in Makefile.in src/input/input_dvd.c src/input/input_dvd.h ; do \
-	rm -f /tmp/vlc-@VLC_VERSION@/$$x ; \
-	perl -ne 'if (/^#e(lse|ndif)/) { $$i=0; } \
-			if (/^#if.*DVD/) { $$i=1; print "#if 0\n"; } \
-			elsif (!$$i || /^#/) { print $$_; }' \
-		< $$x | grep -vi css >| /tmp/vlc-@VLC_VERSION@/$$x ; \
-	done
-	rm -f /tmp/vlc-@VLC_VERSION@/debian/changelog
-	sed 's/\(^vlc ([^-]*\)-/\1nocss-/' < debian/changelog \
-		> /tmp/vlc-@VLC_VERSION@/debian/changelog
-
-	# build nocss archives
-	(cd /tmp ; mv vlc-@VLC_VERSION@ vlc-@VLC_VERSION@nocss ; \
-		tar cf vlc-@VLC_VERSION@nocss.tar vlc-@VLC_VERSION@nocss ; \
-		bzip2 -f -9 < vlc-@VLC_VERSION@nocss.tar \
-			> vlc-@VLC_VERSION@nocss.tar.bz2 ; \
-		gzip -f -9 vlc-@VLC_VERSION@nocss.tar )
-	mv /tmp/vlc-@VLC_VERSION@nocss.tar.gz \
-		/tmp/vlc-@VLC_VERSION@nocss.tar.bz2 ..
-
 	# clean up
-	rm -rf /tmp/vlc-@VLC_VERSION@nocss
+	rm -rf /tmp/vlc-@VLC_VERSION@*
 
 plugins: $(PLUGINS:%=lib/%.so)
 
 FORCE:
 
 #
-# Gnome and Framebuffer aliases - don't add new aliases which could bloat
+# GTK/Gnome and Framebuffer aliases - don't add new aliases which could bloat
 # the namespace
 #
-gvlc fbvlc: vlc
+gvlc kvlc: vlc
 	rm -f $@ && ln -s vlc $@
 
 
 #
 # Generic rules (see below)
 #
-$(dependancies): %.d: FORCE
+$(cdependancies): %.d: FORCE
+	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
+
+$(cppdependancies): %.dpp: FORCE
 	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
 
 $(C_OBJ): %.o: Makefile.dep
@@ -529,6 +550,8 @@ $(C_OBJ): %.o: .dep/%.d
 $(C_OBJ): %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
+$(CPP_OBJ): %.o: Makefile.dep
+$(CPP_OBJ): %.o: .dep/%.dpp
 $(CPP_OBJ): %.o: %.cpp
 	$(CC) $(CFLAGS) -c -o $@ $<
 
@@ -541,18 +564,31 @@ $(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_GTK): %.o: Makefile.dep
+$(PLUGIN_GTK): %.o: .dep/%.d
+$(PLUGIN_GTK): %.o: %.c
+	$(CC) $(CFLAGS) $(PCFLAGS) `gtk-config --cflags gtk` -c -o $@ $<
 
 $(PLUGIN_GNOME): %.o: Makefile.dep
+$(PLUGIN_GNOME): %.o: .dep/%.d
 $(PLUGIN_GNOME): %.o: %.c
 	$(CC) $(CFLAGS) $(PCFLAGS) `gnome-config --cflags gnomeui` -c -o $@ $<
 
 $(PLUGIN_GLIDE): %.o: Makefile.dep
+$(PLUGIN_GLIDE): %.o: .dep/%.d
 $(PLUGIN_GLIDE): %.o: %.c
 	$(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/glide -c -o $@ $<
 
+$(PLUGIN_KDE): %.o: Makefile.dep
+$(PLUGIN_KDE): %.o: .dep/%.dpp
+$(PLUGIN_KDE): %.o: %.cpp
+	$(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/kde -I/usr/include/qt -fno-rtti -c -o $@ $<
+
+$(PLUGIN_BEOS): %.o: Makefile.dep
+$(PLUGIN_BEOS): %.o: .dep/%.dpp
+$(PLUGIN_BEOS): %.o: %.cpp
+	$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
+
 #
 # Main application target
 #
@@ -571,7 +607,7 @@ endif
 #
 
 lib/beos.so: $(PLUGIN_BEOS)
-	$(CC) $(PCFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+	$(CC) $(PCFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_ -lbe -lgame -lroot -ltracker
 
 lib/esd.so: $(PLUGIN_ESD)
 ifneq (,$(findstring bsd,$(SYS)))
@@ -583,6 +619,9 @@ endif
 lib/dsp.so: $(PLUGIN_DSP)
 	$(CC) $(PCFLAGS) -shared -o $@ $^
 
+lib/kde.so: $(PLUGIN_KDE)
+	$(CC) $(PCFLAGS) -shared -o $@ $^ -lkdeui -lkdecore -lqt -ldl
+
 lib/alsa.so: $(PLUGIN_ALSA)
 	$(CC) $(PCFLAGS) -shared -o $@ $^ -lasound
 
@@ -595,6 +634,9 @@ lib/x11.so: $(PLUGIN_X11)
 lib/mga.so: $(PLUGIN_MGA)
 	$(CC) $(PCFLAGS) -shared -o $@ $^ -L/usr/X11R6/lib -lX11 -lXext
 
+lib/gtk.so: $(PLUGIN_GTK)
+	$(CC) $(PCFLAGS) -shared -o $@ $^ `gtk-config --libs gtk | sed 's,-rdynamic,,'`
+
 lib/gnome.so: $(PLUGIN_GNOME)
 	$(CC) $(PCFLAGS) -shared -o $@ $^ `gnome-config --libs gnomeui | sed 's,-rdynamic,,'`
 
@@ -607,6 +649,9 @@ lib/ggi.so: $(PLUGIN_GGI)
 lib/sdl.so: $(PLUGIN_SDL)
 	$(CC) $(PCFLAGS) -shared -o $@ $^ $(LIB_SDL)
 
+lib/ncurses.so: $(PLUGIN_NCURSES)
+	$(CC) $(PCFLAGS) -shared -o $@ $^ -lncurses
+
 ifeq ($(SYS),beos)
 lib/null.so: $(PLUGIN_NULL)
 	$(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_