Get one step closer to world domination.

Remove "make uninstall".

Originally committed as revision 21226 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index 5fd4094..4393a22 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -110,16 +110,8 @@ install-man: $(MANPAGES)
        install -d "$(MANDIR)/man1"
        install -m 644 $(MANPAGES) "$(MANDIR)/man1"
 
-uninstall: uninstall-progs uninstall-data uninstall-man
-
-uninstall-progs:
-       rm -f $(addprefix "$(BINDIR)/", $(ALLPROGS))
-
-uninstall-data:
-       rm -rf "$(DATADIR)"
-
-uninstall-man:
-       rm -f $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
+uninstall:
+       @echo "I'm sorry, Dave. I'm afraid I can't do that"
 
 testclean:
        rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/*~

diff --git a/common.mak b/common.mak
index b629cb4..8ce4648 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -43,9 +43,7 @@ $(BUILD_ROOT_REL)/version.h: $(SRC_PATH_BARE)/version.sh config.mak
 
 install: install-libs install-headers
 
-uninstall: uninstall-libs uninstall-headers
-
-.PHONY: all depend dep *clean install* uninstall* examples testprogs
+.PHONY: all depend dep *clean install* uninstall examples testprogs
 endif
 
 OBJS-$(HAVE_MMX) +=  $(MMX-OBJS-yes)

diff --git a/subdir.mak b/subdir.mak
index 1a5158a..6948211 100644 (file)
--- a/subdir.mak
+++ b/subdir.mak
@@ -81,18 +81,6 @@ install-headers::
        install -d "$(LIBDIR)/pkgconfig"
        install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
        install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
-
-uninstall-libs::
-       -rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
-              "$(SHLIBDIR)/$(SLIBNAME)"            \
-              "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-       -$(SLIB_UNINSTALL_EXTRA_CMD)
-       -rm -f "$(LIBDIR)/$(LIBNAME)"
-
-uninstall-headers::
-       rm -f $(addprefix "$(INCINSTDIR)/",$(HEADERS))
-       rm -f "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
-       -rmdir "$(INCDIR)"
 endef
 
 $(eval $(RULES))