* Added a make uninstall rule.

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index f686f5a308908837d69e4e990bdc3b01dcf9bd94..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
@@ -30,8 +30,7 @@ AC3_SPDIF := ac3_spdif ac3_iec958
 LPCM_DECODER := lpcm_decoder_thread
 AUDIO_DECODER := audio_decoder adec_generic adec_layer1 adec_layer2 adec_math
 SPU_DECODER := spu_decoder
-VIDEO_PARSER := video_parser vpar_headers vpar_blocks vpar_synchro video_fifo
-VIDEO_DECODER := video_decoder
+VIDEO_DECODER := video_parser vpar_headers vpar_blocks vpar_synchro vpar_pool video_decoder
 MISC := mtime tests modules netutils
 
 C_OBJ :=       $(INTERFACE:%=src/interface/%.o) \
@@ -43,7 +42,6 @@ C_OBJ :=      $(INTERFACE:%=src/interface/%.o) \
                $(LPCM_DECODER:%=src/lpcm_decoder/%.o) \
                $(AUDIO_DECODER:%=src/audio_decoder/%.o) \
                $(SPU_DECODER:%=src/spu_decoder/%.o) \
-               $(VIDEO_PARSER:%=src/video_parser/%.o) \
                $(VIDEO_DECODER:%=src/video_decoder/%.o) \
                $(MISC:%=src/misc/%.o)
 
@@ -114,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
@@ -129,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)
@@ -140,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)
@@ -187,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}/
@@ -196,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
@@ -226,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
@@ -331,7 +352,7 @@ endif
 # Main application target
 #
 vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
-       $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) $(LCFLAGS) $(LIB)
+       $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) $(LCFLAGS)
 ifeq ($(SYS),beos)
        xres -o $@ ./share/vlc_beos.rsrc
        mimeset -f $@