Changeset c085b215f4527c99b144a3683560901f5da8f1f8

Timestamp:

07/27/01 18:14:58 (7 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 996250498 +0000

git-parent:

[4945d2bb3621b899aca49359c435d0dcfcc2ec1b]

git-author:

Sam Hocevar <sam@videolan.org> 996250498 +0000

Message:

• Added a make uninstall rule.
  

Files:

• ChangeLog (modified) (1 diff)
• INSTALL (modified) (3 diffs)
• INSTALL-win32.txt (modified) (1 diff)
• INSTALL.libdvdcss (modified) (1 diff)
• Makefile (modified) (8 diffs)
• extras/libdvdcss/Makefile (modified) (1 diff)

ChangeLog

@@ -9 +9 @@
-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

INSTALL

@@ -13 +13 @@
-Here is a shortcut to copy-paste for a complete build:
-
-&&
+;
-      --enable-fb --with-glide --with-ggi --with-sdl --enable-esd \
-      --enable-mga --enable-gtk --enable-qt --enable-xvideo --enable-alsa
@@ -19 +19 @@
-If you intend to debug stuff, you may want to disable optimizations:
-
-&&
+;
-      --enable-fb --with-glide --with-ggi --with-sdl --enable-esd \
-      --enable-mga --enable-gtk --enable-qt --enable-xvideo --enable-alsa \
@@ -26 +26 @@
-It is also possible to cross-compile for the Win32 platform using mingw32:
-
-&&
+;
-     RANLIB=i586-mingw32msvc-ranlib ./configure --host=i386-mingw32msvc \
-     --target=i386-mingw32msvc --build=i386-linux --disable-dsp \

INSTALL-win32.txt

@@ -51 +51 @@
-To cross-compile for the Win32 platform using mingw32:
-
-&&
+;
-     RANLIB=i586-mingw32msvc-ranlib WINDRES=i586-mingw32msvc-windres \
-     ./configure --host=i386-mingw32msvc \

INSTALL.libdvdcss

@@ -13 +13 @@
-It is also possible to cross-compile for the Win32 platform using mingw32:
-
-make distclean && 
+
-     RANLIB=i586-mingw32msvc-ranlib ./configure --host=i386-mingw32msvc \
-     --target=i386-mingw32msvc --build=i386-linux

Makefile

@@ -3 +3 @@
-###############################################################################
-
--
+
-
-###############################################################################
@@ -113 +113 @@
-vlc-clean:
-    rm -f $(C_OBJ) $(CPP_OBJ)
-
+ vlc.exe
-    rm -Rf vlc.app
-
@@ -128 +128 @@
-install: libdvdcss-install vlc-install plugins-install
-
+uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall
+
-vlc-install:
-    mkdir -p $(DESTDIR)$(bindir)
@@ -139 +141 @@
-    $(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
@@ -145 +156 @@
-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:
@@ -186 +205 @@
-    # copy misc files
-    cp vlc.spec AUTHORS COPYING ChangeLog INSTALL INSTALL.libdvdcss \
-
+INSTALL-win32.txt 
-        Makefile.opts.in Makefile.dep Makefile.modules \
-        configure configure.in install-sh config.sub config.guess \
@@ -195 +214 @@
-            cp debian/$$file /tmp/vlc-${PROGRAM_VERSION}/debian/ ; \
-        done
-
-
+
+
+
+
-    for icon in vlc gvlc qvlc gnome-vlc kvlc ; do \
-        cp share/$$icon.xpm share/$$icon.png \
@@ -225 +246 @@
-    # 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

extras/libdvdcss/Makefile

@@ -42 +42 @@
-    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)
+