* Added a make uninstall rule.

diff --git a/ChangeLog b/ChangeLog
index 2a156e10ea2f2c26ed1ed403beff1b394e1ac21f..87f84a2ef90a73e2c1da9df90375576fe901a97f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ HEAD
 0.2.81
 Fri, 27 Jul 2001 03:30:44 +0200
 
+  * Added a make uninstall rule.
   * Changed libdvdcss API to force binary incompatibility. Yeah, this is
     evil, but if we don't do it now we'll have to do it when more people
     are using it.

diff --git a/INSTALL b/INSTALL
index f39704fcac509afe39e4fa9ecdbad4db7ad36f1f..86cdc5a4eb2f3cfb476c65ec83295b8098a0e0d9 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -12,20 +12,20 @@ See `./configure --help' for more information.
 
 Here is a shortcut to copy-paste for a complete build:
 
-   make distclean && ./configure --prefix=/usr --enable-gnome \
+   make distclean ; ./configure --prefix=/usr --enable-gnome \
       --enable-fb --with-glide --with-ggi --with-sdl --enable-esd \
       --enable-mga --enable-gtk --enable-qt --enable-xvideo --enable-alsa
 
 If you intend to debug stuff, you may want to disable optimizations:
 
-   make distclean && ./configure --prefix=/usr --enable-gnome \
+   make distclean ; ./configure --prefix=/usr --enable-gnome \
       --enable-fb --with-glide --with-ggi --with-sdl --enable-esd \
       --enable-mga --enable-gtk --enable-qt --enable-xvideo --enable-alsa \
       --enable-debug
 
 It is also possible to cross-compile for the Win32 platform using mingw32:
 
-   make distclean && CC=i586-mingw32msvc-gcc CFLAGS=-I/usr/i586-mingw32msvc \
+   make distclean ; CC=i586-mingw32msvc-gcc CFLAGS=-I/usr/i586-mingw32msvc \
      RANLIB=i586-mingw32msvc-ranlib ./configure --host=i386-mingw32msvc \
      --target=i386-mingw32msvc --build=i386-linux --disable-dsp \
      --disable-gtk --disable-x11 --disable-xvideo

diff --git a/INSTALL-win32.txt b/INSTALL-win32.txt
index f8619a5eee4a931d7af7620f22c179b580196033..698f64e1fb27b8388157287c512e157dee13f82a 100644 (file)
--- a/INSTALL-win32.txt
+++ b/INSTALL-win32.txt
@@ -50,7 +50,7 @@ See `./configure --help' for more information.
 
 To cross-compile for the Win32 platform using mingw32:
 
-   make distclean && CC=i586-mingw32msvc-gcc CFLAGS=-I/usr/i586-mingw32msvc \
+   make distclean ; CC=i586-mingw32msvc-gcc CFLAGS=-I/usr/i586-mingw32msvc \
      RANLIB=i586-mingw32msvc-ranlib WINDRES=i586-mingw32msvc-windres \
      ./configure --host=i386-mingw32msvc \
      --target=i386-mingw32msvc --build=i386-linux --disable-dsp \

diff --git a/INSTALL.libdvdcss b/INSTALL.libdvdcss
index a37e381afecbfa4ed9e5ef6f25c757756ff677d1..55d68f5b73da2297d4203ba8269919a4d2858f05 100644 (file)
--- a/INSTALL.libdvdcss
+++ b/INSTALL.libdvdcss
@@ -12,7 +12,7 @@ See `./configure --help' for more information.
 
 It is also possible to cross-compile for the Win32 platform using mingw32:
 
-   make distclean && CC=i586-mingw32msvc-gcc CFLAGS=-I/usr/i586-mingw32msvc \
+   CC=i586-mingw32msvc-gcc CFLAGS=-I/usr/i586-mingw32msvc \
      RANLIB=i586-mingw32msvc-ranlib ./configure --host=i386-mingw32msvc \
      --target=i386-mingw32msvc --build=i386-linux
 

diff --git a/Makefile b/Makefile
index cca334b4f9ed583cd07aabb33ddf4f0c8d08f396..398a67fbbea83cf70701a5a775ade3b44eddc355 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # vlc (VideoLAN Client) main Makefile - (c)1998 VideoLAN
 ###############################################################################
 
--include Makefile.opts
+include Makefile.opts
 
 ###############################################################################
 # Objects and files
@@ -112,7 +112,7 @@ plugins-clean:
 
 vlc-clean:
        rm -f $(C_OBJ) $(CPP_OBJ)
-       rm -f vlc gnome-vlc gvlc kvlc qvlc
+       rm -f vlc gnome-vlc gvlc kvlc qvlc vlc.exe
        rm -Rf vlc.app
 
 distclean: clean
@@ -127,6 +127,8 @@ distclean: clean
 
 install: libdvdcss-install vlc-install plugins-install
 
+uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall
+
 vlc-install:
        mkdir -p $(DESTDIR)$(bindir)
        $(INSTALL) vlc $(DESTDIR)$(bindir)
@@ -138,15 +140,32 @@ endif
        $(INSTALL) -m 644 share/*.png $(DESTDIR)$(datadir)/videolan
        $(INSTALL) -m 644 share/*.xpm $(DESTDIR)$(datadir)/videolan
 
+vlc-uninstall:
+       rm vlc $(DESTDIR)$(bindir)/vlc
+ifneq (,$(ALIASES))
+       for alias in $(ALIASES) ; do if test $$alias ; then rm -f $(DESTDIR)$(bindir)/$$alias ; fi ; done
+endif
+       rm -f $(DESTDIR)$(datadir)/videolan/*.psf
+       rm -f $(DESTDIR)$(datadir)/videolan/*.png
+       rm -f $(DESTDIR)$(datadir)/videolan/*.xpm
+
 plugins-install:
        mkdir -p $(DESTDIR)$(libdir)/videolan/vlc
 ifneq (,$(PLUGINS))
        $(INSTALL) -m 644 $(PLUGINS:%=plugins/%.so) $(DESTDIR)$(libdir)/videolan/vlc
 endif
 
+plugins-uninstall:
+ifneq (,$(PLUGINS))
+       rm -f $(DESTDIR)$(libdir)/videolan/vlc/*.so
+endif
+
 libdvdcss-install:
        cd extras/libdvdcss && $(MAKE) install
 
+libdvdcss-uninstall:
+       cd extras/libdvdcss && $(MAKE) uninstall
+
 show:
        @echo CC: $(CC)
        @echo CFLAGS: $(CFLAGS)
@@ -185,7 +204,7 @@ snapshot: clean Makefile.opts
                done
        # copy misc files
        cp vlc.spec AUTHORS COPYING ChangeLog INSTALL INSTALL.libdvdcss \
-               README TODO todo.pl \
+               INSTALL-win32.txt README TODO todo.pl \
                Makefile.opts.in Makefile.dep Makefile.modules \
                configure configure.in install-sh config.sub config.guess \
                        /tmp/vlc-${PROGRAM_VERSION}/
@@ -194,8 +213,10 @@ snapshot: clean Makefile.opts
                gvlc.desktop gnome-vlc.desktop vlc.menu ; do \
                        cp debian/$$file /tmp/vlc-${PROGRAM_VERSION}/debian/ ; \
                done
-       for file in default8x16.psf default8x9.psf vlc_beos.rsrc vlc.icns ; do \
-               cp share/$$file /tmp/vlc-${PROGRAM_VERSION}/share/ ; done
+       for file in default8x16.psf default8x9.psf vlc_beos.rsrc vlc.icns \
+               gvlc_win32.ico vlc_win32_rc.rc ; do \
+                       cp share/$$file /tmp/vlc-${PROGRAM_VERSION}/share/ ; \
+               done
        for icon in vlc gvlc qvlc gnome-vlc kvlc ; do \
                cp share/$$icon.xpm share/$$icon.png \
                        /tmp/vlc-${PROGRAM_VERSION}/share/ ; done
@@ -224,9 +245,11 @@ libdvdcss-snapshot: clean Makefile.opts
                do cp $$i /tmp/libdvdcss-${LIBDVDCSS_VERSION}/$$i ; done
        # Makefiles
        sed -e 's#^install:#install-unused:#' \
+               -e 's#^uninstall:#uninstall-unused:#' \
                -e 's#^clean:#clean-unused:#' \
                -e 's#^all:.*#all: libdvdcss#' \
                -e 's#^libdvdcss-install:#install:#' \
+               -e 's#^libdvdcss-uninstall:#uninstall:#' \
                -e 's#^libdvdcss-clean:#clean:#' \
                < Makefile > /tmp/libdvdcss-${LIBDVDCSS_VERSION}/Makefile
        # extra files

diff --git a/extras/libdvdcss/Makefile b/extras/libdvdcss/Makefile
index 583392cd7956af00b375e714eb9fe5255ab080aa..e72a75712e7de28853437dc6fa5431ff09fa0bfa 100644 (file)
--- a/extras/libdvdcss/Makefile
+++ b/extras/libdvdcss/Makefile
@@ -41,3 +41,10 @@ install:
        rm -f $(DESTDIR)$(libdir)/libdvdcss.so && ln -s libdvdcss.so.$(LIBDVDCSS_VERSION) $(DESTDIR)$(libdir)/libdvdcss.so
        rm -f $(DESTDIR)$(libdir)/libdvdcss.so.$(LIBDVDCSS_MAJOR) && ln -s libdvdcss.so.$(LIBDVDCSS_VERSION) $(DESTDIR)$(libdir)/libdvdcss.so.$(LIBDVDCSS_MAJOR)
 
+uninstall:
+       rm -f $(DESTDIR)$(includedir)/videolan/dvdcss.h
+       rm -f $(DESTDIR)$(libdir)/libdvdcss.a
+       rm -f $(DESTDIR)$(libdir)/libdvdcss.so
+       rm -f $(DESTDIR)$(libdir)/libdvdcss.so.$(LIBDVDCSS_MAJOR)
+       rm -f $(DESTDIR)$(libdir)/libdvdcss.so.$(LIBDVDCSS_VERSION)
+