* bootstrap:

    + New build system, using recursive makefiles. Due to the amount of code
      in VLC, this had become unavoidable.
    + Removed the check for OS X's stack size, since our automake targets are
      a lot less hungry now.
    + Ditto for Solaris's sed.
    + Since automake-1.6 is faster than 1.7, use it first if both are present.
  * m4/vlc.m4:
    + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS
      and AX_ADD_LDFLAGS macros that do all the magic to detect possible
      modules and register their flags.
    + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros.
    + Some magic to generate vlc-config.
  * configure.ac:
    + Moved most code to the AX_ADD_* macros.
    + Explicitely added all target Makefiles.
  * modules/**/Modules.am:
    + Path to sources are now relative to Modules.am's directory level.

.cvsignore

@@ -15,10 +15,11 @@ config.status
 confdefs.h
 conftest.cc
 autom4te.cache
-Makefile
 Makefile.in
+Makefile
 Modules.am
 build-stamp
+configure-stamp
 stamp-h*
 aclocal.m4
 vlc-debug.*

HACKING

-$Id: HACKING,v 1.7 2003/06/21 17:04:20 sam Exp $
+$Id: HACKING,v 1.8 2003/06/27 13:50:07 sam Exp $
 
 Hacking vlc
 ===========
@@ -35,16 +35,19 @@ The bootstrap sequence
 
 The bootstrap script does the following actions:
 
- - browse the modules/ directory for all available modules. A module "foo"
-   exists if there is a Modules.am file in the modules/ directory which
-   defines SOURCES_foo.
+ - parse configure.ac for all Makefiles in the modules/ directory that need
+   to be generated, and look for available modules in the corresponding
+   Modules.am file. A module "foo" exists if there is a Modules.am file in
+   the modules/ directory which defines SOURCES_foo.
 
  - create a top-level Modules.am file (which will be included by Makefile.am)
    which contains additional build rules for modules, and includes all the
    Modules.am files that were found in modules/
 
- - create an m4/vlc.m4 from configure.ac, generating the AC_SUBST and
-   AM_CONDITIONAL rules that will be needed by configure.ac.
+ - create an m4/private.m4 from configure.ac, generating m4 macros that will
+   be needed by configure.ac.
+
+ - create a Makefile.am file for each Modules.am file found in modules/ .
 
  - run autopoint (previously gettextize) to create an intl/ directory,
    needed when libgettext is not available.

debian/rules

@@ -44,6 +44,7 @@ CONFIG_FLAGS += \
 	--enable-skins \
 	--disable-basic-skins \
 	--disable-freetype \
+	--disable-mkv \
 	$(NULL)
 
 # These ones are currently shipped with VLC

m4/.cvsignore

 Makefile
 Makefile.in
-vlc.m4
+private.m4

modules/.cvsignore

-Makefile
+Makefile.am
 Makefile.in
+Makefile

modules/Makefile.am

-NULL = 
-
-EXTRA_DIST = \
-	LIST \
-	access/Modules.am \
-	access/dvd/Modules.am \
-	access/dvdplay/Modules.am \
-	access/dvdread/Modules.am \
-	access/mms/Modules.am \
-	access/pvr/Modules.am \
-	access/satellite/Modules.am \
-	access/v4l/Modules.am \
-	access/vcd/Modules.am \
-	access_output/Modules.am \
-	audio_filter/channel_mixer/Modules.am \
-	audio_filter/converter/Modules.am \
-	audio_filter/resampler/Modules.am \
-	audio_mixer/Modules.am \
-	audio_output/Modules.am \
-	codec/Modules.am \
-	codec/a52old/Modules.am \
-	codec/a52old/downmix/Modules.am \
-	codec/a52old/imdct/Modules.am \
-	codec/cinepak/Modules.am \
-	codec/faad/Modules.am \
-	codec/ffmpeg/Modules.am \
-	codec/ffmpeg/postprocessing/Modules.am \
-	codec/mpeg_video/Modules.am \
-	codec/mpeg_video/idct/Modules.am \
-	codec/mpeg_video/motion/Modules.am \
-	codec/spudec/Modules.am \
-	control/lirc/Modules.am \
-	control/rc/Modules.am \
-	control/Modules.am \
-	demux/Modules.am \
-	demux/aac/Modules.am \
-	demux/avi/Modules.am \
-	demux/asf/Modules.am \
-	demux/mp4/Modules.am \
-	demux/mpeg/Modules.am \
-	demux/util/Modules.am \
-	demux/wav/Modules.am \
-	encoder/Modules.am \
-	encoder/ffmpeg/Modules.am \
-	gui/beos/Modules.am \
-	gui/familiar/Modules.am \
-	gui/gtk/Modules.am \
-	gui/gtk2/Modules.am \
-	gui/kde/Modules.am \
-	gui/macosx/Modules.am \
-	gui/ncurses/Modules.am \
-	gui/qnx/Modules.am \
-	gui/qt/Modules.am \
-	gui/skins/Modules.am \
-	gui/win32/Modules.am \
-	gui/wxwindows/Modules.am \
-	misc/Modules.am \
-	misc/dummy/Modules.am \
-	misc/logger/Modules.am \
-	misc/memcpy/Modules.am \
-	misc/network/Modules.am \
-	misc/testsuite/Modules.am \
-	mux/Modules.am \
-	mux/mpeg/Modules.am \
-	packetizer/Modules.am \
-	stream_out/Modules.am \
-	video_chroma/Modules.am \
-	video_filter/Modules.am \
-	video_filter/deinterlace/Modules.am \
-	video_output/Modules.am \
-	video_output/directx/Modules.am \
-	video_output/mga/Modules.am \
-	video_output/qte/Modules.am \
-	video_output/x11/Modules.am \
-	visualization/scope/Modules.am \
-	visualization/xosd/Modules.am \
-	$(NULL)
-

modules/access/Modules.am

-SOURCES_access_file = modules/access/file.c
-SOURCES_access_directory = modules/access/directory.c
-SOURCES_access_udp = modules/access/udp.c
-SOURCES_access_http = modules/access/http.c
-SOURCES_access_ftp = modules/access/ftp.c
-SOURCES_slp = modules/access/slp.c
+SOURCES_access_file = file.c
+SOURCES_access_directory = directory.c
+SOURCES_access_udp = udp.c
+SOURCES_access_http = http.c
+SOURCES_access_ftp = ftp.c
+SOURCES_slp = slp.c
 SOURCES_cdda = \
-        modules/access/cdda.c \
-        modules/access/vcd/cdrom.c \
-        modules/access/vcd/cdrom.h \
-        modules/access/vcd/cdrom_internals.h \
+        cdda.c \
+        vcd/cdrom.c \
+        vcd/cdrom.h \
+        vcd/cdrom_internals.h \
         $(NULL)

modules/access/dvd/Modules.am

 SOURCES_dvd = \
-	modules/access/dvd/dvd.c \
-	modules/access/dvd/dvd.h \
-	modules/access/dvd/access.c \
-	modules/access/dvd/demux.c \
-	modules/access/dvd/seek.c \
-	modules/access/dvd/seek.h \
-	modules/access/dvd/es.c \
-	modules/access/dvd/es.h \
-	modules/access/dvd/ifo.c \
-	modules/access/dvd/ifo.h \
-	modules/access/dvd/udf.c \
-	modules/access/dvd/udf.h \
-	modules/access/dvd/summary.c \
-	modules/access/dvd/summary.h \
-	modules/access/dvd/dvdcss.h \
+	dvd.c \
+	dvd.h \
+	access.c \
+	demux.c \
+	seek.c \
+	seek.h \
+	es.c \
+	es.h \
+	ifo.c \
+	ifo.h \
+	udf.c \
+	udf.h \
+	summary.c \
+	summary.h \
+	dvdcss.h \
 	$(NULL)
 

modules/access/dvdplay/Modules.am

 SOURCES_dvdplay = \
-	modules/access/dvdplay/dvd.c \
-	modules/access/dvdplay/dvd.h \
-	modules/access/dvdplay/access.c \
-	modules/access/dvdplay/access.h \
-	modules/access/dvdplay/demux.c \
-	modules/access/dvdplay/demux.h \
-	modules/access/dvdplay/intf.c \
-	modules/access/dvdplay/intf.h \
-	modules/access/dvdplay/es.c \
-	modules/access/dvdplay/es.h \
-	modules/access/dvdplay/tools.c \
-	modules/access/dvdplay/tools.h \
+	dvd.c \
+	dvd.h \
+	access.c \
+	access.h \
+	demux.c \
+	demux.h \
+	intf.c \
+	intf.h \
+	es.c \
+	es.h \
+	tools.c \
+	tools.h \
 	$(NULL)
 

modules/access/dvdread/Modules.am

 SOURCES_dvdread = \
-	modules/access/dvdread/dvdread.c \
-	modules/access/dvdread/input.c \
-	modules/access/dvdread/input.h \
+	dvdread.c \
+	input.c \
+	input.h \
 	$(NULL)
 

modules/access/mms/Modules.am

 SOURCES_access_mms = \
-	modules/access/mms/mms.c \
-	modules/access/mms/mms.h \
-	modules/access/mms/mmsh.c \
-	modules/access/mms/mmsh.h \
-	modules/access/mms/mmstu.c \
-	modules/access/mms/mmstu.h \
-	modules/access/mms/buffer.c \
-	modules/access/mms/buffer.h \
-	modules/access/mms/asf.h \
-	modules/access/mms/asf.c \
+	mms.c \
+	mms.h \
+	mmsh.c \
+	mmsh.h \
+	mmstu.c \
+	mmstu.h \
+	buffer.c \
+	buffer.h \
+	asf.h \
+	asf.c \
 	$(NULL)

modules/access/pvr/Modules.am

-SOURCES_pvr = modules/access/pvr/pvr.c \
-	modules/access/pvr/videodev2.h
+SOURCES_pvr = pvr.c videodev2.h

modules/access/satellite/Modules.am

 SOURCES_satellite = \
-	modules/access/satellite/satellite.c \
-	modules/access/satellite/access.c \
-	modules/access/satellite/dvb.c \
-	modules/access/satellite/dvb.h \
+	satellite.c \
+	access.c \
+	dvb.c \
+	dvb.h \
 	$(NULL)
 

modules/access/v4l/Modules.am

-SOURCES_v4l = modules/access/v4l/v4l.c \
-	modules/access/v4l/videodev_mjpeg.h
+SOURCES_v4l = v4l.c videodev_mjpeg.h

modules/access/vcd/Modules.am

 SOURCES_vcd = \
-	modules/access/vcd/vcd.c \
-	modules/access/vcd/cdrom.c \
-	modules/access/vcd/cdrom.h \
-	modules/access/vcd/cdrom_internals.h \
+	vcd.c \
+	cdrom.c \
+	cdrom.h \
+	cdrom_internals.h \
 	$(NULL)

modules/access_output/Modules.am

-SOURCES_access_output_dummy = modules/access_output/dummy.c
-SOURCES_access_output_file = modules/access_output/file.c
-SOURCES_access_output_udp = modules/access_output/udp.c
-SOURCES_access_output_http = modules/access_output/http.c
+SOURCES_access_output_dummy = dummy.c
+SOURCES_access_output_file = file.c
+SOURCES_access_output_udp = udp.c
+SOURCES_access_output_http = http.c

modules/audio_filter/.cvsignore

+.deps
+.dirstamp
+*.lo
+*.la
+*.dll
+*.dylib
+*.sl
+*.so
+Makefile.am
+Makefile.in
+Makefile

modules/audio_filter/channel_mixer/Modules.am

-SOURCES_trivial_channel_mixer = modules/audio_filter/channel_mixer/trivial.c
-SOURCES_headphone_channel_mixer = modules/audio_filter/channel_mixer/headphone.c
+SOURCES_trivial_channel_mixer = trivial.c
+SOURCES_headphone_channel_mixer = headphone.c

modules/audio_filter/converter/Modules.am

-SOURCES_float32tos16 = modules/audio_filter/converter/float32tos16.c
-SOURCES_float32tos8 = modules/audio_filter/converter/float32tos8.c
-SOURCES_float32tou16 = modules/audio_filter/converter/float32tou16.c
-SOURCES_float32tou8 = modules/audio_filter/converter/float32tou8.c
-SOURCES_a52tospdif = modules/audio_filter/converter/a52tospdif.c
-SOURCES_a52tofloat32 = modules/audio_filter/converter/a52tofloat32.c
-SOURCES_dtstospdif = modules/audio_filter/converter/dtstospdif.c
-SOURCES_fixed32tos16 = modules/audio_filter/converter/fixed32tos16.c
-SOURCES_s16tofixed32 = modules/audio_filter/converter/s16tofixed32.c
-SOURCES_fixed32tofloat32 = modules/audio_filter/converter/fixed32tofloat32.c
-SOURCES_s16tofloat32 = modules/audio_filter/converter/s16tofloat32.c
-SOURCES_s16tofloat32swab = modules/audio_filter/converter/s16tofloat32swab.c
-SOURCES_s8tofloat32 = modules/audio_filter/converter/s8tofloat32.c
-SOURCES_u8tofixed32 = modules/audio_filter/converter/u8tofixed32.c
-SOURCES_u8tofloat32 = modules/audio_filter/converter/u8tofloat32.c
-SOURCES_mpgatofixed32 = modules/audio_filter/converter/mpgatofixed32.c
+SOURCES_float32tos16 = float32tos16.c
+SOURCES_float32tos8 = float32tos8.c
+SOURCES_float32tou16 = float32tou16.c
+SOURCES_float32tou8 = float32tou8.c
+SOURCES_a52tospdif = a52tospdif.c
+SOURCES_a52tofloat32 = a52tofloat32.c
+SOURCES_dtstospdif = dtstospdif.c
+SOURCES_fixed32tos16 = fixed32tos16.c
+SOURCES_s16tofixed32 = s16tofixed32.c
+SOURCES_fixed32tofloat32 = fixed32tofloat32.c
+SOURCES_s16tofloat32 = s16tofloat32.c
+SOURCES_s16tofloat32swab = s16tofloat32swab.c
+SOURCES_s8tofloat32 = s8tofloat32.c
+SOURCES_u8tofixed32 = u8tofixed32.c
+SOURCES_u8tofloat32 = u8tofloat32.c
+SOURCES_mpgatofixed32 = mpgatofixed32.c

modules/audio_filter/resampler/Modules.am

-SOURCES_trivial_resampler = modules/audio_filter/resampler/trivial.c
-SOURCES_ugly_resampler = modules/audio_filter/resampler/ugly.c
-SOURCES_linear_resampler = modules/audio_filter/resampler/linear.c
-SOURCES_bandlimited_resampler = modules/audio_filter/resampler/bandlimited.c \
-	modules/audio_filter/resampler/bandlimited.h
-SOURCES_coreaudio_resampler = modules/audio_filter/resampler/coreaudio.c
+SOURCES_trivial_resampler = trivial.c
+SOURCES_ugly_resampler = ugly.c
+SOURCES_linear_resampler = linear.c
+SOURCES_bandlimited_resampler = bandlimited.c bandlimited.h
+SOURCES_coreaudio_resampler = coreaudio.c

modules/audio_mixer/Modules.am

-SOURCES_trivial_mixer = modules/audio_mixer/trivial.c
-SOURCES_float32_mixer = modules/audio_mixer/float32.c
-SOURCES_spdif_mixer = modules/audio_mixer/spdif.c
+SOURCES_trivial_mixer = trivial.c
+SOURCES_float32_mixer = float32.c
+SOURCES_spdif_mixer = spdif.c

modules/audio_output/Modules.am

-SOURCES_alsa = modules/audio_output/alsa.c
-SOURCES_arts = modules/audio_output/arts.c
-SOURCES_coreaudio = modules/audio_output/coreaudio.c
-SOURCES_aout_directx = modules/audio_output/directx.c
-SOURCES_esd = modules/audio_output/esd.c
-SOURCES_aout_file = modules/audio_output/file.c
-SOURCES_oss = modules/audio_output/oss.c
-SOURCES_aout_sdl = modules/audio_output/sdl.c
-SOURCES_waveout = modules/audio_output/waveout.c
+SOURCES_alsa = alsa.c
+SOURCES_arts = arts.c
+SOURCES_coreaudio = coreaudio.c
+SOURCES_aout_directx = directx.c
+SOURCES_esd = esd.c
+SOURCES_aout_file = file.c
+SOURCES_oss = oss.c
+SOURCES_aout_sdl = sdl.c
+SOURCES_waveout = waveout.c

modules/codec/Modules.am

-SOURCES_a52 = modules/codec/a52.c
-SOURCES_dts = modules/codec/dts.c
-SOURCES_flacdec = modules/codec/flacdec.c
-SOURCES_lpcm = modules/codec/lpcm.c
-SOURCES_araw = modules/codec/araw.c
-SOURCES_vorbis = modules/codec/vorbis.c
-SOURCES_tarkin = modules/codec/tarkin.c
-SOURCES_theora = modules/codec/theora.c
-SOURCES_tremor = modules/codec/vorbis.c
-SOURCES_dv = modules/codec/dv.c
-SOURCES_xvid = modules/codec/xvid.c
-SOURCES_adpcm = modules/codec/adpcm.c
-SOURCES_mpeg_audio = modules/codec/mpeg_audio.c
-SOURCES_libmpeg2 = modules/codec/libmpeg2.c
-SOURCES_rawvideo = modules/codec/rawvideo.c
-SOURCES_quicktime = modules/codec/quicktime.c
+SOURCES_a52 = a52.c
+SOURCES_dts = dts.c
+SOURCES_flacdec = flacdec.c
+SOURCES_lpcm = lpcm.c
+SOURCES_araw = araw.c
+SOURCES_vorbis = vorbis.c
+SOURCES_tarkin = tarkin.c
+SOURCES_theora = theora.c
+SOURCES_tremor = vorbis.c
+SOURCES_dv = dv.c
+SOURCES_xvid = xvid.c
+SOURCES_adpcm = adpcm.c
+SOURCES_mpeg_audio = mpeg_audio.c
+SOURCES_libmpeg2 = libmpeg2.c
+SOURCES_rawvideo = rawvideo.c
+SOURCES_quicktime = quicktime.c

modules/codec/a52old/Modules.am

 SOURCES_a52old = \
-	modules/codec/a52old/a52old.c \
-	modules/codec/a52old/adec.h \
-	modules/codec/a52old/internal.h \
-	modules/codec/a52old/decoder.c \
-	modules/codec/a52old/decoder.h \
-	modules/codec/a52old/parse.c \
-	modules/codec/a52old/exponent.c \
-	modules/codec/a52old/exponent.h \
-	modules/codec/a52old/bit_allocate.c \
-	modules/codec/a52old/mantissa.c \
-	modules/codec/a52old/mantissa.h \
-	modules/codec/a52old/rematrix.c \
-	modules/codec/a52old/imdct.c \
-	modules/codec/a52old/imdct.h \
-	modules/codec/a52old/downmix.h \
+	a52old.c \
+	adec.h \
+	internal.h \
+	decoder.c \
+	decoder.h \
+	parse.c \
+	exponent.c \
+	exponent.h \
+	bit_allocate.c \
+	mantissa.c \
+	mantissa.h \
+	rematrix.c \
+	imdct.c \
+	imdct.h \
+	downmix.h \
 	$(NULL)
 

modules/codec/a52old/downmix/Modules.am

 SOURCES_downmix = \
-	modules/codec/a52old/downmix/downmix.c \
-	modules/codec/a52old/downmix/downmix_c.c \
-	modules/codec/a52old/downmix/downmix_common.h \
+	downmix.c \
+	downmix_c.c \
+	downmix_common.h \
 	$(NULL)
 
 SOURCES_downmixsse = \
-	modules/codec/a52old/downmix/downmix.c \
-	modules/codec/a52old/downmix/downmix_sse.c \
-	modules/codec/a52old/downmix/downmix_common.h \
+	downmix.c \
+	downmix_sse.c \
+	downmix_common.h \
 	$(NULL)
 
 SOURCES_downmix3dn = \
-	modules/codec/a52old/downmix/downmix.c \
-	modules/codec/a52old/downmix/downmix_3dn.c \
-	modules/codec/a52old/downmix/downmix_common.h \
+	downmix.c \
+	downmix_3dn.c \
+	downmix_common.h \
 	$(NULL)
 

modules/codec/a52old/imdct/Modules.am

 COMMON_imdct = \
-	modules/codec/a52old/imdct/imdct.c \
-	modules/codec/a52old/imdct/imdct_common.c
+	imdct.c \
+	imdct_common.c
 
 SOURCES_imdct = \
-	modules/codec/a52old/imdct/imdct_c.c \
-	modules/codec/a52old/imdct/srfft_c.c \
+	imdct_c.c \
+	srfft_c.c \
 	$(COMMON_imdct)
 
 SOURCES_imdctsse = \
-	modules/codec/a52old/imdct/imdct_sse.c \
-	modules/codec/a52old/imdct/srfft_sse.c \
+	imdct_sse.c \
+	srfft_sse.c \
 	$(COMMON_imdct)
 
 SOURCES_imdct3dn = \
-	modules/codec/a52old/imdct/imdct_3dn.c \
-	modules/codec/a52old/imdct/srfft_3dn.c \
+	imdct_3dn.c \
+	srfft_3dn.c \
 	$(COMMON_imdct)
 
 noinst_HEADERS += \
-	modules/codec/a52old/imdct/imdct_common.h \
-	modules/codec/a52old/imdct/retables.h \
-	modules/codec/a52old/imdct/srfft.h
+	imdct_common.h \
+	retables.h \
+	srfft.h
 

modules/codec/cinepak/Modules.am

 SOURCES_cinepak = \
-	modules/codec/cinepak/cinepak.c \
-	modules/codec/cinepak/cinepak.h \
+	cinepak.c \
+	cinepak.h \
 	$(NULL)

modules/codec/faad/Modules.am

 SOURCES_faad = \
-	modules/codec/faad/decoder.c \
-	modules/codec/faad/decoder.h \
+	decoder.c \
+	decoder.h \
 	$(NULL)

modules/codec/ffmpeg/Modules.am

 SOURCES_ffmpeg = \
-	modules/codec/ffmpeg/ffmpeg.c \
-	modules/codec/ffmpeg/ffmpeg.h \
-	modules/codec/ffmpeg/video.c \
-	modules/codec/ffmpeg/video.h \
-	modules/codec/ffmpeg/audio.c \
-	modules/codec/ffmpeg/audio.h \
-	modules/codec/ffmpeg/chroma.c \
+	ffmpeg.c \
+	ffmpeg.h \
+	video.c \
+	video.h \
+	audio.c \
+	audio.h \
+	chroma.c \
 	$(NULL)
 

modules/codec/ffmpeg/postprocessing/Modules.am

 SOURCES_postprocessing_c = \
-	modules/codec/ffmpeg/postprocessing/postprocessing.c \
-	modules/codec/ffmpeg/postprocessing/postprocessing_c.c \
+	postprocessing.c \
+	postprocessing_c.c \
 	$(NULL)
 
 SOURCES_postprocessing_mmx = \
-	modules/codec/ffmpeg/postprocessing/postprocessing.c \
-	modules/codec/ffmpeg/postprocessing/postprocessing_mmx.c \
+	postprocessing.c \
+	postprocessing_mmx.c \
 	$(NULL)
 
 SOURCES_postprocessing_mmxext = \
-	modules/codec/ffmpeg/postprocessing/postprocessing.c \
-	modules/codec/ffmpeg/postprocessing/postprocessing_mmxext.c \
+	postprocessing.c \
+	postprocessing_mmxext.c \
 	$(NULL)
 
 noinst_HEADERS += \
-	modules/codec/ffmpeg/postprocessing/postprocessing.h \
-	modules/codec/ffmpeg/postprocessing/postprocessing_common.h \
+	postprocessing.h \
+	postprocessing_common.h \
 	$(NULL)
 

modules/codec/mpeg_audio/Modules.am

 SOURCES_mpeg_audio = \
-	modules/codec/mpeg_audio/decoder.c \
-	modules/codec/mpeg_audio/decoder.h \
-	modules/codec/mpeg_audio/layer1.c \
-	modules/codec/mpeg_audio/layer1.h \
-	modules/codec/mpeg_audio/layer2.c \
-	modules/codec/mpeg_audio/layer2.h \
-	modules/codec/mpeg_audio/math.c \
-	modules/codec/mpeg_audio/math.h \
-	modules/codec/mpeg_audio/generic.c \
-	modules/codec/mpeg_audio/generic.h \
+	decoder.c \
+	decoder.h \
+	layer1.c \
+	layer1.h \
+	layer2.c \
+	layer2.h \
+	math.c \
+	math.h \
+	generic.c \
+	generic.h \
 	$(NULL)
 

modules/codec/mpeg_video/Modules.am

 SOURCES_mpeg_video_old = \
-	modules/codec/mpeg_video/parser.c \
-	modules/codec/mpeg_video/parser.h \
-	modules/codec/mpeg_video/headers.c \
-	modules/codec/mpeg_video/blocks.c \
-	modules/codec/mpeg_video/blocks.h \
-	modules/codec/mpeg_video/synchro.c \
-	modules/codec/mpeg_video/pool.c \
-	modules/codec/mpeg_video/pool.h \
-	modules/codec/mpeg_video/decoder.c \
-	modules/codec/mpeg_video/decoder.h \
-	modules/codec/mpeg_video/plugins.h \
+	parser.c \
+	parser.h \
+	headers.c \
+	blocks.c \
+	blocks.h \
+	synchro.c \
+	pool.c \
+	pool.h \
+	decoder.c \
+	decoder.h \
+	plugins.h \
 	$(NULL)
 

modules/codec/mpeg_video/idct/Modules.am

 SOURCES_idct = \
-	modules/codec/mpeg_video/idct/idct.c \
-	modules/codec/mpeg_video/idct/idct.h \
-	modules/codec/mpeg_video/idct/idct_decl.h \
-	modules/codec/mpeg_video/idct/idct_sparse.h \
-	modules/codec/mpeg_video/idct/block_c.h \
+	idct.c \
+	idct.h \
+	idct_decl.h \
+	idct_sparse.h \
+	block_c.h \
 	$(NULL)
 
 SOURCES_idctclassic = \
-	modules/codec/mpeg_video/idct/idctclassic.c \
-	modules/codec/mpeg_video/idct/idct.h \
-	modules/codec/mpeg_video/idct/idct_decl.h \
-	modules/codec/mpeg_video/idct/idct_sparse.h \
-	modules/codec/mpeg_video/idct/block_c.h \
+	idctclassic.c \
+	idct.h \
+	idct_decl.h \
+	idct_sparse.h \
+	block_c.h \
 	$(NULL)
 
 SOURCES_idctmmx = \
-	modules/codec/mpeg_video/idct/idctmmx.c \
-	modules/codec/mpeg_video/idct/idct.h \
-	modules/codec/mpeg_video/idct/idct_decl.h \
-	modules/codec/mpeg_video/idct/idct_sparse.h \
-	modules/codec/mpeg_video/idct/block_mmx.h \
+	idctmmx.c \
+	idct.h \
+	idct_decl.h \
+	idct_sparse.h \
+	block_mmx.h \
 	$(NULL)
 
 SOURCES_idctmmxext = \
-	modules/codec/mpeg_video/idct/idctmmxext.c \
-	modules/codec/mpeg_video/idct/idct.h \
-	modules/codec/mpeg_video/idct/idct_decl.h \
-	modules/codec/mpeg_video/idct/idct_sparse.h \
-	modules/codec/mpeg_video/idct/block_mmx.h \
+	idctmmxext.c \
+	idct.h \
+	idct_decl.h \
+	idct_sparse.h \
+	block_mmx.h \
 	$(NULL)
 
 SOURCES_idctaltivec = \
-	modules/codec/mpeg_video/idct/idctaltivec.c \
-	modules/codec/mpeg_video/idct/idct.h \
+	idctaltivec.c \
+	idct.h \
 	$(NULL)
 

modules/codec/mpeg_video/motion/Modules.am

-SOURCES_motion = modules/codec/mpeg_video/motion/motion.c
-SOURCES_motionmmx = modules/codec/mpeg_video/motion/motionmmx.c
-SOURCES_motionmmxext = modules/codec/mpeg_video/motion/motionmmxext.c
-SOURCES_motion3dnow = modules/codec/mpeg_video/motion/motion3dnow.c
-SOURCES_motionaltivec = modules/codec/mpeg_video/motion/motionaltivec.c
+SOURCES_motion = motion.c
+SOURCES_motionmmx = motionmmx.c
+SOURCES_motionmmxext = motionmmxext.c
+SOURCES_motion3dnow = motion3dnow.c
+SOURCES_motionaltivec = motionaltivec.c

modules/codec/spudec/Modules.am

 SOURCES_spudec = \
-	modules/codec/spudec/spudec.c \
-	modules/codec/spudec/parse.c \
-	modules/codec/spudec/render.c \
-	modules/codec/spudec/text.c \
-	modules/codec/spudec/subtitler.c \
-	modules/codec/spudec/spudec.h \
+	spudec.c \
+	parse.c \
+	render.c \
+	text.c \
+	subtitler.c \
+	spudec.h \
 	$(NULL)

modules/control/Modules.am

-SOURCES_gestures = modules/control/gestures.c
-SOURCES_http = modules/control/http.c
+SOURCES_gestures = gestures.c
+SOURCES_http = http.c

modules/control/lirc/Modules.am

-SOURCES_lirc = modules/control/lirc/lirc.c
+SOURCES_lirc = lirc.c

modules/control/rc/Modules.am

-SOURCES_rc = modules/control/rc/rc.c
+SOURCES_rc = rc.c

modules/demux/Modules.am

-SOURCES_a52sys = modules/demux/a52sys.c
-SOURCES_flac = modules/demux/flac.c
-SOURCES_ogg = modules/demux/ogg.c
-SOURCES_m3u = modules/demux/m3u.c
-SOURCES_demuxdump = modules/demux/demuxdump.c
-SOURCES_rawdv = modules/demux/rawdv.c
-SOURCES_au = modules/demux/au.c
-SOURCES_mkv = modules/demux/mkv.cpp
+SOURCES_a52sys = a52sys.c
+SOURCES_flac = flac.c
+SOURCES_ogg = ogg.c
+SOURCES_m3u = m3u.c
+SOURCES_demuxdump = demuxdump.c
+SOURCES_rawdv = rawdv.c
+SOURCES_au = au.c
+SOURCES_mkv = mkv.cpp

modules/demux/aac/Modules.am

-SOURCES_aac = modules/demux/aac/demux.c
+SOURCES_aac = demux.c

modules/demux/asf/Modules.am

 SOURCES_asf = \
-	modules/demux/asf/asf.c \
-	modules/demux/asf/asf.h \
-	modules/demux/asf/libasf.c \
-	modules/demux/asf/libasf.h \
+	asf.c \
+	asf.h \
+	libasf.c \
+	libasf.h \
 	$(NULL)

modules/demux/avi/Modules.am

 SOURCES_avi = \
-	modules/demux/avi/avi.c \
-	modules/demux/avi/avi.h \
-	modules/demux/avi/libavi.c \
-	modules/demux/avi/libavi.h \
+	avi.c \
+	avi.h \
+	libavi.c \
+	libavi.h \
 	$(NULL)

modules/demux/mp4/Modules.am

 SOURCES_mp4 = \
-	modules/demux/mp4/mp4.c \
-	modules/demux/mp4/mp4.h \
-	modules/demux/mp4/libmp4.c \
-	modules/demux/mp4/libmp4.h \
+	mp4.c \
+	mp4.h \
+	libmp4.c \
+	libmp4.h \
 	$(NULL)

modules/demux/mpeg/Modules.am

 SOURCES_mpeg_system = \
-	modules/demux/mpeg/system.c \
-	modules/demux/mpeg/system.h \
+	system.c \
+	system.h \
 	$(NULL)
 
 SOURCES_es = \
-	modules/demux/mpeg/es.c \
+	es.c \
 	$(NULL)
 
 SOURCES_m4v = \
-	modules/demux/mpeg/m4v.c \
+	m4v.c \
 	$(NULL)
 
 
 SOURCES_ps = \
-	modules/demux/mpeg/ps.c \
+	ps.c \
 	$(NULL)
 
 SOURCES_ts = \
-	modules/demux/mpeg/ts.c \
+	ts.c \
 	$(NULL)
 
 SOURCES_ts_dvbpsi = \
-	modules/demux/mpeg/ts.c \
+	ts.c \
 	$(NULL)
 
 SOURCES_audio = \
-	modules/demux/mpeg/audio.c \
+	audio.c \
 	$(NULL)
 

modules/demux/util/Modules.am

 SOURCES_id3 = \
-	modules/demux/util/id3.c \
+	id3.c \
 	$(NULL)
 
 SOURCES_id3tag = \
-	modules/demux/util/id3tag.c \
-	modules/demux/util/id3genres.h \
+	id3tag.c \
+	id3genres.h \
 	$(NULL)
 
 SOURCES_demuxsub = \
-	modules/demux/util/sub.c \
-	modules/demux/util/sub.h \
+	sub.c \
+	sub.h \
 	$(NULL)
 

modules/demux/wav/Modules.am

 SOURCES_wav = \
-	modules/demux/wav/wav.c \
-	modules/demux/wav/wav.h \
+	wav.c \
+	wav.h \
 	$(NULL)

modules/encoder/Modules.am

-SOURCES_encoder_xvid = modules/encoder/xvid.c
+SOURCES_encoder_xvid = xvid.c

modules/encoder/ffmpeg/Modules.am

 SOURCES_encoder_ffmpeg = \
-	modules/encoder/ffmpeg/encoder.c \
-	modules/encoder/ffmpeg/video.c \
-	modules/encoder/ffmpeg/audio.c \
+	encoder.c \
+	video.c \
+	audio.c \
 	$(NULL)
 

modules/gui/.cvsignore

+.deps
+.dirstamp
+*.lo
+*.la
+*.dll
+*.dylib
+*.sl
+*.so
+Makefile.am
+Makefile.in
+Makefile

modules/gui/beos/Modules.am

 SOURCES_beos = \
-	modules/gui/beos/BeOS.cpp \
-	modules/gui/beos/AudioOutput.cpp \
-	modules/gui/beos/VideoOutput.cpp \
-	modules/gui/beos/Interface.cpp \
-	modules/gui/beos/InterfaceWindow.cpp \
-	modules/gui/beos/InterfaceWindow.h \
-	modules/gui/beos/ListViews.cpp \
-	modules/gui/beos/ListViews.h \
-	modules/gui/beos/DrawingTidbits.cpp \
-	modules/gui/beos/DrawingTidbits.h \
-	modules/gui/beos/TransportButton.cpp \
-	modules/gui/beos/TransportButton.h \
-	modules/gui/beos/PlayListWindow.cpp \
-	modules/gui/beos/PlayListWindow.h \
-	modules/gui/beos/PreferencesWindow.cpp \
-	modules/gui/beos/PreferencesWindow.h \
-	modules/gui/beos/MessagesWindow.cpp \
-	modules/gui/beos/MessagesWindow.h \
-	modules/gui/beos/MediaControlView.cpp \
-	modules/gui/beos/MediaControlView.h \
-	modules/gui/beos/VlcWrapper.cpp \
-	modules/gui/beos/VlcWrapper.h \
-	modules/gui/beos/Bitmaps.h \
-	modules/gui/beos/MsgVals.h \
-	modules/gui/beos/VideoWindow.h \
+	BeOS.cpp \
+	AudioOutput.cpp \
+	VideoOutput.cpp \
+	Interface.cpp \
+	InterfaceWindow.cpp \
+	InterfaceWindow.h \
+	ListViews.cpp \
+	ListViews.h \
+	DrawingTidbits.cpp \
+	DrawingTidbits.h \
+	TransportButton.cpp \
+	TransportButton.h \
+	PlayListWindow.cpp \
+	PlayListWindow.h \
+	PreferencesWindow.cpp \
+	PreferencesWindow.h \
+	MessagesWindow.cpp \
+	MessagesWindow.h \
+	MediaControlView.cpp \
+	MediaControlView.h \
+	VlcWrapper.cpp \
+	VlcWrapper.h \
+	Bitmaps.h \
+	MsgVals.h \
+	VideoWindow.h \
 	$(NULL)
 

modules/gui/familiar/Modules.am

 SOURCES_familiar = \
-	modules/gui/familiar/familiar.c \
-	modules/gui/familiar/familiar.h \
-	modules/gui/familiar/interface.c \
-	modules/gui/familiar/interface.h \
-	modules/gui/familiar/support.c \
-	modules/gui/familiar/support.h \
-	modules/gui/familiar/callbacks.c \
-	modules/gui/familiar/callbacks.h \
-        modules/gui/familiar/network.c \
-        modules/gui/familiar/network.h \
-        modules/gui/familiar/playlist.c \
-        modules/gui/familiar/playlist.h \
+	familiar.c \
+	familiar.h \
+	interface.c \
+	interface.h \
+	support.c \
+	support.h \
+	callbacks.c \
+	callbacks.h \
+        network.c \
+        network.h \
+        playlist.c \
+        playlist.h \
 	$(NULL)
 
-EXTRA_DIST += modules/gui/familiar/familiar.glade
+EXTRA_DIST += familiar.glade

modules/gui/gtk/Modules.am

 COMMON_gtk = \
-	modules/gui/gtk/display.c \
-	modules/gui/gtk/open.c \
-	modules/gui/gtk/sout.c \
-	modules/gui/gtk/control.c \
-	modules/gui/gtk/menu.c \
-	modules/gui/gtk/playlist.c \
-	modules/gui/gtk/modules.c \
-	modules/gui/gtk/preferences.c \
-	modules/gui/gtk/gtk_callbacks.c \
+	display.c \
+	open.c \
+	sout.c \
+	control.c \
+	menu.c \
+	playlist.c \
+	modules.c \
+	preferences.c \
+	gtk_callbacks.c \
 	$(NULL)
 
 SOURCES_gtk = \
-	modules/gui/gtk/gtk.c \
-	modules/gui/gtk/gtk_interface.c \
-	modules/gui/gtk/gtk_support.c \
+	gtk.c \
+	gtk_interface.c \
+	gtk_support.c \
 	$(COMMON_gtk)
 
 SOURCES_gnome = \
-	modules/gui/gtk/gnome.c \
-	modules/gui/gtk/gnome_interface.c \
-	modules/gui/gtk/gnome_support.c \
+	gnome.c \
+	gnome_interface.c \
+	gnome_support.c \
 	$(COMMON_gtk)
 
 noinst_HEADERS += \
-	modules/gui/gtk/common.h \
-	modules/gui/gtk/control.h \
-	modules/gui/gtk/gnome_callbacks.h \
-	modules/gui/gtk/gnome_interface.h \
-	modules/gui/gtk/gnome_support.h \
-	modules/gui/gtk/gtk_callbacks.h \
-	modules/gui/gtk/display.h \
-	modules/gui/gtk/menu.h \
-	modules/gui/gtk/modules.h \
-	modules/gui/gtk/open.h \
-	modules/gui/gtk/gtk_interface.h \
-	modules/gui/gtk/playlist.h \
-	modules/gui/gtk/preferences.h \
-	modules/gui/gtk/gtk_support.h \
+	common.h \
+	control.h \
+	gnome_callbacks.h \
+	gnome_interface.h \
+	gnome_support.h \
+	gtk_callbacks.h \
+	display.h \
+	menu.h \
+	modules.h \
+	open.h \
+	gtk_interface.h \
+	playlist.h \
+	preferences.h \
+	gtk_support.h \
 	$(NULL)
 
 EXTRA_DIST += \
-	modules/gui/gtk/gtk.glade \
-	modules/gui/gtk/gnome.glade \
-	modules/gui/gtk/gnome_callbacks.c \
+	gtk.glade \
+	gnome.glade \
+	gnome_callbacks.c \
 	$(NULL)

modules/gui/gtk2/Modules.am

@@ -2,26 +2,26 @@ COMMON_gtk2 = \
 	$(NULL)
 
 SOURCES_gtk2 = \
-	modules/gui/gtk2/gtk2.c \
-	modules/gui/gtk2/gtk2_callbacks.c \
-	modules/gui/gtk2/gtk2_callbacks.h \
-	modules/gui/gtk2/gtk2_interface.c \
-	modules/gui/gtk2/gtk2_interface.h \
-	modules/gui/gtk2/gtk2_support.c \
-	modules/gui/gtk2/gtk2_support.h \
+	gtk2.c \
+	gtk2_callbacks.c \
+	gtk2_callbacks.h \
+	gtk2_interface.c \
+	gtk2_interface.h \
+	gtk2_support.c \
+	gtk2_support.h \
 	$(COMMON_gtk2)
 
 SOURCES_gnome2 = \
-	modules/gui/gtk2/gnome2.c \
-	modules/gui/gtk2/gnome2_callbacks.c \
-	modules/gui/gtk2/gnome2_callbacks.h \
-	modules/gui/gtk2/gnome2_interface.c \
-	modules/gui/gtk2/gnome2_interface.h \
-	modules/gui/gtk2/gnome2_support.c \
-	modules/gui/gtk2/gnome2_support.h \
+	gnome2.c \
+	gnome2_callbacks.c \
+	gnome2_callbacks.h \
+	gnome2_interface.c \
+	gnome2_interface.h \
+	gnome2_support.c \
+	gnome2_support.h \
 	$(COMMON_gtk2)
 
 EXTRA_DIST += \
-	modules/gui/gtk2/gtk2.glade \
-	modules/gui/gtk2/gnome2.glade \
+	gtk2.glade \
+	gnome2.glade \
 	$(NULL)

modules/gui/kde/Modules.am

 SOURCES_kde = \
-	modules/gui/kde/kde.cpp \
-	modules/gui/kde/interface.cpp \
-	modules/gui/kde/slider.cpp \
-	modules/gui/kde/disc.cpp \
-	modules/gui/kde/net.cpp \
-	modules/gui/kde/menu.cpp \
-	modules/gui/kde/preferences.cpp \
-	modules/gui/kde/pluginsbox.cpp \
-	modules/gui/kde/QConfigItem.cpp \
-	modules/gui/kde/messages.cpp \
-	modules/gui/kde/info.cpp \
-	modules/gui/kde/languagemenu.cpp
+	kde.cpp \
+	interface.cpp \
+	slider.cpp \
+	disc.cpp \
+	net.cpp \
+	menu.cpp \
+	preferences.cpp \
+	pluginsbox.cpp \
+	QConfigItem.cpp \
+	messages.cpp \
+	info.cpp \
+	languagemenu.cpp \
+	$(NULL)
 
 nodist_SOURCES_kde = \
-	modules/gui/kde/interface.moc.cpp \
-	modules/gui/kde/slider.moc.cpp \
-	modules/gui/kde/disc.moc.cpp \
-	modules/gui/kde/net.moc.cpp \
-	modules/gui/kde/menu.moc.cpp \
-	modules/gui/kde/preferences.moc.cpp \
-	modules/gui/kde/pluginsbox.moc.cpp \
-	modules/gui/kde/QConfigItem.moc.cpp \
-	modules/gui/kde/messages.moc.cpp \
-	modules/gui/kde/info.moc.cpp \
-	modules/gui/kde/languagemenu.moc.cpp
+	interface.moc.cpp \
+	slider.moc.cpp \
+	disc.moc.cpp \
+	net.moc.cpp \
+	menu.moc.cpp \
+	preferences.moc.cpp \
+	pluginsbox.moc.cpp \
+	QConfigItem.moc.cpp \
+	messages.moc.cpp \
+	info.moc.cpp \
+	languagemenu.moc.cpp \
+	$(NULL)
 
 noinst_HEADERS += \
-	modules/gui/kde/common.h \
-	modules/gui/kde/disc.h \
-	modules/gui/kde/QConfigItem.h \
-	modules/gui/kde/interface.h \
-	modules/gui/kde/menu.h \
-	modules/gui/kde/net.h \
-	modules/gui/kde/pluginsbox.h \
-	modules/gui/kde/preferences.h \
-	modules/gui/kde/slider.h \
-	modules/gui/kde/messages.h \
-	modules/gui/kde/info.h \
-	modules/gui/kde/languagemenu.h
+	common.h \
+	disc.h \
+	QConfigItem.h \
+	interface.h \
+	menu.h \
+	net.h \
+	pluginsbox.h \
+	preferences.h \
+	slider.h \
+	messages.h \
+	info.h \
+	languagemenu.h \
+	$(NULL)
 
-modules/gui/kde/interface.moc.cpp: modules/gui/kde/interface.h
+interface.moc.cpp: interface.h
 	$(MOC) $< -o $@
-modules/gui/kde/slider.moc.cpp: modules/gui/kde/slider.h
+slider.moc.cpp: slider.h
 	$(MOC) $< -o $@
-modules/gui/kde/disc.moc.cpp: modules/gui/kde/disc.h
+disc.moc.cpp: disc.h
 	$(MOC) $< -o $@
-modules/gui/kde/net.moc.cpp: modules/gui/kde/net.h
+net.moc.cpp: net.h
 	$(MOC) $< -o $@
-modules/gui/kde/menu.moc.cpp: modules/gui/kde/menu.h
+menu.moc.cpp: menu.h
 	$(MOC) $< -o $@
-modules/gui/kde/preferences.moc.cpp: modules/gui/kde/preferences.h
+preferences.moc.cpp: preferences.h
 	$(MOC) $< -o $@
-modules/gui/kde/pluginsbox.moc.cpp: modules/gui/kde/pluginsbox.h
+pluginsbox.moc.cpp: pluginsbox.h
 	$(MOC) $< -o $@
-modules/gui/kde/QConfigItem.moc.cpp: modules/gui/kde/QConfigItem.h
+QConfigItem.moc.cpp: QConfigItem.h
 	$(MOC) $< -o $@
-modules/gui/kde/messages.moc.cpp: modules/gui/kde/messages.h
+messages.moc.cpp: messages.h
 	$(MOC) $< -o $@
-modules/gui/kde/info.moc.cpp: modules/gui/kde/info.h
+info.moc.cpp: info.h
 	$(MOC) $< -o $@
-modules/gui/kde/languagemenu.moc.cpp: modules/gui/kde/languagemenu.h
+languagemenu.moc.cpp: languagemenu.h
 	$(MOC) $< -o $@
 
 kdedatadir = $(datadir)/vlc
 
-dist_kdedata_DATA = modules/gui/kde/ui.rc
\ No newline at end of file
+dist_kdedata_DATA = ui.rc

modules/gui/macosx/Modules.am

 SOURCES_macosx = \
-	modules/gui/macosx/about.h \
-	modules/gui/macosx/about.m \
-	modules/gui/macosx/applescript.h \
-	modules/gui/macosx/applescript.m \
-	modules/gui/macosx/controls.h \
-	modules/gui/macosx/controls.m \
-	modules/gui/macosx/intf.m \
-	modules/gui/macosx/intf.h \
-	modules/gui/macosx/info.h \
-	modules/gui/macosx/info.m \
-	modules/gui/macosx/macosx.m \
-	modules/gui/macosx/misc.m \
-	modules/gui/macosx/misc.h \
-	modules/gui/macosx/open.m \
-	modules/gui/macosx/open.h \
-	modules/gui/macosx/playlist.m \
-	modules/gui/macosx/playlist.h \
-	modules/gui/macosx/prefs.m \
-	modules/gui/macosx/prefs.h \
-	modules/gui/macosx/output.h \
-	modules/gui/macosx/output.m \
-	modules/gui/macosx/vout.m \
-	modules/gui/macosx/vout.h \
+	about.h \
+	about.m \
+	applescript.h \
+	applescript.m \
+	controls.h \
+	controls.m \
+	intf.m \
+	intf.h \
+	info.h \
+	info.m \
+	macosx.m \
+	misc.m \
+	misc.h \
+	open.m \
+	open.h \
+	playlist.m \
+	playlist.h \
+	prefs.m \
+	prefs.h \
+	output.h \
+	output.m \
+	vout.m \
+	vout.h \
 	$(NULL)
 

modules/gui/ncurses/Modules.am

-SOURCES_ncurses = modules/gui/ncurses/ncurses.c
+SOURCES_ncurses = ncurses.c

modules/gui/qnx/Modules.am

 SOURCES_qnx = \
-	modules/gui/qnx/qnx.c \
-	modules/gui/qnx/aout.c \
-	modules/gui/qnx/vout.c
+	qnx.c \
+	aout.c \
+	vout.c

modules/gui/qt/Modules.am

 SOURCES_qt = \
-	modules/gui/qt/qt.cpp \
-	modules/gui/qt/intf.cpp
+	qt.cpp \
+	intf.cpp
 
 nodist_SOURCES_qt = \
-	modules/gui/qt/intf.moc.cpp
+	intf.moc.cpp
 
 noinst_HEADERS += \
-	modules/gui/qt/intf.h
+	intf.h
 
-modules/gui/qt/intf.moc.cpp: modules/gui/qt/intf.h
+intf.moc.cpp: intf.h
 	$(MOC) $< -o $@
 

modules/gui/win32/Modules.am

@@ -8,8 +8,8 @@ EXTRA_DIST += $(BORLAND_win32)
 # We have private rules! We do whatever we want! Don't mess with us!
 SOURCES_win32 = PRIVATE
 
-modules/gui/win32/libwin32_plugin.dll: $(BORLAND_win32)
-	cd modules/gui/win32/ && \
+libwin32_plugin.dll: $(BORLAND_win32)
+	cd && \
 	rm -f win32.mak && \
 	$(BPR2MAK) win32.bpr -s | \
 		sed -e 's@^LIBPATH = .*@&;$$(RELEASELIBPATH)@' \
@@ -18,45 +18,45 @@ modules/gui/win32/libwin32_plugin.dll: $(BORLAND_win32)
 	$(BCMAKE) -f win32.mak -b
 
 BORLAND_win32 = \
-	modules/gui/win32/win32.bpr \
-	modules/gui/win32/win32.bpf \
+	win32.bpr \
+	win32.bpf \
 	\
-	modules/gui/win32/about.cpp \
-	modules/gui/win32/disc.cpp \
-	modules/gui/win32/dragdrop.cpp \
-	modules/gui/win32/mainframe.cpp \
-	modules/gui/win32/menu.cpp \
-	modules/gui/win32/messages.cpp \
-	modules/gui/win32/network.cpp \
-	modules/gui/win32/playlist.cpp \
-	modules/gui/win32/preferences.cpp \
-	modules/gui/win32/win32.cpp \
-	modules/gui/win32/misc.cpp \
-	modules/gui/win32/sout.cpp \
-	modules/gui/win32/subtitles.cpp \
+	about.cpp \
+	disc.cpp \
+	dragdrop.cpp \
+	mainframe.cpp \
+	menu.cpp \
+	messages.cpp \
+	network.cpp \
+	playlist.cpp \
+	preferences.cpp \
+	win32.cpp \
+	misc.cpp \
+	sout.cpp \
+	subtitles.cpp \
 	\
-	modules/gui/win32/about.dfm \
-	modules/gui/win32/disc.dfm \
-	modules/gui/win32/mainframe.dfm \
-	modules/gui/win32/messages.dfm \
-	modules/gui/win32/network.dfm \
-	modules/gui/win32/playlist.dfm \
-	modules/gui/win32/preferences.dfm \
-	modules/gui/win32/sout.dfm \
-	modules/gui/win32/subtitles.dfm \
+	about.dfm \
+	disc.dfm \
+	mainframe.dfm \
+	messages.dfm \
+	network.dfm \
+	playlist.dfm \
+	preferences.dfm \
+	sout.dfm \
+	subtitles.dfm \
 	\
-	modules/gui/win32/about.h \
-	modules/gui/win32/disc.h \
-	modules/gui/win32/dragdrop.h \
-	modules/gui/win32/mainframe.h \
-	modules/gui/win32/menu.h \
-	modules/gui/win32/messages.h \
-	modules/gui/win32/network.h \
-	modules/gui/win32/playlist.h \
-	modules/gui/win32/preferences.h \
-	modules/gui/win32/win32_common.h \
-	modules/gui/win32/misc.h \
-	modules/gui/win32/sout.h \
-	modules/gui/win32/subtitles.h \
+	about.h \
+	disc.h \
+	dragdrop.h \
+	mainframe.h \
+	menu.h \
+	messages.h \
+	network.h \
+	playlist.h \
+	preferences.h \
+	win32_common.h \
+	misc.h \
+	sout.h \
+	subtitles.h \
 	$(NULL)
 

modules/gui/wxwindows/Modules.am

 SOURCES_wxwindows = \
-	modules/gui/wxwindows/wxwindows.cpp \
-	modules/gui/wxwindows/wxwindows.h \
-	modules/gui/wxwindows/interface.cpp \
-	modules/gui/wxwindows/open.cpp \
-	modules/gui/wxwindows/streamout.cpp \
-	modules/gui/wxwindows/messages.cpp \
-	modules/gui/wxwindows/playlist.cpp \
-	modules/gui/wxwindows/menus.cpp \
-	modules/gui/wxwindows/preferences.cpp \
-	modules/gui/wxwindows/timer.cpp \
-	modules/gui/wxwindows/fileinfo.cpp \
-	modules/gui/wxwindows/subtitles.cpp \
+	wxwindows.cpp \
+	wxwindows.h \
+	interface.cpp \
+	open.cpp \
+	streamout.cpp \
+	messages.cpp \
+	playlist.cpp \
+	menus.cpp \
+	preferences.cpp \
+	timer.cpp \
+	fileinfo.cpp \
+	subtitles.cpp \
 	$(NULL)
 
 EXTRA_DIST += \
-	modules/gui/wxwindows/bitmaps/file.xpm \
-	modules/gui/wxwindows/bitmaps/disc.xpm \
-	modules/gui/wxwindows/bitmaps/net.xpm \
-	modules/gui/wxwindows/bitmaps/stop.xpm \
-	modules/gui/wxwindows/bitmaps/play.xpm \
-	modules/gui/wxwindows/bitmaps/pause.xpm \
-	modules/gui/wxwindows/bitmaps/playlist.xpm \
-	modules/gui/wxwindows/bitmaps/previous.xpm \
-	modules/gui/wxwindows/bitmaps/next.xpm \
-	modules/gui/wxwindows/bitmaps/slow.xpm \
-	modules/gui/wxwindows/bitmaps/fast.xpm
+	bitmaps/file.xpm \
+	bitmaps/disc.xpm \
+	bitmaps/net.xpm \
+	bitmaps/stop.xpm \
+	bitmaps/play.xpm \
+	bitmaps/pause.xpm \
+	bitmaps/playlist.xpm \
+	bitmaps/previous.xpm \
+	bitmaps/next.xpm \
+	bitmaps/slow.xpm \
+	bitmaps/fast.xpm

modules/misc/Modules.am

-SOURCES_gtk_main = modules/misc/gtk_main.c
-SOURCES_gnome_main = modules/misc/gtk_main.c
-SOURCES_gtk2_main = modules/misc/gtk_main.c
-SOURCES_gnome2_main = modules/misc/gtk_main.c
-SOURCES_sap = modules/misc/sap.c
-SOURCES_screensaver = modules/misc/screensaver.c
-SOURCES_qte_main = modules/misc/qte_main.cpp
-SOURCES_httpd = modules/misc/httpd.c
+SOURCES_gtk_main = gtk_main.c
+SOURCES_gnome_main = gtk_main.c
+SOURCES_gtk2_main = gtk_main.c
+SOURCES_gnome2_main = gtk_main.c
+SOURCES_sap = sap.c
+SOURCES_screensaver = screensaver.c
+SOURCES_qte_main = qte_main.cpp
+SOURCES_httpd = httpd.c

modules/misc/dummy/Modules.am

 SOURCES_dummy = \
-	modules/misc/dummy/dummy.c \
-	modules/misc/dummy/dummy.h \
-	modules/misc/dummy/aout.c \
-	modules/misc/dummy/vout.c \
-	modules/misc/dummy/interface.c \
-	modules/misc/dummy/input.c \
-	modules/misc/dummy/decoder.c \
+	dummy.c \
+	dummy.h \
+	aout.c \
+	vout.c \
+	interface.c \
+	input.c \
+	decoder.c \
 	$(NULL)
 

modules/misc/logger/Modules.am

-SOURCES_logger = modules/misc/logger/logger.c
+SOURCES_logger = logger.c

modules/misc/memcpy/Modules.am

 SOURCES_memcpy = \
-	modules/misc/memcpy/memcpy.c \
+	memcpy.c \
 	$(NULL)
 
 SOURCES_memcpymmx = \
-	modules/misc/memcpy/memcpy.c \
-	modules/misc/memcpy/fastmemcpy.h \
+	memcpy.c \
+	fastmemcpy.h \
 	$(NULL)
 
 SOURCES_memcpymmxext = \
-	modules/misc/memcpy/memcpy.c \
-	modules/misc/memcpy/fastmemcpy.h \
+	memcpy.c \
+	fastmemcpy.h \
 	$(NULL)
 
 SOURCES_memcpy3dn = \
-	modules/misc/memcpy/memcpy.c \
-	modules/misc/memcpy/fastmemcpy.h \
+	memcpy.c \
+	fastmemcpy.h \
 	$(NULL)
 
 SOURCES_memcpyaltivec = \
-	modules/misc/memcpy/memcpyaltivec.c \
+	memcpyaltivec.c \
 	$(NULL)
 

modules/misc/network/Modules.am

-SOURCES_ipv4 = modules/misc/network/ipv4.c
-SOURCES_ipv6 = modules/misc/network/ipv6.c
+SOURCES_ipv4 = ipv4.c
+SOURCES_ipv6 = ipv6.c

modules/misc/testsuite/Modules.am

-SOURCES_test1 = modules/misc/testsuite/test1.c
-SOURCES_test2 = modules/misc/testsuite/test2.cpp
-SOURCES_test3 = modules/misc/testsuite/test3.m
-SOURCES_test4 = modules/misc/testsuite/test4.c
+SOURCES_test1 = test1.c
+SOURCES_test2 = test2.cpp
+SOURCES_test3 = test3.m
+SOURCES_test4 = test4.c

modules/mux/Modules.am

-SOURCES_mux_dummy = modules/mux/dummy.c
-SOURCES_mux_avi = modules/mux/avi.c
-SOURCES_mux_ogg = modules/mux/ogg.c
+SOURCES_mux_dummy = dummy.c
+SOURCES_mux_avi = avi.c
+SOURCES_mux_ogg = ogg.c

modules/mux/mpeg/Modules.am

-SOURCES_mux_ps = modules/mux/mpeg/ps.c \
-                 modules/mux/mpeg/pes.c \
-                 modules/mux/mpeg/pes.h \
-                 modules/mux/mpeg/bits.h \
+SOURCES_mux_ps = ps.c \
+                 pes.c \
+                 pes.h \
+                 bits.h \
                  $(NULL)
-SOURCES_mux_ts = modules/mux/mpeg/ts.c \
-                 modules/mux/mpeg/pes.c \
-                 modules/mux/mpeg/pes.h \
-                 modules/mux/mpeg/bits.h \
+SOURCES_mux_ts = ts.c \
+                 pes.c \
+                 pes.h \
+                 bits.h \
                  $(NULL)
 
-SOURCES_mux_ts_dvbpsi = modules/mux/mpeg/ts.c \
-                        modules/mux/mpeg/pes.c \
-                        modules/mux/mpeg/pes.h \
-                        modules/mux/mpeg/bits.h \
+SOURCES_mux_ts_dvbpsi = ts.c \
+                        pes.c \
+                        pes.h \
+                        bits.h \
                         $(NULL)
 

modules/packetizer/Modules.am

-SOURCES_packetizer_copy = modules/packetizer/copy.c
-SOURCES_packetizer_a52 = modules/packetizer/a52.c
-SOURCES_packetizer_mpegaudio = modules/packetizer/mpegaudio.c
-SOURCES_packetizer_mpegvideo = modules/packetizer/mpegvideo.c
-SOURCES_packetizer_mpeg4video = modules/packetizer/mpeg4video.c
-SOURCES_packetizer_mpeg4audio = modules/packetizer/mpeg4audio.c
-SOURCES_packetizer_vorbis = modules/packetizer/vorbis.c
+SOURCES_packetizer_copy = copy.c
+SOURCES_packetizer_a52 = a52.c
+SOURCES_packetizer_mpegaudio = mpegaudio.c
+SOURCES_packetizer_mpegvideo = mpegvideo.c
+SOURCES_packetizer_mpeg4video = mpeg4video.c
+SOURCES_packetizer_mpeg4audio = mpeg4audio.c
+SOURCES_packetizer_vorbis = vorbis.c

modules/stream_out/Modules.am

-SOURCES_stream_out_dummy = modules/stream_out/dummy.c
-SOURCES_stream_out_standard = modules/stream_out/standard.c
-SOURCES_stream_out_transcode = modules/stream_out/transcode.c
-SOURCES_stream_out_duplicate = modules/stream_out/duplicate.c
-SOURCES_stream_out_es = modules/stream_out/es.c
-SOURCES_stream_out_display = modules/stream_out/display.c
+SOURCES_stream_out_dummy = dummy.c
+SOURCES_stream_out_standard = standard.c
+SOURCES_stream_out_transcode = transcode.c
+SOURCES_stream_out_duplicate = duplicate.c
+SOURCES_stream_out_es = es.c
+SOURCES_stream_out_display = display.c

modules/video_chroma/Modules.am

 SOURCES_i420_rgb = \
-	modules/video_chroma/i420_rgb.c \
-	modules/video_chroma/i420_rgb.h \
-	modules/video_chroma/i420_rgb8.c \
-	modules/video_chroma/i420_rgb16.c \
-	modules/video_chroma/i420_rgb_c.h \
+	i420_rgb.c \
+	i420_rgb.h \
+	i420_rgb8.c \
+	i420_rgb16.c \
+	i420_rgb_c.h \
 	$(NULL)
 
 SOURCES_i420_rgb_mmx = \
-	modules/video_chroma/i420_rgb.c \
-	modules/video_chroma/i420_rgb.h \
-	modules/video_chroma/i420_rgb16.c \
-	modules/video_chroma/i420_rgb_mmx.h \
+	i420_rgb.c \
+	i420_rgb.h \
+	i420_rgb16.c \
+	i420_rgb_mmx.h \
 	$(NULL)
 
 SOURCES_i420_yuy2 = \
-	modules/video_chroma/i420_yuy2.c \
-	modules/video_chroma/i420_yuy2.h \
+	i420_yuy2.c \
+	i420_yuy2.h \
 	$(NULL)
 
 SOURCES_i420_yuy2_mmx = \
-	modules/video_chroma/i420_yuy2.c \
-	modules/video_chroma/i420_yuy2.h \
+	i420_yuy2.c \
+	i420_yuy2.h \
 	$(NULL)
 
 SOURCES_i422_yuy2 = \
-	modules/video_chroma/i422_yuy2.c \
-	modules/video_chroma/i422_yuy2.h \
+	i422_yuy2.c \
+	i422_yuy2.h \
 	$(NULL)
 
 SOURCES_i422_yuy2_mmx = \
-	modules/video_chroma/i422_yuy2.c \
-	modules/video_chroma/i422_yuy2.h \
+	i422_yuy2.c \
+	i422_yuy2.h \
 	$(NULL)
 
 SOURCES_i420_ymga = \
-	modules/video_chroma/i420_ymga.c
+	i420_ymga.c \
 	$(NULL)
 
 SOURCES_i420_ymga_mmx = \
-	modules/video_chroma/i420_ymga.c
+	i420_ymga.c \
 	$(NULL)
 

modules/video_filter/Modules.am

-SOURCES_transform = modules/video_filter/transform.c
-SOURCES_invert = modules/video_filter/invert.c
-SOURCES_adjust = modules/video_filter/adjust.c
-SOURCES_distort = modules/video_filter/distort.c
-SOURCES_wall = modules/video_filter/wall.c
-SOURCES_clone = modules/video_filter/clone.c
-SOURCES_crop = modules/video_filter/crop.c
-SOURCES_motionblur = modules/video_filter/motionblur.c
-SOURCES_osdtext = modules/video_filter/osd_text.c
-noinst_HEADERS += modules/video_filter/filter_common.h
+SOURCES_transform = transform.c
+SOURCES_invert = invert.c
+SOURCES_adjust = adjust.c
+SOURCES_distort = distort.c
+SOURCES_wall = wall.c
+SOURCES_clone = clone.c
+SOURCES_crop = crop.c
+SOURCES_motionblur = motionblur.c
+SOURCES_osdtext = osd_text.c
+noinst_HEADERS += filter_common.h

modules/video_filter/deinterlace/Modules.am

-SOURCES_deinterlace = modules/video_filter/deinterlace/deinterlace.c
+SOURCES_deinterlace = deinterlace.c

modules/video_output/Modules.am

-SOURCES_aa = modules/video_output/aa.c
-SOURCES_fb = modules/video_output/fb.c
-SOURCES_ggi = modules/video_output/ggi.c
-SOURCES_glide = modules/video_output/glide.c
-SOURCES_vout_sdl = modules/video_output/sdl.c
-SOURCES_svgalib = modules/video_output/svgalib.c
-SOURCES_wingdi = modules/video_output/wingdi.c
-SOURCES_vout_encoder = modules/video_output/encoder.c
+SOURCES_aa = aa.c
+SOURCES_fb = fb.c
+SOURCES_ggi = ggi.c
+SOURCES_glide = glide.c
+SOURCES_vout_sdl = sdl.c
+SOURCES_svgalib = svgalib.c
+SOURCES_wingdi = wingdi.c
+SOURCES_vout_encoder = encoder.c

modules/video_output/directx/Modules.am

 SOURCES_vout_directx = \
-	modules/video_output/directx/directx.c \
-	modules/video_output/directx/vout.h \
-	modules/video_output/directx/events.c \
+	directx.c \
+	vout.h \
+	events.c \
 	$(NULL)
 

modules/video_output/mga/Modules.am

-SOURCES_mga = modules/video_output/mga/mga.c
-SOURCES_xmga = modules/video_output/mga/xmga.c
+SOURCES_mga = mga.c
+SOURCES_xmga = xmga.c

modules/video_output/qte/Modules.am

 SOURCES_qte = \
-	modules/video_output/qte/qte.cpp \
-	modules/video_output/qte/qte.h \
+	qte.cpp \
+	qte.h \
 	$(NULL)

modules/video_output/x11/Modules.am

 SOURCES_x11 = \
-	modules/video_output/x11/x11.c \
-	modules/video_output/x11/xcommon.c \
-	modules/video_output/x11/xcommon.h \
+	x11.c \
+	xcommon.c \
+	xcommon.h \
 	$(NULL)
 
 SOURCES_xvideo = \
-	modules/video_output/x11/xvideo.c \
-	modules/video_output/x11/xcommon.c \
-	modules/video_output/x11/xcommon.h \
+	xvideo.c \
+	xcommon.c \
+	xcommon.h \
 	$(NULL)
 

modules/visualization/.cvsignore

+.deps
+.dirstamp
+*.lo
+*.la
+*.dll
+*.dylib
+*.sl
+*.so
+Makefile.am
+Makefile.in
+Makefile

modules/visualization/scope/Modules.am

-SOURCES_scope = modules/visualization/scope/scope.c
+SOURCES_scope = scope.c

modules/visualization/xosd/Modules.am

-SOURCES_xosd = modules/visualization/xosd/xosd.c
+SOURCES_xosd = xosd.c