aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamiro Polla2010-01-15 19:16:28 +0000
committerRamiro Polla2010-01-15 19:16:28 +0000
commit93fe7eb68d6ec19312dd35bf8506184481d89407 (patch)
tree1e52e477e80f170df0af927f47e058278b87b624
parent598ef02b158d6d935450f07d3e9675e546912f9e (diff)
Get one step closer to world domination.
Remove "make uninstall". Originally committed as revision 21226 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile12
-rw-r--r--common.mak4
-rw-r--r--subdir.mak12
3 files changed, 3 insertions, 25 deletions
diff --git a/Makefile b/Makefile
index 5fd4094710..4393a22a71 100644
--- 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 b629cb43c7..8ce464827c 100644
--- 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 1a5158ac69..6948211924 100644
--- 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))