[Ffmpeg-cvslog] CVS: ffmpeg Makefile, 1.103, 1.104 common.mak, 1.5, 1.6

Diego Biurrun CVS diego
Thu May 18 14:14:05 CEST 2006


Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv247

Modified Files:
	Makefile common.mak 
Log Message:
uninstallation support
inspired by a patch from Richard, richiek.,@,.optushome.,.,.com.,.,.au


Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/Makefile,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- Makefile	18 May 2006 08:40:15 -0000	1.103
+++ Makefile	18 May 2006 12:14:02 -0000	1.104
@@ -156,6 +156,35 @@
 	$(MAKE) -C libavcodec/libpostproc install-headers
 endif
 
+uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
+
+ALLPROGS=ffmpeg ffplay ffserver
+uninstall-progs:
+	rm -f $(addprefix $(bindir)/, $(ALLPROGS))
+
+ALLMANPAGES=$(addsuffix .1, $(ALLPROGS))
+uninstall-man:
+ifneq ($(CONFIG_WIN32),yes)
+	rm -f $(addprefix $(mandir)/man1/,$(ALLMANPAGES))
+endif
+
+uninstall-vhook:
+	$(MAKE) -C vhook uninstall
+
+uninstall-libs:
+	$(MAKE) -C libavutil   uninstall-libs
+	$(MAKE) -C libavcodec  uninstall-libs
+	$(MAKE) -C libavformat uninstall-libs
+	$(MAKE) -C libavcodec/libpostproc uninstall-libs
+
+uninstall-headers:
+	$(MAKE) -C libavutil   uninstall-headers
+	$(MAKE) -C libavcodec  uninstall-headers
+	$(MAKE) -C libavformat uninstall-headers
+	$(MAKE) -C libavcodec/libpostproc uninstall-headers
+	-rmdir "$(incdir)"
+	-rmdir "$(prefix)/include/postproc"
+
 dep:	depend
 
 depend: .depend

Index: common.mak
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/common.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- common.mak	11 May 2006 20:36:00 -0000	1.5
+++ common.mak	18 May 2006 12:14:02 -0000	1.6
@@ -96,6 +96,22 @@
 	install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)"
 	install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"
 
+uninstall: uninstall-libs uninstall-headers
+
+uninstall-libs:
+ifeq ($(CONFIG_WIN32),yes)
+	-rm -f $(prefix)/$(SLIBNAME)
+else
+	-rm -f $(libdir)/$(SLIBNAME_WITH_MAJOR) \
+	      $(libdir)/$(SLIBNAME)            \
+	      $(libdir)/$(SLIBNAME_WITH_VERSION)
+endif
+	-rm -f $(libdir)/$(LIB)
+
+uninstall-headers:
+	rm -f $(addprefix $(incdir)/,$(HEADERS))
+	rm -f $(libdir)/pkgconfig/lib$(NAME).pc
+
 #
 # include dependency files if they exist
 #





More information about the ffmpeg-cvslog mailing list