aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-06-24 09:02:57 +0200
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-06-24 09:09:55 +0200
commit2ec899222b3c90b3496a502175baac74cac1f564 (patch)
treed23dee920a0c6766a7f94815079a9830596a87ee /Makefile
parent686959e87e377c0494da636640e36779dd985c30 (diff)
downloadffmpeg-2ec899222b3c90b3496a502175baac74cac1f564.tar.gz
Revert "build: move basic rules and variables to main Makefile"
This reverts commit bb5249244ddb22df1cfb8dee1c369e6cd653d00d. This is necessary to allow running "make" in subdirs again. Conflicts: Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile35
1 files changed, 0 insertions, 35 deletions
diff --git a/Makefile b/Makefile
index 9eff02dbed..d3a56de712 100644
--- a/Makefile
+++ b/Makefile
@@ -7,41 +7,6 @@ vpath %.asm $(SRC_PATH)
vpath %.v $(SRC_PATH)
vpath %.texi $(SRC_PATH)
-ifndef V
-Q = @
-ECHO = printf "$(1)\t%s\n" $(2)
-BRIEF = CC AS YASM AR LD HOSTCC STRIP CP
-SILENT = DEPCC YASMDEP RM RANLIB
-MSG = $@
-M = @$(call ECHO,$(TAG),$@);
-$(foreach VAR,$(BRIEF), \
- $(eval override $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR))))
-$(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR))))
-$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_PATH)/%=%)); $(INSTALL))
-endif
-
-IFLAGS := -I. -I$(SRC_PATH)
-CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
-CFLAGS += $(ECFLAGS)
-YASMFLAGS += $(IFLAGS) -Pconfig.asm
-HOSTCFLAGS += $(IFLAGS)
-
-%.o: %.c
- $(CCDEP)
- $(CC) $(CPPFLAGS) $(CFLAGS) $(CC_DEPFLAGS) -c $(CC_O) $<
-
-%.o: %.S
- $(ASDEP)
- $(AS) $(CPPFLAGS) $(ASFLAGS) $(AS_DEPFLAGS) -c -o $@ $<
-
-%.ho: %.h
- $(CC) $(CPPFLAGS) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
-
-%.ver: %.v
- $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
-
-%.c %.h: TAG = GEN
-
# Do not delete intermediate files from chains of implicit rules
$(OBJS):