diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-12-10 14:55:28 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-12-10 17:23:53 +0000 |
| commit | 395c3feb3bb165af5760d287a9a64344b6269fe2 (patch) | |
| tree | dd0be0639bb67a62554b95f47e8bad6422a4844c | |
| parent | 2ddf7c88d162473e84417e94e1fb7e4375ecfdae (diff) | |
| download | ffmpeg-395c3feb3bb165af5760d287a9a64344b6269fe2.tar.gz | |
build: fix 'clean' target
This fixes removal of TOOLS as well as HOSTPROGS declared in the
top-level Makefile. The clean target in common.mak needs to be
eval'd since the variables used within are reset for each library.
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | common.mak | 6 | ||||
| -rw-r--r-- | library.mak | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -187,7 +187,6 @@ uninstall-data: clean:: $(RM) $(ALLPROGS) $(RM) $(CLEANSUFFIXES) - $(RM) $(TOOLS) $(RM) $(CLEANSUFFIXES:%=tools/%) distclean:: diff --git a/common.mak b/common.mak index c4d299960e..5d80986aab 100644 --- a/common.mak +++ b/common.mak @@ -53,7 +53,13 @@ CLEANSUFFIXES = *.d *.o *~ *.h.c *.map *.ver DISTCLEANSUFFIXES = *.pc LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a +define RULES clean:: $(RM) $(OBJS) $(OBJS:.o=.d) + $(RM) $(HOSTPROGS) + $(RM) $(TOOLS) +endef + +$(eval $(RULES)) -include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d)) diff --git a/library.mak b/library.mak index 9309c42e5d..3b4bd2d161 100644 --- a/library.mak +++ b/library.mak @@ -58,7 +58,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(DEP_LIBS) clean:: $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ - $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(HOSTOBJS) $(HOSTPROGS) + $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) distclean:: clean $(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) |