]> git.sesse.net Git - vlc/blobdiff - Makefile.in
. fichiers manquants
[vlc] / Makefile.in
index ce809732feed74bb62281670f25131100653bc4d..706e8da3fbdd32c78e27552ad030d65395409d64 100644 (file)
@@ -79,12 +79,14 @@ endif
 # C compiler flags: compilation
 #
 CCFLAGS += $(DEFINE) $(INCLUDE)
-CCFLAGS += -Wall
+CCFLAGS += -Wall -Winline
 CCFLAGS += -D_REENTRANT
 CCFLAGS += -D_GNU_SOURCE
 
 # flags needed for clean beos compilation
+ifeq ($(SYS),beos)
 CCFLAGS += -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual
+endif
 
 # Optimizations : don't compile debug versions with them
 ifeq ($(DEBUG),0)
@@ -140,8 +142,12 @@ LCFLAGS += -Wall
 
 # Debugging and profiling support
 ifneq ($(DEBUG),0)
+ifeq ($(SYS),beos)
+CFLAGS += -g
+else
 CFLAGS += -pg
 endif
+endif
 
 #################################################################################
 # Objects and files
@@ -150,68 +156,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
 
-video_decoder_obj =            video_decoder/video_decoder.o \
-                                               video_decoder/vdec_motion.o \
-                                               video_decoder/vdec_motion_inner.o \
-                                               video_decoder/vdec_idct.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
 
-misc_obj =                     misc/mtime.o \
-                                               misc/rsc_files.o \
-                                               misc/netutils.o \
-                                               misc/playlist.o \
-                                               misc/plugins.o \
-                                               misc/decoder_fifo.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/tests.o \
+                               misc/rsc_files.o \
+                               misc/netutils.o \
+                               misc/playlist.o \
+                               misc/plugins.o \
+                               misc/decoder_fifo.o
 
 
 C_OBJ = $(interface_obj) \
@@ -342,10 +355,11 @@ distclean: clean
        rm -rf .dep
 
 install:
+       mkdir -p $(prefix)/bin
        $(INSTALL) vlc $(prefix)/bin
        mkdir -p $(prefix)/lib/videolan/vlc
-       mkdir -p $(prefix)/share/videolan
        $(INSTALL) -m 644 $(PLUGINS) $(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
 
@@ -365,10 +379,12 @@ snapshot:
                find . -type d -name CVS | xargs rm -rf ; \
                find . -type f -name '.*.swp' | xargs rm -f ; \
                cd .. ; \
-               tar czvf ${SNAPSHOTDIR}.tar.gz ${SNAPSHOTDIR} )
+               tar czvf ${SNAPSHOTDIR}.tar.gz ${SNAPSHOTDIR} ; \
+               tar cIvf ${SNAPSHOTDIR}.tar.bz2 ${SNAPSHOTDIR} )
        rm -rf /tmp/${SNAPSHOTDIR}
        mv /tmp/${SNAPSHOTDIR}.tar.gz ..
-       @echo "Sources are in ../${SNAPSHOTDIR}.tar.gz"
+       mv /tmp/${SNAPSHOTDIR}.tar.bz2 ..
+       @echo "Sources are in ../${SNAPSHOTDIR}.tar.[gz,bz2]"
 
 FORCE:
 
@@ -411,7 +427,7 @@ $(ASM_OBJ): %.o: %.S
 #$(PLUGIN_OBJ): %.so: .dep/%.d
 
 lib/beos.so: $(PLUGIN_BEOS)
-       $(CC) $(CCFLAGS) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+       $(CC) $(CCFLAGS) $(CFLAGS) $(LCFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
 $(PLUGIN_BEOS): %.o: %.cpp
        $(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
 
@@ -465,12 +481,20 @@ $(PLUGIN_GGI): %.o: %.c
        $(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
 
 lib/yuv.so: $(PLUGIN_YUV)
+ifeq ($(SYS),beos)
+       $(CC) $(CCFLAGS) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+else
        ld -shared -o $@ $^
+endif
 $(PLUGIN_YUV): %.o: %.c
        $(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
 
 lib/yuvmmx.so: $(PLUGIN_YUVMMX)
+ifeq ($(SYS),beos)
+       $(CC) $(CCFLAGS) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+else
        ld -shared -o $@ $^
+endif
 $(PLUGIN_YUVMMX): %.o: %.c
        $(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<