* ./include/modules_inner.h: support for several modules with the same

    name but with different directory names.
  * ./Makefile: plugins get installed in different directory names.
  * ALL: additional -ansi -pedantic fixes.

Makefile

@@ -187,11 +187,16 @@ endif
 plugins-install:
 	mkdir -p $(DESTDIR)$(libdir)/vlc
 ifneq (,$(PLUGINS))
-	$(INSTALL) $(PLUGINS:%=modules/%.so) $(DESTDIR)$(libdir)/vlc
+	for plugin in $(PLUGINS) ; \
+		do dir=`echo $$plugin | sed -e 's@/[^ ]*@@g'` ; \
+		mkdir -p $(DESTDIR)$(libdir)/vlc/$$dir ; \
+		cp modules/$${plugin}.so $(DESTDIR)$(libdir)/vlc/$$dir ; \
+	done
 endif
 
 plugins-uninstall:
-	rm -f $(DESTDIR)$(libdir)/vlc/*.so
+	rm -f $(DESTDIR)$(libdir)/vlc/*/*.so
+	-rmdir $(DESTDIR)$(libdir)/vlc/*
 	-rmdir $(DESTDIR)$(libdir)/vlc
 
 builtins-install:
@@ -405,7 +410,7 @@ src/misc/modules_builtin.h: Makefile.opts Makefile Makefile.config
 	@rm -f $@ && cp $@.in $@
 ifneq (,$(BUILTINS))
 	@for i in $(BUILTINS) ; do \
-		echo "int vlc_entry__"`basename $$i`"( module_t* );" >>$@; \
+		echo "int vlc_entry__modules_"`echo $$i | sed -e 'y@/@_@ ; s@\..*@@'`"( module_t* );" >>$@; \
 	done
 	@echo "" >> $@ ;
 endif
@@ -414,7 +419,7 @@ endif
 	@echo "    { \\" >> $@ ;
 ifneq (,$(BUILTINS))
 	@for i in $(BUILTINS) ; do \
-		echo "        ALLOCATE_BUILTIN("`basename $$i`"); \\" >> $@ ; \
+		echo "        ALLOCATE_BUILTIN(modules_"`echo $$i | sed -e 'y@/@_@ ; s@\..*@@'`"); \\" >> $@ ; \
 	done
 endif
 	@echo "    } while( 0 );" >> $@ ;
@@ -479,7 +484,7 @@ builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ)
 plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ)
 
 modules/%.a modules/%.so: $(H_OBJ) FORCE
-	@cd $(shell echo $@ | sed -e 's@\(.*\)/.*@\1@') && $(MAKE) -f $(shell echo $@ | sed -e 's@[^/]*/@../@g' -e 's@\(.*\)/.*@\1@')/Makefile.modules $(shell echo $@ | sed -e 's@.*/@@') PARENT=$(shell echo $@ | sed -e 's@[^/]*/@../@g' -e 's@\(.*\)/.*@\1@')
+	cd $(shell echo $@ | sed -e 's@\(.*\)/.*@\1@') && $(MAKE) -f $(shell echo $@ | sed -e 's@[^/]*/@../@g' -e 's@\(.*\)/.*@\1@')/Makefile.modules $(shell echo $@ | sed -e 's@.*/@@') PARENT=$(shell echo $@ | sed -e 's@[^/]*/@../@g' -e 's@\(.*\)/.*@\1@') MODULE_PATH=$(shell echo $@ | sed -e 'y@/@_@ ; s@\..*@@')
 
 #
 # Mozilla plugin target

Makefile.modules

@@ -29,12 +29,12 @@ builtins_CFLAGS += -D__BUILTIN__ -I$(PARENT)/include -I$(PARENT)/extras
 ifeq (lo,$(suff))
 extra_CFLAGS := $(plugins_CFLAGS) $($(module_name)_CFLAGS) \
                 -DMODULE_NAME=$(module_name) -DMODULE_NAME_IS_$(module_name) \
-                $($(module_name)_so_CFLAGS)
+		-DMODULE_PATH=$(MODULE_PATH) $($(module_name)_so_CFLAGS)
 OBJ_ALL := $(SRC_C:%.c=%.lo.$(module_name)) $(SRC_CPP:%.cpp=%.lo.$(module_name))
 else
 extra_CFLAGS := $(builtins_CFLAGS) $($(module_name)_CFLAGS) \
                 -DMODULE_NAME=$(module_name) -DMODULE_NAME_IS_$(module_name) \
-                $($(module_name)_a_CFLAGS)
+		-DMODULE_PATH=$(MODULE_PATH) $($(module_name)_a_CFLAGS)
 OBJ_ALL := $(SRC_C:%.c=%.o.$(module_name)) $(SRC_CPP:%.cpp=%.o.$(module_name)) \
 		$(SRC_M:%.m=%.o.$(module_name))
 endif

configure.in

@@ -56,6 +56,10 @@ AM_GNU_GETTEXT
 dnl AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 
+dnl Check for compiler properties
+AC_C_CONST
+AC_C_INLINE
+
 dnl
 dnl  Set default LDFLAGS
 dnl

debian/gnome-vlc.dirs

 usr/bin
-usr/lib/vlc
+usr/lib/vlc/gui
 usr/share/doc
 usr/share/gnome/apps/Multimedia
 usr/share/man/man1

debian/gvlc.dirs

 usr/bin
-usr/lib/vlc
+usr/lib/vlc/gui
 usr/share/doc
 usr/share/gnome/apps/Multimedia
 usr/share/man/man1

debian/kvlc.dirs

 usr/bin
-usr/lib/vlc
+usr/lib/vlc/gui
 usr/share/doc
 usr/share/man/man1
 usr/share/pixmaps

debian/qvlc.dirs

 usr/bin
-usr/lib/vlc
+usr/lib/vlc/gui
 usr/share/doc
 usr/share/man/man1
 usr/share/pixmaps

debian/rules

@@ -61,65 +61,111 @@ install: build
 
 	DESTDIR=`pwd`/debian/vlc/ $(MAKE) install prefix=/usr
 
-	# make symlinks for packages and install plugins
-	case $(DEB_BUILD_ARCH) in \
-	i386) \
-		ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa lirc aa xosd kde glide" ;; \
-	*) \
-		ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa lirc aa xosd kde" ;; \
-	esac ;\
-	for alias in $$ARCH_ALIASES ; do \
-		ln -s vlc debian/vlc-plugin-$$alias/usr/share/doc/vlc-plugin-$$alias ; \
-		mv debian/vlc/usr/lib/vlc/$$alias.so \
-			debian/vlc-plugin-$$alias/usr/lib/vlc/ ; done
-
-	# do the same for the mozilla plugin
-	ln -s vlc debian/mozilla-plugin-vlc/usr/share/doc/mozilla-plugin-vlc
-	mv debian/vlc/usr/lib/mozilla debian/mozilla-plugin-vlc/usr/lib
+	# Package: vlc
+	mv debian/vlc/$(VIDDIR)/vlc48x48.png debian/vlc/$(PIXDIR)/vlc.png
+	cp debian/vlc.desktop debian/vlc/$(GNOMEDIR)
+	cp debian/gvlc.desktop debian/gvlc/$(GNOMEDIR)
+	cp debian/gnome-vlc.desktop debian/gnome-vlc/$(GNOMEDIR)
 
-	# install development files
+	# Package: libvlc0-dev
 	mv debian/vlc/usr/bin/vlc-config debian/libvlc0-dev/usr/bin/
 	mv debian/vlc/usr/lib/*.a debian/libvlc0-dev/usr/lib/
 	mv debian/vlc/usr/lib/vlc/*.a debian/libvlc0-dev/usr/lib/vlc/
 	mv debian/vlc/usr/include/vlc/* debian/libvlc0-dev/usr/include/vlc/
 	ln -s vlc debian/libvlc0-dev/usr/share/doc/libvlc0-dev
 
-	# do the binary aliases
-	mv debian/vlc/usr/bin/gvlc debian/gvlc/usr/bin/
-	ln -s vlc debian/gvlc/usr/share/doc/gvlc
-	mv debian/vlc/usr/lib/vlc/gtk.so debian/gvlc/usr/lib/vlc/
-	ln -s vlc.1.gz debian/gvlc/usr/share/man/man1/gvlc.1.gz
-
+	# Package: gnome-vlc
 	mv debian/vlc/usr/bin/gnome-vlc debian/gnome-vlc/usr/bin/
 	ln -s vlc debian/gnome-vlc/usr/share/doc/gnome-vlc
-	mv debian/vlc/usr/lib/vlc/gnome.so debian/gnome-vlc/usr/lib/vlc/
+	-mv debian/vlc/usr/lib/vlc/gui/gnome.so debian/gnome-vlc/usr/lib/vlc/gui/
 	ln -s vlc.1.gz debian/gnome-vlc/usr/share/man/man1/gnome-vlc.1.gz
+	mv debian/vlc/$(VIDDIR)/gnome-vlc32x32.xpm debian/gnome-vlc/$(VIDDIR)/gnome-vlc.xpm
+	mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/gnome-vlc/$(PIXDIR)/gnome-vlc.png
+
+	# Package: gvlc
+	mv debian/vlc/usr/bin/gvlc debian/gvlc/usr/bin/
+	ln -s vlc debian/gvlc/usr/share/doc/gvlc
+	-mv debian/vlc/usr/lib/vlc/gui/gtk.so debian/gvlc/usr/lib/vlc/gui/
+	ln -s vlc.1.gz debian/gvlc/usr/share/man/man1/gvlc.1.gz
+	mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/gvlc/$(VIDDIR)/gvlc.xpm
+	mv debian/vlc/$(VIDDIR)/gvlc48x48.png debian/gvlc/$(PIXDIR)/gvlc.png
 
+	# Package: vlc-plugin-esd
+	ln -s vlc debian/vlc-plugin-esd/usr/share/doc/vlc-plugin-esd
+	-mv debian/vlc/usr/lib/vlc/audio_output/esd.so \
+		debian/vlc-plugin-esd/usr/lib/vlc/audio_output/
+
+	# Package: vlc-plugin-alsa
+	ln -s vlc debian/vlc-plugin-alsa/usr/share/doc/vlc-plugin-alsa
+	-mv debian/vlc/usr/lib/vlc/audio_output/alsa.so \
+		debian/vlc-plugin-alsa/usr/lib/vlc/audio_output/
+
+	# Package: vlc-plugin-sdl
+	ln -s vlc debian/vlc-plugin-sdl/usr/share/doc/vlc-plugin-sdl
+	-mv debian/vlc/usr/lib/vlc/audio_output/sdl.so \
+		debian/vlc-plugin-sdl/usr/lib/vlc/audio_output/
+	-mv debian/vlc/usr/lib/vlc/video_output/sdl.so \
+		debian/vlc-plugin-sdl/usr/lib/vlc/video_output/
+
+	# Package: vlc-plugin-ggi
+	ln -s vlc debian/vlc-plugin-ggi/usr/share/doc/vlc-plugin-ggi
+	-mv debian/vlc/usr/lib/vlc/video_output/ggi.so \
+		debian/vlc-plugin-ggi/usr/lib/vlc/video_output/
+
+	# Package: vlc-plugin-glide
+ifeq ($(DEB_BUILD_ARCH),i386)
+	ln -s vlc debian/vlc-plugin-glide/usr/share/doc/vlc-plugin-glide
+	-mv debian/vlc/usr/lib/vlc/video_output/glide.so \
+		debian/vlc-plugin-glide/usr/lib/vlc/video_output/
+endif
+
+	# Package: qvlc
 	mv debian/vlc/usr/bin/qvlc debian/qvlc/usr/bin/
 	ln -s vlc debian/qvlc/usr/share/doc/qvlc
-	mv debian/vlc/usr/lib/vlc/qt.so debian/qvlc/usr/lib/vlc/
+	-mv debian/vlc/usr/lib/vlc/gui/qt.so debian/qvlc/usr/lib/vlc/gui/
 	ln -s vlc.1.gz debian/qvlc/usr/share/man/man1/qvlc.1.gz
+	mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/qvlc/$(VIDDIR)/qvlc.xpm
+	mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/qvlc/$(PIXDIR)/qvlc.png
+
+	# Package: vlc-plugin-mad
+	ln -s vlc debian/vlc-plugin-mad/usr/share/doc/vlc-plugin-mad
+	-mv debian/vlc/usr/lib/vlc/codec/mad.so \
+		debian/vlc-plugin-mad/usr/lib/vlc/codec/
+
+	# Package: vlc-plugin-arts
+	ln -s vlc debian/vlc-plugin-arts/usr/share/doc/vlc-plugin-arts
+	-mv debian/vlc/usr/lib/vlc/audio_output/arts.so \
+		debian/vlc-plugin-arts/usr/lib/vlc/audio_output/
+
+	# Package: vlc-plugin-lirc
+	ln -s vlc debian/vlc-plugin-lirc/usr/share/doc/vlc-plugin-lirc
+	-mv debian/vlc/usr/lib/vlc/control/lirc.so \
+		debian/vlc-plugin-lirc/usr/lib/vlc/control/
+
+	# Package: vlc-plugin-aa
+	ln -s vlc debian/vlc-plugin-aa/usr/share/doc/vlc-plugin-aa
+	-mv debian/vlc/usr/lib/vlc/video_output/aa.so \
+		debian/vlc-plugin-aa/usr/lib/vlc/video_output/
 
+	# Package: vlc-plugin-xosd
+	ln -s vlc debian/vlc-plugin-xosd/usr/share/doc/vlc-plugin-xosd
+	-mv debian/vlc/usr/lib/vlc/visualization/xosd.so \
+		debian/vlc-plugin-xosd/usr/lib/vlc/visualization/
+
+	# Package: mozilla-plugin-vlc
+	ln -s vlc debian/mozilla-plugin-vlc/usr/share/doc/mozilla-plugin-vlc
+	mv debian/vlc/usr/lib/mozilla debian/mozilla-plugin-vlc/usr/lib
+
+	# Package: kvlc
 	mv debian/vlc/usr/bin/kvlc debian/kvlc/usr/bin/
 	ln -s vlc debian/kvlc/usr/share/doc/kvlc
-	mv debian/vlc/usr/lib/vlc/kde.so debian/kvlc/usr/lib/vlc/
+	-mv debian/vlc/usr/lib/vlc/gui/kde.so debian/kvlc/usr/lib/vlc/gui/
 	ln -s vlc.1.gz debian/kvlc/usr/share/man/man1/kvlc.1.gz
-
-	# copy pictures
-	mv debian/vlc/$(VIDDIR)/vlc48x48.png debian/vlc/$(PIXDIR)/vlc.png
-	mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/gvlc/$(VIDDIR)/gvlc.xpm
-	mv debian/vlc/$(VIDDIR)/gvlc48x48.png debian/gvlc/$(PIXDIR)/gvlc.png
-	mv debian/vlc/$(VIDDIR)/gnome-vlc32x32.xpm debian/gnome-vlc/$(VIDDIR)/gnome-vlc.xpm
-	mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/gnome-vlc/$(PIXDIR)/gnome-vlc.png
-	mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/qvlc/$(VIDDIR)/qvlc.xpm
-	mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/qvlc/$(PIXDIR)/qvlc.png
 	mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/kvlc/$(VIDDIR)/kvlc.xpm
 	mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/kvlc/$(PIXDIR)/kvlc.png
-	rm -f debian/vlc/$(VIDDIR)/*.png
 
-	cp debian/vlc.desktop debian/vlc/$(GNOMEDIR)
-	cp debian/gvlc.desktop debian/gvlc/$(GNOMEDIR)
-	cp debian/gnome-vlc.desktop debian/gnome-vlc/$(GNOMEDIR)
+	# Clean up
+	rm -f debian/vlc/$(VIDDIR)/*.png
 
 	#gzip -9 < doc/vlc.1 >| debian/vlc/usr/share/man/man1/vlc.1.gz
 
@@ -136,14 +182,9 @@ binary-arch: build install
 	dh_installdocs
 #	dh_installexamples
 	dh_installmenu
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installinit
-#	dh_installcron
-	dh_installman doc/vlc.1
-#	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs -Ngnome-vlc -Ngvlc -Nvlc-plugin-ggi -Nvlc-plugin-glide -Nvlc-plugin-esd -Nvlc-plugin-alsa -Nvlc-plugin-sdl -Nqvlc -Nvlc-plugin-arts -Nvlc-plugin-mad -Nvlc-plugin-lirc -Nvlc-plugin-aa -Nvlc-plugin-xosd -Nkvlc -Nmozilla-plugin-vlc ChangeLog
+	dh_installman doc/vlc.1 -p vlc
+	dh_installman doc/vlc-config.1 -p libvlc0-dev
+	dh_installchangelogs ChangeLog -p vlc
 	dh_link
 	dh_strip
 	dh_compress

debian/vlc-plugin-aa.dirs

-usr/lib/vlc
+usr/lib/vlc/video_output
 usr/share/doc

debian/vlc-plugin-alsa.dirs

-usr/lib/vlc
+usr/lib/vlc/audio_output
 usr/share/doc

debian/vlc-plugin-arts.dirs

-usr/lib/vlc
+usr/lib/vlc/audio_output
 usr/share/doc

debian/vlc-plugin-esd.dirs

-usr/lib/vlc
+usr/lib/vlc/audio_output
 usr/share/doc

debian/vlc-plugin-ggi.dirs

-usr/lib/vlc
+usr/lib/vlc/video_output
 usr/share/doc

debian/vlc-plugin-glide.dirs

-usr/lib/vlc
+usr/lib/vlc/video_output
 usr/share/doc

debian/vlc-plugin-lirc.dirs

-usr/lib/vlc
+usr/lib/vlc/control
 usr/share/doc

debian/vlc-plugin-mad.dirs

-usr/lib/vlc
+usr/lib/vlc/codec
 usr/share/doc

debian/vlc-plugin-sdl.dirs

-usr/lib/vlc
+usr/lib/vlc/audio_output
+usr/lib/vlc/video_output
 usr/share/doc

debian/vlc-plugin-xosd.dirs

-usr/lib/vlc
+usr/lib/vlc/visualization
 usr/share/doc

debian/vlc.dirs

 usr/bin
-usr/lib/vlc
+usr/lib/vlc/acess
+usr/lib/vlc/audio_filter
+usr/lib/vlc/audio_mixer
+usr/lib/vlc/audio_output
+usr/lib/vlc/codec
+usr/lib/vlc/control
+usr/lib/vlc/demux
+usr/lib/vlc/gui
+usr/lib/vlc/misc
+usr/lib/vlc/video_chroma
+usr/lib/vlc/video_filter
+usr/lib/vlc/video_output
+usr/lib/vlc/visualization
 usr/share/doc/vlc
 usr/share/gnome/apps/Multimedia
 usr/share/pixmaps