Commit c085b215 authored by Sam Hocevar's avatar Sam Hocevar

  * Added a make uninstall rule.
parent 4945d2bb
...@@ -8,6 +8,7 @@ HEAD ...@@ -8,6 +8,7 @@ HEAD
0.2.81 0.2.81
Fri, 27 Jul 2001 03:30:44 +0200 Fri, 27 Jul 2001 03:30:44 +0200
* Added a make uninstall rule.
* Changed libdvdcss API to force binary incompatibility. Yeah, this is * 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 evil, but if we don't do it now we'll have to do it when more people
are using it. are using it.
......
...@@ -12,20 +12,20 @@ See `./configure --help' for more information. ...@@ -12,20 +12,20 @@ See `./configure --help' for more information.
Here is a shortcut to copy-paste for a complete build: 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-fb --with-glide --with-ggi --with-sdl --enable-esd \
--enable-mga --enable-gtk --enable-qt --enable-xvideo --enable-alsa --enable-mga --enable-gtk --enable-qt --enable-xvideo --enable-alsa
If you intend to debug stuff, you may want to disable optimizations: 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-fb --with-glide --with-ggi --with-sdl --enable-esd \
--enable-mga --enable-gtk --enable-qt --enable-xvideo --enable-alsa \ --enable-mga --enable-gtk --enable-qt --enable-xvideo --enable-alsa \
--enable-debug --enable-debug
It is also possible to cross-compile for the Win32 platform using mingw32: 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 \ RANLIB=i586-mingw32msvc-ranlib ./configure --host=i386-mingw32msvc \
--target=i386-mingw32msvc --build=i386-linux --disable-dsp \ --target=i386-mingw32msvc --build=i386-linux --disable-dsp \
--disable-gtk --disable-x11 --disable-xvideo --disable-gtk --disable-x11 --disable-xvideo
......
...@@ -50,7 +50,7 @@ See `./configure --help' for more information. ...@@ -50,7 +50,7 @@ See `./configure --help' for more information.
To cross-compile for the Win32 platform using mingw32: 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 \ RANLIB=i586-mingw32msvc-ranlib WINDRES=i586-mingw32msvc-windres \
./configure --host=i386-mingw32msvc \ ./configure --host=i386-mingw32msvc \
--target=i386-mingw32msvc --build=i386-linux --disable-dsp \ --target=i386-mingw32msvc --build=i386-linux --disable-dsp \
......
...@@ -12,7 +12,7 @@ See `./configure --help' for more information. ...@@ -12,7 +12,7 @@ See `./configure --help' for more information.
It is also possible to cross-compile for the Win32 platform using mingw32: 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 \ RANLIB=i586-mingw32msvc-ranlib ./configure --host=i386-mingw32msvc \
--target=i386-mingw32msvc --build=i386-linux --target=i386-mingw32msvc --build=i386-linux
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# vlc (VideoLAN Client) main Makefile - (c)1998 VideoLAN # vlc (VideoLAN Client) main Makefile - (c)1998 VideoLAN
############################################################################### ###############################################################################
-include Makefile.opts include Makefile.opts
############################################################################### ###############################################################################
# Objects and files # Objects and files
...@@ -112,7 +112,7 @@ plugins-clean: ...@@ -112,7 +112,7 @@ plugins-clean:
vlc-clean: vlc-clean:
rm -f $(C_OBJ) $(CPP_OBJ) 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 rm -Rf vlc.app
distclean: clean distclean: clean
...@@ -127,6 +127,8 @@ distclean: clean ...@@ -127,6 +127,8 @@ distclean: clean
install: libdvdcss-install vlc-install plugins-install install: libdvdcss-install vlc-install plugins-install
uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall
vlc-install: vlc-install:
mkdir -p $(DESTDIR)$(bindir) mkdir -p $(DESTDIR)$(bindir)
$(INSTALL) vlc $(DESTDIR)$(bindir) $(INSTALL) vlc $(DESTDIR)$(bindir)
...@@ -138,15 +140,32 @@ endif ...@@ -138,15 +140,32 @@ endif
$(INSTALL) -m 644 share/*.png $(DESTDIR)$(datadir)/videolan $(INSTALL) -m 644 share/*.png $(DESTDIR)$(datadir)/videolan
$(INSTALL) -m 644 share/*.xpm $(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: plugins-install:
mkdir -p $(DESTDIR)$(libdir)/videolan/vlc mkdir -p $(DESTDIR)$(libdir)/videolan/vlc
ifneq (,$(PLUGINS)) ifneq (,$(PLUGINS))
$(INSTALL) -m 644 $(PLUGINS:%=plugins/%.so) $(DESTDIR)$(libdir)/videolan/vlc $(INSTALL) -m 644 $(PLUGINS:%=plugins/%.so) $(DESTDIR)$(libdir)/videolan/vlc
endif endif
plugins-uninstall:
ifneq (,$(PLUGINS))
rm -f $(DESTDIR)$(libdir)/videolan/vlc/*.so
endif
libdvdcss-install: libdvdcss-install:
cd extras/libdvdcss && $(MAKE) install cd extras/libdvdcss && $(MAKE) install
libdvdcss-uninstall:
cd extras/libdvdcss && $(MAKE) uninstall
show: show:
@echo CC: $(CC) @echo CC: $(CC)
@echo CFLAGS: $(CFLAGS) @echo CFLAGS: $(CFLAGS)
...@@ -185,7 +204,7 @@ snapshot: clean Makefile.opts ...@@ -185,7 +204,7 @@ snapshot: clean Makefile.opts
done done
# copy misc files # copy misc files
cp vlc.spec AUTHORS COPYING ChangeLog INSTALL INSTALL.libdvdcss \ 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 \ Makefile.opts.in Makefile.dep Makefile.modules \
configure configure.in install-sh config.sub config.guess \ configure configure.in install-sh config.sub config.guess \
/tmp/vlc-${PROGRAM_VERSION}/ /tmp/vlc-${PROGRAM_VERSION}/
...@@ -194,8 +213,10 @@ snapshot: clean Makefile.opts ...@@ -194,8 +213,10 @@ snapshot: clean Makefile.opts
gvlc.desktop gnome-vlc.desktop vlc.menu ; do \ gvlc.desktop gnome-vlc.desktop vlc.menu ; do \
cp debian/$$file /tmp/vlc-${PROGRAM_VERSION}/debian/ ; \ cp debian/$$file /tmp/vlc-${PROGRAM_VERSION}/debian/ ; \
done done
for file in default8x16.psf default8x9.psf vlc_beos.rsrc vlc.icns ; do \ for file in default8x16.psf default8x9.psf vlc_beos.rsrc vlc.icns \
cp share/$$file /tmp/vlc-${PROGRAM_VERSION}/share/ ; done 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 \ for icon in vlc gvlc qvlc gnome-vlc kvlc ; do \
cp share/$$icon.xpm share/$$icon.png \ cp share/$$icon.xpm share/$$icon.png \
/tmp/vlc-${PROGRAM_VERSION}/share/ ; done /tmp/vlc-${PROGRAM_VERSION}/share/ ; done
...@@ -224,9 +245,11 @@ libdvdcss-snapshot: clean Makefile.opts ...@@ -224,9 +245,11 @@ libdvdcss-snapshot: clean Makefile.opts
do cp $$i /tmp/libdvdcss-${LIBDVDCSS_VERSION}/$$i ; done do cp $$i /tmp/libdvdcss-${LIBDVDCSS_VERSION}/$$i ; done
# Makefiles # Makefiles
sed -e 's#^install:#install-unused:#' \ sed -e 's#^install:#install-unused:#' \
-e 's#^uninstall:#uninstall-unused:#' \
-e 's#^clean:#clean-unused:#' \ -e 's#^clean:#clean-unused:#' \
-e 's#^all:.*#all: libdvdcss#' \ -e 's#^all:.*#all: libdvdcss#' \
-e 's#^libdvdcss-install:#install:#' \ -e 's#^libdvdcss-install:#install:#' \
-e 's#^libdvdcss-uninstall:#uninstall:#' \
-e 's#^libdvdcss-clean:#clean:#' \ -e 's#^libdvdcss-clean:#clean:#' \
< Makefile > /tmp/libdvdcss-${LIBDVDCSS_VERSION}/Makefile < Makefile > /tmp/libdvdcss-${LIBDVDCSS_VERSION}/Makefile
# extra files # extra files
......
...@@ -41,3 +41,10 @@ install: ...@@ -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 && 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) 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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment