diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-09 14:58:29 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-09 14:58:29 +0000 |
| commit | 0c8cc2c4d86faea15e5225870b787f8f42ff52bb (patch) | |
| tree | 2b20555ccaab10820d09350d8323cc5930f5e250 /subdir.mak | |
| parent | d8e117ddfe5a27b6588c5f04b52f8d48eff66b3f (diff) | |
| download | ffmpeg-0c8cc2c4d86faea15e5225870b787f8f42ff52bb.tar.gz | |
Reorder some make rules
I like it better this way.
Originally committed as revision 22397 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'subdir.mak')
| -rw-r--r-- | subdir.mak | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/subdir.mak b/subdir.mak index aba2fe0c2f..406a1fc466 100644 --- a/subdir.mak +++ b/subdir.mak @@ -36,15 +36,6 @@ define RULES $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o $$(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) $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) @@ -57,6 +48,15 @@ ifdef SUBDIR $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS) 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) $(Q)mkdir -p "$(SHLIBDIR)" $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" |