Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Reorder some make rules

I like it better this way.

Originally committed as revision 22397 to svn://svn.ffmpeg.org/ffmpeg/trunk
  • Loading branch information...
commit 0c8cc2c4d86faea15e5225870b787f8f42ff52bb 1 parent d8e117d
Mans Rullgard mansr authored

Showing 1 changed file with 9 additions and 9 deletions. Show diff stats Hide diff stats

  1. +9 9 subdir.mak
18 subdir.mak
@@ -36,15 +36,6 @@ define RULES
36 36 $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
37 37 $$(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
38 38
39   -clean::
40   - $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
41   - $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) \
42   - $(HOSTOBJS) $(HOSTPROGS)
43   -
44   -distclean:: clean
45   - $(RM) $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
46   - $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
47   -
48 39 $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
49 40 $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
50 41
@@ -57,6 +48,15 @@ ifdef SUBDIR
57 48 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
58 49 endif
59 50
  51 +clean::
  52 + $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
  53 + $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) \
  54 + $(HOSTOBJS) $(HOSTPROGS)
  55 +
  56 +distclean:: clean
  57 + $(RM) $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
  58 + $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
  59 +
60 60 install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
61 61 $(Q)mkdir -p "$(SHLIBDIR)"
62 62 $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"

0 comments on commit 0c8cc2c

Please sign in to comment.
Something went wrong with that request. Please try again.