. normalement on devrait se prendre 1 seul mail par commit gr�ce aux

  top scripts de tibob.
 . suppression de Makefile
 . rajout de include/defs.h.in qui g�n�re include/defs.h

 pour g�n�rer le Makefile et defs.h il faut lancer ./configure

 pour ceux qui voudraient toucher � configure.in, "include/defs.h.in" est
g�n�r� par la commande autoheader, et "configure" est g�n�r� par autoconf

Makefile

-# Generated automatically from Makefile.in by configure.
-################################################################################
-# vlc (VideoLAN Client) main makefile
-# (c)1998 VideoLAN
-################################################################################
-# This makefile is the main makefile for the VideoLAN client.
-################################################################################
-
-################################################################################
-# Configuration
-################################################################################
-
-# Audio output settings
-AUDIO = dsp
-#AUDIO += esd
-# Not yet supported
-#AUDIO += alsa
-# Fallback method that should always work
-AUDIO += dummy
-
-# Video output settings
-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
-#INTF = beos
-#INTF += dga
-# Fallback method that should always work
-INTF += dummy
-
-# Target architecture
-ARCH=X86
-#ARCH=PPC
-#ARCH=SPARC
-
-# Target operating system
-SYS=LINUX
-#SYS=GNU
-#SYS=BSD
-#SYS=BEOS
-
-# For x86 architecture, choose MMX support
-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
-DECODER=new
-
-# Debugging mode on or off (set to 1 to activate)
-DEBUG=0
-
-#----------------- do not change anything below this line ----------------------
-
-################################################################################
-# Configuration pre-processing
-################################################################################
-
-# Program version and codename - may only be changed by the project leader
-PROGRAM_VERSION = 0.1.99
-PROGRAM_CODENAME = Onatopp
-
-# 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)
-PROGRAM_OPTIONS += DEBUG
-endif
-
-# PROGRAM_BUILD is a complete identification of the build
-# ( 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_$(shell echo $(ARCH) | cut -f1 -d' ')
-DEFINE += -DSYS_$(SYS)
-DEFINE += -DPLUGIN_PATH="\"$(PREFIX)/lib/videolan/vlc\""
-DEFINE += -DPROGRAM_VERSION="\"$(PROGRAM_VERSION)\""
-DEFINE += -DPROGRAM_CODENAME="\"$(PROGRAM_CODENAME)\""
-DEFINE += -DPROGRAM_OPTIONS="\"$(shell echo $(PROGRAM_OPTIONS) | tr 'A-Z' 'a-z')\""
-DEFINE += -DPROGRAM_BUILD="\"$(PROGRAM_BUILD)\""
-ifeq ($(DEBUG),1)
-DEFINE += -DDEBUG
-endif
-
-################################################################################
-# Tuning and other variables - do not change anything except if you know
-# exactly what you are doing
-################################################################################
-
-#
-# C headers directories
-#
-INCLUDE += -Iinclude -I/usr/local/include -I/usr/X11R6/include
-
-#
-# Libraries
-#
-
-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
-
-#
-# C compiler flags: compilation
-#
-CCFLAGS += $(DEFINE) $(INCLUDE)
-CCFLAGS += -Wall
-CCFLAGS += -D_REENTRANT
-CCFLAGS += -D_GNU_SOURCE
-
-# Optimizations : don't compile debug versions with them
-CCFLAGS += -O6
-CCFLAGS += -ffast-math -funroll-loops -fargument-noalias-global
-CCFLAGS += -fomit-frame-pointer
-
-# Optimizations for x86 familiy
-ifneq (,$(findstring X86,$(ARCH)))
-CCFLAGS += -malign-double
-#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
-ifneq (,$(findstring PPC,$(ARCH)))
-CCFLAGS += -mcpu=604e -mmultiple -mhard-float -mstring
-endif
-
-# Optimizations for Sparc
-ifneq (,$(findstring SPARC,$(ARCH)))
-CCFLAGS += -mhard-float
-endif
-
-#
-# C compiler flags: dependancies
-#
-DCFLAGS += $(INCLUDE)
-DCFLAGS += -MM
-
-#
-# C compiler flags: linking
-#
-LCFLAGS += $(LIB)
-LCFLAGS += -Wall
-#LCFLAGS += -s
-
-#
-# Additionnal debugging flags
-#
-
-# Debugging support
-ifeq ($(DEBUG),1)
-CFLAGS += -g
-#CFLAGS += -pg
-endif
-
-#################################################################################
-# Objects and files
-#################################################################################
-
-#
-# 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_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
-
-audio_decoder_obj =		audio_decoder/audio_decoder.o \
-						audio_decoder/audio_math.o
-
-spu_decoder_obj =		spu_decoder/spu_decoder.o
-
-#??generic_decoder_obj =		generic_decoder/generic_decoder.o
-# remeber to add it to OBJ 
-
-ifeq ($(DECODER),old)
-CFLAGS += -DOLD_DECODER
-video_decoder_obj =		video_decoder_ref/video_decoder.o \
-						video_decoder_ref/display.o \
-						video_decoder_ref/getblk.o \
-						video_decoder_ref/gethdr.o \
-						video_decoder_ref/getpic.o \
-						video_decoder_ref/getvlc.o \
-						video_decoder_ref/idct.o \
-						video_decoder_ref/motion.o \
-						video_decoder_ref/mpeg2dec.o \
-						video_decoder_ref/recon.o \
-						video_decoder_ref/spatscal.o
-else
-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
-endif
-
-misc_obj =			misc/mtime.o \
-						misc/rsc_files.o \
-						misc/netutils.o \
-						misc/plugins.o \
-						misc/decoder_fifo.o
-
-C_OBJ = $(interface_obj) \
-		$(input_obj) \
-		$(audio_output_obj) \
-		$(video_output_obj) \
-		$(ac3_decoder_obj) \
-		$(audio_decoder_obj) \
-		$(spu_decoder_obj) \
-		$(generic_decoder_obj) \
-		$(video_parser_obj) \
-		$(video_decoder_obj) \
-		$(vlan_obj) \
-		$(misc_obj)
-
-#
-# Assembler Objects
-# 
-ifneq (,$(findstring X86,$(ARCH)))
-ifneq (,$(findstring MMX,$(ARCH)))
-ifeq ($(DECODER),new)
-ASM_OBJ = 			video_decoder/vdec_idctmmx.o \
-						video_output/video_yuv_mmx.o
-else
-ASM_OBJ = 			video_decoder_ref/vdec_idctmmx.o \
-						video_output/video_yuv_mmx.o
-endif
-endif
-endif
-
-#
-# Plugins
-#
-intf_plugin =           $(INTF:%=plugins/intf/intf_%.so)
-aout_plugin =           $(AOUT:%=plugins/aout/aout_%.so)
-vout_plugin =           $(VOUT:%=plugins/vout/vout_%.so)
-
-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)
-
-# All symbols must be exported
-export
-
-################################################################################
-# Targets
-################################################################################
-
-#
-# Virtual targets
-#
-all: vlc
-
-clean:
-	rm -f $(C_OBJ) $(ASM_OBJ) $(PLUGIN_OBJ)
-
-distclean: clean
-	rm -f **/*.o **/*.so **/*~ *.log
-	rm -f vlc gmon.out core
-	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:"
-	@echo $(CC) $(CCFLAGS) $(CFLAGS) -c -o "<dest.o>" "<src.c>"
-	@echo
-	@echo "Command line for assembler objects:"
-	@echo $(CC) $(CFLAGS) -c -o "<dest.o>" "<src.S>"
-
-FORCE:
-
-#
-# Real targets
-#
-vlc: $(C_OBJ) $(ASM_OBJ) $(PLUGIN_OBJ)
-	$(CC) $(CCFLAGS) $(LCFLAGS) $(CFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(ASM_OBJ)	
-
-#
-# Generic rules (see below)
-#
-$(dependancies): %.d: FORCE
-	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
-
-$(C_OBJ): %.o: Makefile.dep
-$(C_OBJ): %.o: .dep/%.d
-$(C_OBJ): %.o: %.c
-	@echo "compiling $*.o from $*.c"
-	@$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
-
-$(ASM_OBJ): %.o: Makefile.dep
-$(ASM_OBJ): %.o: %.S
-	@echo "assembling $*.o from $*.S"
-	@$(CC) $(CFLAGS) -c -o $@ $<
-
-$(PLUGIN_OBJ): %.so: Makefile.dep
-$(PLUGIN_OBJ): %.so: .dep/%.d
-
-# audio plugins
-plugins/aout/aout_dummy.so plugins/aout/aout_dsp.so: %.so: %.c
-		@echo "compiling $*.so from $*.c"
-		@$(CC) $(CCFLAGS) $(CFLAGS) -shared -o $@ $<
-
-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
-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"
-		@$(CC) $(CCFLAGS) $(CFLAGS) -shared -o $@ $<
-
-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_glide.so plugins/vout/vout_glide.so: %.so: %.c
-		@echo "compiling $*.so from $*.c"
-		@$(CC) $(CCFLAGS) $(CFLAGS) -I/usr/include/glide -lglide2x -shared -o $@ $<
-
-plugins/intf/intf_ggi.so plugins/vout/vout_ggi.so: %.so: %.c
-		@echo "compiling $*.so from $*.c"
-		@$(CC) $(CCFLAGS) $(CFLAGS) -lggi -shared -o $@ $<
-
-
-################################################################################
-# Note on generic rules and dependancies
-################################################################################
-
-# 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/
-# directory.
-# The dep directory should be ignored by CVS.
-
-# 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
-# needs to be re-made.
-
-# Two makefiles are used: the main one (this one) has regular generic rules,
-# except for .o files, for which it calls the object Makefile. Dependancies
-# are not included in this file.
-# The object Makefile known how to make a .o from a .c, and includes
-# dependancies for the target, but only those required.

Makefile.in

@@ -339,6 +339,7 @@ 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
 

src/ac3_decoder/ac3_bit_allocate.c

@@ -20,6 +20,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *****************************************************************************/
+#include "defs.h"
 
 #include "int_types.h"
 #include "ac3_decoder.h"

src/ac3_decoder/ac3_decoder.c

@@ -20,6 +20,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *****************************************************************************/
+#include "defs.h"
 
 #include "int_types.h"
 #include "ac3_decoder.h"

src/ac3_decoder/ac3_decoder_thread.c

@@ -33,6 +33,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <unistd.h>                                              /* getpid() */
 
 #include <stdio.h>                                           /* "intf_msg.h" */
@@ -40,9 +42,9 @@
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
 
-#include "threads.h"
-#include "common.h"
 #include "config.h"
+#include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 #include "debug.h"                                      /* "input_netlist.h" */

src/ac3_decoder/ac3_downmix.c

@@ -20,6 +20,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *****************************************************************************/
+#include "defs.h"
 
 #include "int_types.h"
 #include "ac3_decoder.h"

src/ac3_decoder/ac3_exponent.c

@@ -20,6 +20,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *****************************************************************************/
+#include "defs.h"
 
 #include <stdio.h>                                           /* "intf_msg.h" */
 

src/ac3_decoder/ac3_imdct.c

@@ -20,6 +20,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *****************************************************************************/
+#include "defs.h"
 
 #include <math.h>
 

src/ac3_decoder/ac3_mantissa.c

@@ -20,6 +20,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *****************************************************************************/
+#include "defs.h"
 
 #include <stdio.h>                                           /* "intf_msg.h" */
 

src/ac3_decoder/ac3_parse.c

@@ -20,6 +20,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *****************************************************************************/
+#include "defs.h"
 
 #include "int_types.h"
 #include "ac3_decoder.h"

src/ac3_decoder/ac3_rematrix.c

@@ -20,6 +20,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *****************************************************************************/
+#include "defs.h"
 
 #include "int_types.h"
 #include "ac3_decoder.h"

src/audio_decoder/audio_decoder.c

@@ -32,6 +32,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <unistd.h>                                              /* getpid() */
 
 #include <stdio.h>                                           /* "intf_msg.h" */
@@ -39,9 +41,9 @@
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
 
-#include "threads.h"
-#include "common.h"
 #include "config.h"
+#include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 #include "debug.h"                                      /* "input_netlist.h" */

src/audio_decoder/audio_math.c

@@ -24,14 +24,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <stdio.h>                                           /* "intf_msg.h" */
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"                                                /* mtime_t */
 #include "plugins.h"
 

src/audio_output/audio_output.c

@@ -36,14 +36,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <unistd.h>                                              /* getpid() */
 
 #include <stdio.h>                                           /* "intf_msg.h" */
 #include <stdlib.h>                            /* calloc(), malloc(), free() */
 
-#include "threads.h"
-#include "common.h"
 #include "config.h"
+#include "common.h"
+#include "threads.h"
 #include "mtime.h"                             /* mtime_t, mdate(), msleep() */
 #include "plugins.h"
 

src/generic_decoder/generic_decoder.c

@@ -32,6 +32,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>

src/input/input.c

@@ -26,6 +26,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <errno.h>                                                  /* errno */
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
@@ -34,9 +36,9 @@
 #include <stdlib.h>                                                /* free() */
 #include <netinet/in.h>                                           /* ntohs() */
 
-#include "threads.h"
-#include "common.h"
 #include "config.h"
+#include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "intf_msg.h"
 #include "plugins.h"

src/input/input_ctrl.c

@@ -26,14 +26,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
 
 #include <netinet/in.h>                                             /* ntohs */
 
-#include "threads.h"
-#include "common.h"
 #include "config.h"
+#include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "intf_msg.h"
 #include "plugins.h"

src/input/input_file.c

@@ -24,12 +24,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
 
-#include "threads.h"
-#include "common.h"
 #include "config.h"
+#include "common.h"
+#include "threads.h"
 #include "mtime.h"
 
 #include "input.h"

src/input/input_netlist.c

@@ -25,6 +25,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
 
@@ -32,9 +34,9 @@
 #include <string.h>                                            /* strerror() */
 #include <errno.h>                                                  /* errno */
 
-#include "threads.h"
-#include "common.h"
 #include "config.h"
+#include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "intf_msg.h"
 #include "debug.h"

src/input/input_network.c

@@ -25,6 +25,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
 #include <string.h>                                            /* strerror() */
@@ -39,9 +41,9 @@
 #include <netdb.h>     /* servent, getservbyname(), hostent, gethostbyname() */
 #include <netinet/in.h>                     /* sockaddr_in, htons(), htonl() */
 
-#include "threads.h"
-#include "common.h"
 #include "config.h"
+#include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "netutils.h"
 

src/input/input_pcr.c

@@ -25,14 +25,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
 #include <stdlib.h>                              /* atoi(), malloc(), free() */
 #include <netinet/in.h>                                           /* ntohl() */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "debug.h"
 #include "input.h"

src/input/input_psi.c

@@ -26,15 +26,17 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
 #include <stdlib.h>                                     /* free(), realloc() */
 #include <string.h>                                               /* bzero() */
 #include <netinet/in.h>                                           /* ntohs() */
 
-#include "threads.h"
-#include "common.h"
 #include "config.h"
+#include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "intf_msg.h"
 #include "debug.h"

src/input/input_vlan.c

@@ -24,6 +24,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <errno.h>                                                 /* ENOMEM */
 #include <stdio.h>                                              /* sprintf() */
 #include <unistd.h>                                               /* close() */
@@ -44,9 +46,9 @@
 #include <net/if.h>                            /* interface (arch-dependent) */
 #endif
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "netutils.h"
 #include "input_vlan.h"

src/interface/interface.c

@@ -26,6 +26,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <errno.h>                                                 /* ENOMEM */
 #include <stdlib.h>                                      /* free(), strtol() */
 #include <stdio.h>                                                   /* FILE */
@@ -33,9 +35,9 @@
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                          /* for input.h */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 #include "input.h"

src/interface/intf_cmd.c

@@ -27,14 +27,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <errno.h>                                                  /* errno */
 #include <stdio.h>                                                   /* FILE */
 #include <stdlib.h>                                    /* strtod(), strtol() */
 #include <string.h>                                            /* strerror() */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 

src/interface/intf_console.c

@@ -24,6 +24,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <stdlib.h>                                              /* malloc() */
 
 #include "config.h"

src/interface/intf_ctrl.c

@@ -41,6 +41,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/stat.h>                        /* on BSD, fstat() needs stat.h */
 #include <sys/uio.h>                                            /* "input.h" */
@@ -50,9 +52,9 @@
 #include <fcntl.h>                                                 /* open() */
 
 /* Common headers */
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "debug.h"
 #include "plugins.h"

src/interface/intf_msg.c

@@ -26,6 +26,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <errno.h>                                                  /* errno */
 #include <fcntl.h>                     /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */
 #include <stdio.h>                                               /* required */
@@ -34,9 +36,9 @@
 #include <string.h>                                            /* strerror() */
 #include <unistd.h>                                      /* close(), write() */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 #include "intf_msg.h"

src/interface/main.c

@@ -26,6 +26,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <signal.h>                               /* SIGHUP, SIGINT, SIGKILL */
 #include <getopt.h>                                              /* getopt() */
 #include <stdio.h>                                              /* sprintf() */
@@ -34,9 +36,9 @@
 #include <stdlib.h>                                  /* getenv(), strtol(),  */
 #include <string.h>                                            /* strerror() */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 #include "input_vlan.h"

src/misc/decoder_fifo.c

@@ -20,13 +20,14 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *****************************************************************************/
+#include "defs.h"
 
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                          /* for input.h */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 
 #include "debug.h"                 /* XXX?? temporaire, requis par netlist.h */

src/misc/mtime.c

@@ -30,6 +30,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <stdio.h>                                              /* sprintf() */
 #include <unistd.h>                                              /* select() */
 #include <sys/time.h>
@@ -38,6 +40,7 @@
 #include <kernel/OS.h>
 #endif
 
+#include "config.h"
 #include "common.h"
 #include "mtime.h"
 

src/misc/netutils.c

@@ -24,6 +24,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <netdb.h>                                        /* gethostbyname() */
 #include <stdlib.h>                             /* free(), realloc(), atoi() */
 #include <errno.h>                                                /* errno() */

src/misc/plugins.c

@@ -20,6 +20,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *****************************************************************************/
+#include "defs.h"
 
 #include <stdlib.h>                                      /* free(), strtol() */
 #include <stdio.h>                                              /* sprintf() */
@@ -42,12 +43,8 @@ int RequestPlugin ( plugin_id_t * p_plugin, char * psz_mask, char * psz_name )
     char * psz_plugin;
     char * psz_plugin_path[ PLUGIN_PATH_COUNT ] =
     {
-        ".",
-        PLUGIN_PATH,
-        /* these ones should disappear */
-        "./audio_output",
-        "./video_output",
-        "./interface"
+        ".", PLUGIN_PATH,
+        "plugins/aout", "plugins/vout", "plugins/intf" /* these ones should disappear */
     };
 
     i_length = strlen( psz_mask ) + strlen( psz_name );

src/misc/rsc_files.c

@@ -42,6 +42,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <errno.h>                                                  /* errno */
 #include <fcntl.h>                                                 /* open() */
 #include <stdlib.h>                                                /* free() */

src/spu_decoder/spu_decoder.c

@@ -27,14 +27,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                          /* for input.h */
 #include <unistd.h>                                              /* getpid() */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 
 #include "intf_msg.h"

src/video_decoder/vdec_idct.c

@@ -24,12 +24,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                          /* for input.h */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 

src/video_decoder/vdec_motion.c

@@ -24,12 +24,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                          /* for input.h */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 

src/video_decoder/vdec_motion_inner.c

@@ -24,12 +24,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                          /* for input.h */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 

src/video_decoder/video_decoder.c

@@ -26,14 +26,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <stdlib.h>                                                /* free() */
 #include <unistd.h>                                              /* getpid() */
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                          /* for input.h */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 

src/video_output/video_output.c

@@ -27,14 +27,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <errno.h>                                                 /* ENOMEM */
 #include <stdlib.h>                                                /* free() */
 #include <stdio.h>                                              /* sprintf() */
 #include <string.h>                                            /* strerror() */
 
-#include "threads.h"
-#include "common.h"
 #include "config.h"
+#include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 #include "video.h"

src/video_output/video_text.c

@@ -24,14 +24,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <errno.h>                                                  /* errno */
 #include <stdlib.h>                                                /* free() */
 #include <string.h>                                            /* strerror() */
 #include <fcntl.h>                                                 /* open() */
 #include <unistd.h>                                       /* read(), close() */
 
-#include "common.h"
 #include "config.h"
+#include "common.h"
 #include "video_text.h"
 
 #include "intf_msg.h"

src/video_output/video_yuv.c

@@ -27,14 +27,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <math.h>                                            /* exp(), pow() */
 #include <errno.h>                                                 /* ENOMEM */
 #include <stdlib.h>                                                /* free() */
 #include <string.h>                                            /* strerror() */
 
-#include "threads.h"
-#include "common.h"
 #include "config.h"
+#include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 #include "video.h"

src/video_parser/video_fifo.c

@@ -24,12 +24,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                             /* "input.h */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 

src/video_parser/video_parser.c

@@ -26,14 +26,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <unistd.h>                                              /* getpid() */
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 

src/video_parser/vpar_blocks.c

@@ -24,12 +24,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 

src/video_parser/vpar_headers.c

@@ -24,13 +24,15 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <stdlib.h>                                                /* free() */
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
 

src/video_parser/vpar_synchro.c

@@ -24,13 +24,15 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <stdlib.h>                                                /* free() */
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
 
-#include "threads.h"
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
 #include "plugins.h"