* Ported Glide and MGA plugins to the new module API. MGA never worked,

[vlc] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 1dd3b4f2deb8379bed345bb4410c4e99ebc0dad9..1ca0901d25114056e702967c6153cda9e27e4566 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,13 @@ SYS=@SYS@
 PLUGINS=@PLUGINS@
 INSTALL=@INSTALL@
 ARCH=@ARCH@
+
+exec_prefix=@exec_prefix@
 prefix=@prefix@
+bindir=@bindir@
+datadir=@datadir@
+libdir=@libdir@
+
 CC=@CC@
 SHELL=@SHELL@
 
@@ -293,9 +299,10 @@ PLUGIN_DUMMY =     plugins/dummy/dummy.o \
 
 PLUGIN_DVD =   plugins/dvd/dvd.o \
                plugins/dvd/input_dvd.o \
+               plugins/dvd/dvd_ioctl.o \
                plugins/dvd/dvd_ifo.o \
                plugins/dvd/dvd_udf.o \
-               plugins/dvd/dvd_css.o
+               plugins/dvd/dvd_css.o
 
 PLUGIN_ESD =   plugins/esd/esd.o \
                plugins/esd/aout_esd.o
@@ -304,11 +311,9 @@ PLUGIN_FB =        plugins/fb/fb.o \
                plugins/fb/vout_fb.o
 
 PLUGIN_GGI =   plugins/ggi/ggi.o \
-               plugins/ggi/intf_ggi.o \
                plugins/ggi/vout_ggi.o
 
 PLUGIN_GLIDE = plugins/glide/glide.o \
-               plugins/glide/intf_glide.o \
                plugins/glide/vout_glide.o
 
 PLUGIN_GNOME = plugins/gnome/gnome.o \
@@ -330,7 +335,6 @@ PLUGIN_IDCTMMXEXT = plugins/idct/idctmmxext.o \
                        plugins/idct/idct_common.o
 
 PLUGIN_MGA =   plugins/mga/mga.o \
-               plugins/mga/intf_mga.o \
                plugins/mga/vout_mga.o
 
 PLUGIN_MOTION =        plugins/motion/motion.o \
@@ -444,15 +448,15 @@ distclean: clean
        rm -rf .dep
 
 install:
-       mkdir -p $(prefix)/bin
-       $(INSTALL) vlc $(prefix)/bin
+       mkdir -p $(DESTDIR)$(bindir)
+       $(INSTALL) vlc $(DESTDIR)$(bindir)
 # ugly
-       for alias in "" @ALIASES@ ; do if test $$alias ; then rm -f $(prefix)/bin/$$alias && ln -s vlc $(prefix)/bin/$$alias ; fi ; done
-       mkdir -p $(prefix)/lib/videolan/vlc
-       $(INSTALL) -m 644 $(PLUGINS:%=lib/%.so) $(prefix)/lib/videolan/vlc
-       mkdir -p $(prefix)/share/videolan
-       $(INSTALL) -m 644 share/*.psf $(prefix)/share/videolan
-       $(INSTALL) -m 644 share/*.png $(prefix)/share/videolan
+       for alias in "" @ALIASES@ ; do if test $$alias ; then rm -f $(DESTDIR)$(bindir)/$$alias && ln -s vlc $(DESTDIR)$(bindir)/$$alias ; fi ; done
+       mkdir -p $(DESTDIR)$(libdir)/videolan/vlc
+       $(INSTALL) -m 644 $(PLUGINS:%=lib/%.so) $(DESTDIR)$(libdir)/videolan/vlc
+       mkdir -p $(DESTDIR)$(datadir)/videolan
+       $(INSTALL) -m 644 share/*.psf $(DESTDIR)$(datadir)/videolan
+       $(INSTALL) -m 644 share/*.png $(DESTDIR)$(datadir)/videolan
 
 show:
        @echo CC: $(CC)