[FFmpeg-cvslog] r21226 - in trunk: Makefile common.mak subdir.mak

[ramiro]

Author: ramiro
Date: Fri Jan 15 20:16:28 2010
New Revision: 21226

Log:
Get one step closer to world domination.
Remove "make uninstall".

Modified:
   trunk/Makefile
   trunk/common.mak
   trunk/subdir.mak

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Fri Jan 15 19:50:53 2010	(r21225)
+++ trunk/Makefile	Fri Jan 15 20:16:28 2010	(r21226)
@@ -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/*~

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	Fri Jan 15 19:50:53 2010	(r21225)
+++ trunk/common.mak	Fri Jan 15 20:16:28 2010	(r21226)
@@ -43,9 +43,7 @@ $(BUILD_ROOT_REL)/version.h: $(SRC_PATH_
 
 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)

Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak	Fri Jan 15 19:50:53 2010	(r21225)
+++ trunk/subdir.mak	Fri Jan 15 20:16:28 2010	(r21226)
@@ -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))