You've already forked FFmpeg
							
							
				mirror of
				https://github.com/FFmpeg/FFmpeg.git
				synced 2025-10-30 23:18:11 +02:00 
			
		
		
		
	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>
This commit is contained in:
		
							
								
								
									
										1
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								Makefile
									
									
									
									
									
								
							| @@ -187,7 +187,6 @@ uninstall-data: | ||||
| clean:: | ||||
| 	$(RM) $(ALLPROGS) | ||||
| 	$(RM) $(CLEANSUFFIXES) | ||||
| 	$(RM) $(TOOLS) | ||||
| 	$(RM) $(CLEANSUFFIXES:%=tools/%) | ||||
|  | ||||
| distclean:: | ||||
|   | ||||
| @@ -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)) | ||||
|   | ||||
| @@ -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)/%) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user