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

[ramiro]

Author: ramiro
Date: Tue Jan 26 23:23:12 2010
New Revision: 21466

Log:
Revert r21226, it was a joke:
Get one step closer to world domination.
Remove "make uninstall".

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

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Tue Jan 26 21:28:58 2010	(r21465)
+++ trunk/Makefile	Tue Jan 26 23:23:12 2010	(r21466)
@@ -110,8 +110,16 @@ install-man: $(MANPAGES)
 	install -d "$(MANDIR)/man1"
 	install -m 644 $(MANPAGES) "$(MANDIR)/man1"
 
-uninstall:
-	@echo "I'm sorry, Dave. I'm afraid I can't do that"
+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))
 
 testclean:
 	rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/*~

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	Tue Jan 26 21:28:58 2010	(r21465)
+++ trunk/common.mak	Tue Jan 26 23:23:12 2010	(r21466)
@@ -47,7 +47,9 @@ $(BUILD_ROOT_REL)/version.h: $(SRC_PATH_
 
 install: install-libs install-headers
 
-.PHONY: all depend dep *clean install* uninstall examples testprogs
+uninstall: uninstall-libs uninstall-headers
+
+.PHONY: all depend dep *clean install* uninstall* examples testprogs
 endif
 
 OBJS-$(HAVE_MMX) +=  $(MMX-OBJS-yes)

Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak	Tue Jan 26 21:28:58 2010	(r21465)
+++ trunk/subdir.mak	Tue Jan 26 23:23:12 2010	(r21466)
@@ -84,6 +84,18 @@ ifdef BUILT_HEADERS
 	install -m 644 $(addprefix $(SUBDIR),$(BUILT_HEADERS)) "$(INCINSTDIR)"
 endif
 	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))