time_internal: Do not attempt to override *time_r() macros

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index dc4b0add9f9174847103acb80c1a61ef199646de..e1190377ab636bd0a6a225e82946e36dc75c233d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@ vpath %.texi $(SRC_PATH)
 ifndef V
 Q      = @
 ECHO   = printf "$(1)\t%s\n" $(2)
-BRIEF  = CC HOSTCC HOSTLD AS YASM AR LD
-SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM STRIP
+BRIEF  = CC HOSTCC HOSTLD AS X86ASM AR LD
+SILENT = DEPCC DEPHOSTCC DEPAS DEPX86ASM RANLIB RM STRIP
 MSG    = $@
 M      = @$(call ECHO,$(TAG),$@);
 $(foreach VAR,$(BRIEF), \
@@ -30,7 +30,7 @@ CCFLAGS     = $(CPPFLAGS) $(CFLAGS)
 OBJCFLAGS  += $(EOBJCFLAGS)
 OBJCCFLAGS  = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS)
 ASFLAGS    := $(CPPFLAGS) $(ASFLAGS)
-YASMFLAGS  += $(IFLAGS:%=%/) -Pconfig.asm
+X86ASMFLAGS += $(IFLAGS:%=%/) -I$(<D)/ -Pconfig.asm
 HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)
 LDFLAGS    := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)
 
@@ -42,6 +42,7 @@ endef
 COMPILE_C = $(call COMPILE,CC)
 COMPILE_S = $(call COMPILE,AS)
 COMPILE_M = $(call COMPILE,OBJCC)
+COMPILE_X86ASM = $(call COMPILE,X86ASM)
 COMPILE_HOSTC = $(call COMPILE,HOSTCC)
 
 %.o: %.c
@@ -57,8 +58,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
        $(COMPILE_HOSTC)
 
 %.o: %.asm
-       $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
-       $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
+       $(COMPILE_X86ASM)
        -$(STRIP) $(STRIPFLAGS) $@
 
 %.i: %.c
@@ -113,7 +113,7 @@ avbuild/.config: $(CONFIGURABLE_COMPONENTS)
 SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS               \
                HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS            \
                ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS     \
-               ALTIVEC-OBJS VSX-OBJS MMX-OBJS YASM-OBJS                  \
+               ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS                \
                OBJS HOSTOBJS TESTOBJS
 
 define RESET
@@ -161,17 +161,17 @@ install-data: $(DATA_FILES)
        $(Q)mkdir -p "$(DATADIR)"
        $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
 
-uninstall: uninstall-libs uninstall-headers uninstall-data
+uninstall: uninstall-data uninstall-headers uninstall-libs uninstall-pkgconfig
 
 uninstall-data:
        $(RM) -r "$(DATADIR)"
 
 clean::
        $(RM) $(CLEANSUFFIXES)
+       $(RM) $(addprefix compat/,$(CLEANSUFFIXES)) $(addprefix compat/*/,$(CLEANSUFFIXES))
        $(RM) -rf coverage.info lcov
 
-distclean::
-       $(RM) $(DISTCLEANSUFFIXES)
+distclean: clean
        $(RM) .version avversion.h config.asm config.h mapfile \
             avbuild/.config avbuild/config.* libavutil/avconfig.h \
             libavcodec/bsf_list.c libavformat/protocol_list.c
@@ -184,7 +184,7 @@ check: all alltools checkheaders examples testprogs fate
 
 include $(SRC_PATH)/tests/Makefile
 
-$(sort $(OBJDIRS)):
+$(sort $(OUTDIRS)):
        $(Q)mkdir -p $@
 
 # Dummy rule to stop make trying to rebuild removed or renamed headers