mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-30 16:42:13 +02:00
Reorder some make rules
I like it better this way. Originally committed as revision 22397 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
d8e117ddfe
commit
0c8cc2c4d8
18
subdir.mak
18
subdir.mak
@ -36,15 +36,6 @@ define RULES
|
|||||||
$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
|
$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
|
||||||
$$(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
|
$$(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
|
||||||
|
|
||||||
clean::
|
|
||||||
$(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
|
|
||||||
$(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) \
|
|
||||||
$(HOSTOBJS) $(HOSTPROGS)
|
|
||||||
|
|
||||||
distclean:: clean
|
|
||||||
$(RM) $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
|
|
||||||
$(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
|
|
||||||
|
|
||||||
$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
|
$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
|
||||||
$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
|
$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
|
||||||
|
|
||||||
@ -57,6 +48,15 @@ ifdef SUBDIR
|
|||||||
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
|
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
clean::
|
||||||
|
$(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
|
||||||
|
$(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) \
|
||||||
|
$(HOSTOBJS) $(HOSTPROGS)
|
||||||
|
|
||||||
|
distclean:: clean
|
||||||
|
$(RM) $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
|
||||||
|
$(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
|
||||||
|
|
||||||
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
|
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
|
||||||
$(Q)mkdir -p "$(SHLIBDIR)"
|
$(Q)mkdir -p "$(SHLIBDIR)"
|
||||||
$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
|
$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
|
||||||
|
Loading…
Reference in New Issue
Block a user