highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use $(RM) to delete files

Browse Source 
Originally committed as revision 22234 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2010-03-06 14:25:10 +00:00
parent 84dc2d8afa
commit 50e10cbd7a
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile
View File

@@ -118,29 +118,29 @@ install-man: $(MANPAGES)
uninstall: uninstall-progs uninstall-data uninstall-man uninstall: uninstall-progs uninstall-data uninstall-man
uninstall-progs: uninstall-progs:
rm -f $(addprefix "$(BINDIR)/", $(ALLPROGS)) $(RM) $(addprefix "$(BINDIR)/", $(ALLPROGS))
uninstall-data: uninstall-data:
rm -rf "$(DATADIR)" $(RM) -r "$(DATADIR)"
uninstall-man: uninstall-man:
rm -f $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES)) $(RM) $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
testclean: testclean:
rm -rf tests/vsynth1 tests/vsynth2 tests/data $(RM) -r tests/vsynth1 tests/vsynth2 tests/data
rm -f $(addprefix tests/,$(CLEANSUFFIXES)) $(RM) $(addprefix tests/,$(CLEANSUFFIXES))
rm -f tests/seek_test$(EXESUF) tests/seek_test.o $(RM) tests/seek_test$(EXESUF) tests/seek_test.o
rm -f $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr)) $(RM) $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr))
clean:: testclean clean:: testclean
rm -f $(ALLPROGS) $(ALLPROGS_G) $(RM) $(ALLPROGS) $(ALLPROGS_G)
rm -f $(CLEANSUFFIXES) $(RM) $(CLEANSUFFIXES)
rm -f doc/*.html doc/*.pod doc/*.1 $(RM) doc/*.html doc/*.pod doc/*.1
rm -f $(TOOLS) $(RM) $(TOOLS)
distclean:: distclean::
rm -f $(DISTCLEANSUFFIXES) $(RM) $(DISTCLEANSUFFIXES)
rm -f version.h config.* libavutil/avconfig.h $(RM) version.h config.* libavutil/avconfig.h
config: config:
$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION) $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)

14
subdir.mak
View File

@@ -11,7 +11,7 @@ all: $(SUBDIR)$(LIBNAME)
install-libs: install-lib$(NAME)-static install-libs: install-lib$(NAME)-static
$(SUBDIR)$(LIBNAME): $(OBJS) $(SUBDIR)$(LIBNAME): $(OBJS)
rm -f $@ $(RM) $@
$(AR) rc $@ $^ $(EXTRAOBJS) $(AR) rc $@ $^ $(EXTRAOBJS)
$(RANLIB) $@ $(RANLIB) $@
endif endif
@@ -35,12 +35,12 @@ $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
$(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$< $(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$<
clean:: clean::
rm -f $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
$(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) \ $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) \
$(HOSTOBJS) $(HOSTPROGS) $(HOSTOBJS) $(HOSTPROGS)
distclean:: clean distclean:: clean
rm -f $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \ $(RM) $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
$(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
ifdef CONFIG_SHARED ifdef CONFIG_SHARED
@@ -86,15 +86,15 @@ endif
install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig" install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
uninstall-libs:: uninstall-libs::
-rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \ -$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
"$(SHLIBDIR)/$(SLIBNAME)" \ "$(SHLIBDIR)/$(SLIBNAME)" \
"$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-$(SLIB_UNINSTALL_EXTRA_CMD) -$(SLIB_UNINSTALL_EXTRA_CMD)
-rm -f "$(LIBDIR)/$(LIBNAME)" -$(RM) "$(LIBDIR)/$(LIBNAME)"
uninstall-headers:: uninstall-headers::
rm -f $(addprefix "$(INCINSTDIR)/",$(HEADERS)) $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS))
rm -f "$(LIBDIR)/pkgconfig/lib$(NAME).pc" $(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
-rmdir "$(INCDIR)" -rmdir "$(INCDIR)"
endef endef