Bon finalement puisque tout le monde dort, je l'ai fait :)

[vlc] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c4b48bc331c5ffa700d4f38902630e4122f52531..eec760652d26dea35bfbe50a204bf2b95da8b719 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 ################################################################################
 # vlc (VideoLAN Client) main makefile
 # (c)1998 VideoLAN
@@ -10,31 +11,33 @@
 ################################################################################
 
 # Audio output settings
-AUDIO = dsp
-#AUDIO += esd
+AOUT += dsp
+#AOUT += esd
 # Not yet supported
-#AUDIO += alsa
+#AOUT += alsa
 # Fallback method that should always work
-AUDIO += dummy
+AOUT += dummy
 
 # Video output settings
-VOUT = x11
+VOUT += x11
 #VOUT += fb
 #VOUT += ggi
 #VOUT += glide
 # Not yet supported
-#VOUT = beos
+#VOUT += gnome
+#VOUT += beos
 #VOUT += dga
 # Fallback method that should always work
 VOUT += dummy
 
 # Interface settings
-INTF = x11
+INTF += x11
 #INTF += fb
 #INTF += ggi
 #INTF += glide
 # Not yet supported
-#INTF = beos
+#INTF += gnome
+#INTF += beos
 #INTF += dga
 # Fallback method that should always work
 INTF += dummy
@@ -65,14 +68,13 @@ DEBUG=0
 
 #----------------- do not change anything below this line ----------------------
 
+prefix=@prefix@
+INSTALL=@INSTALL@
+
 ################################################################################
 # Configuration pre-processing
 ################################################################################
 
-# audio and video options
-AUDIO := $(shell echo $(AUDIO) | 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 = $(SYS) $(ARCH)
 ifeq ($(DEBUG),1)
@@ -90,11 +92,10 @@ PROGRAM_BUILD = `date` $(USER)
 # including ARCH_xx and SYS_xx. It will be passed to C compiler.
 DEFINE += -DARCH_$(shell echo $(ARCH) | cut -f1 -d' ')
 DEFINE += -DSYS_$(SYS)
-DEFINE += -DPLUGIN_PATH="\"$(PREFIX)/lib/videolan/vlc\""
-DEFINE += -DPROGRAM_VERSION="\"@VLC_VERSION@\""
-DEFINE += -DPROGRAM_CODENAME="\"@VLC_CODENAME@\""
-DEFINE += -DPROGRAM_OPTIONS="\"$(shell echo $(PROGRAM_OPTIONS) | tr 'A-Z' 'a-z')\""
-DEFINE += -DPROGRAM_BUILD="\"$(PROGRAM_BUILD)\""
+DEFINE += -DPLUGIN_PATH="\"$(prefix)/lib/videolan/vlc\""
+DEFINE += -DDATA_PATH="\"$(prefix)/share/videolan/vlc\""
+#DEFINE += -DPROGRAM_OPTIONS="\"$(shell echo $(PROGRAM_OPTIONS) | tr 'A-Z' 'a-z')\""
+#DEFINE += -DPROGRAM_BUILD="\"$(PROGRAM_BUILD)\""
 ifeq ($(DEBUG),1)
 DEFINE += -DDEBUG
 endif
@@ -233,7 +234,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
@@ -340,9 +342,11 @@ distclean: clean
        rm -rf .dep
 
 install:
-       $(INSTALL) vlc $(PREFIX)/bin
-       mkdir -p $(PREFIX)/lib/videolan/vlc
-       $(INSTALL) $(PLUGIN_OBJ) $(PREFIX)/lib/videolan/vlc
+       $(INSTALL) vlc $(prefix)/bin
+       mkdir -p $(prefix)/lib/videolan/vlc
+       $(INSTALL) $(PLUGIN_OBJ) $(prefix)/lib/videolan/vlc
+       $(INSTALL) share/*.psf $(prefix)/share/videolan/vlc
+       $(INSTALL) share/*.png $(prefix)/share/videolan/vlc
 
 show:
        @echo "Command line for C objects:"
@@ -382,7 +386,11 @@ $(PLUGIN_OBJ): %.so: .dep/%.d
 # audio plugins
 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
 
 plugins/aout/aout_esd.so: %.so: %.c
                @echo "compiling $*.so from $*.c"
@@ -396,12 +404,24 @@ endif
 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
 
 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 $@ $<
 
+plugins/intf/intf_gnome.so: %.so: %.c
+               @echo "compiling $*.so from $*.c"
+               @$(CC) $(CCFLAGS) $(CFLAGS) $(LCFLAGS) `gnome-config --libs --cflags gnomeui` -shared -o $@ $< plugins/intf/intf_gnome_callbacks.c plugins/intf/intf_gnome_interface.c plugins/intf/intf_gnome_support.c
+
+plugins/vout/vout_gnome.so: %.so: %.c
+               @echo "compiling $*.so from $*.c"
+               @$(CC) $(CCFLAGS) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lX11 -lXext -shared -o $@ $<
+
 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 $@ $<