summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-06-10 21:29:56 +0000
committerDiego Biurrun <diego@biurrun.de>2007-06-10 21:29:56 +0000
commitfa62bdb8684ed7cfc77207004d79d2119dbc2723 (patch)
tree406a174a1705cb2f09e01fe5d76d6518f44ca964
parent06694949b4d3c6c0b50c02c2a5c9449ef7c61652 (diff)
Move libpostproc-specific uninstallation command to the libpostproc Makefile.
Originally committed as revision 9277 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile1
-rw-r--r--common.mak2
-rw-r--r--libpostproc/Makefile2
3 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7cd5a05192..0ce1e50e99 100644
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,6 @@ uninstall-headers:
$(MAKE) -C libavformat uninstall-headers
$(MAKE) -C libpostproc uninstall-headers
-rmdir "$(incdir)"
- -rmdir "$(prefix)/include/postproc"
depend dep: .depend
$(MAKE) -C libavutil depend
diff --git a/common.mak b/common.mak
index 43bcc57355..191598aca1 100644
--- a/common.mak
+++ b/common.mak
@@ -92,7 +92,7 @@ uninstall-libs:
"$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
-rm -f "$(libdir)/$(LIB)"
-uninstall-headers:
+uninstall-headers::
rm -f $(addprefix "$(incdir)/",$(HEADERS))
rm -f "$(libdir)/pkgconfig/lib$(NAME).pc"
diff --git a/libpostproc/Makefile b/libpostproc/Makefile
index d30b4a18de..356ce2fcc4 100644
--- a/libpostproc/Makefile
+++ b/libpostproc/Makefile
@@ -22,3 +22,5 @@ depend dep: postprocess.c
postprocess_pic.o: postprocess.c
$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -o $@ $<
+uninstall-headers::
+ -rmdir "$(prefix)/include/postproc"