From dfd9159f3db987e9115715cded7a4408179e3ed9 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Tue, 7 Aug 2012 02:11:25 +0100 Subject: build: change checkheaders to use regular build rules Many compilers need special flags to compile *.h files as regular source code, if they will do so at all. Rather than hoping all compilers will have such a flag and adding mappings for it, create wrapper .c files for test building single headers. This allows using the regular rule for compiling C files without the need for special flags, and it also provides proper dependency tracking for these objects. Signed-off-by: Mans Rullgard --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 20e6a3861b..682eda75a4 100644 --- a/Makefile +++ b/Makefile @@ -45,8 +45,8 @@ COMPILE_S = $(call COMPILE,AS) %.o: %.S $(COMPILE_S) -%.ho: %.h - $(CC) $(CCFLAGS) -c $(CC_O) -x c $< +%.h.c: + $(Q)echo '#include "$*.h"' >$@ %.ver: %.v $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@ -- cgit v1.2.3 From f5e668273a0c3ee439b3df41c7555fd3b77f6035 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 1 Aug 2012 18:23:12 +0200 Subject: avconv: split option parsing into a separate file. --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 682eda75a4..6477059c3f 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,7 @@ PROGS-$(CONFIG_AVSERVER) += avserver PROGS := $(PROGS-yes:%=%$(EXESUF)) OBJS = cmdutils.o +OBJS-avconv = avconv_opt.o TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64 HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options TOOLS = qt-faststart trasher -- cgit v1.2.3 From fe2147e93612cdcb4101b3b087f9a9f1835dba11 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 2 Aug 2012 08:24:02 +0200 Subject: avconv: split configuring filter configuration to a separate file. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6477059c3f..1a4858d08d 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ PROGS-$(CONFIG_AVSERVER) += avserver PROGS := $(PROGS-yes:%=%$(EXESUF)) OBJS = cmdutils.o -OBJS-avconv = avconv_opt.o +OBJS-avconv = avconv_opt.o avconv_filter.o TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64 HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options TOOLS = qt-faststart trasher -- cgit v1.2.3 From 5864eb427f2f05342136f3bc9727d826e68d8dbf Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 8 Aug 2012 02:41:57 +0200 Subject: build: cosmetics: Reorder some lists in a more logical fashion --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1a4858d08d..7d4ca8f56c 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ vpath %.texi $(SRC_PATH) ifndef V Q = @ ECHO = printf "$(1)\t%s\n" $(2) -BRIEF = CC AS YASM AR LD HOSTCC -SILENT = DEPCC DEPAS DEPHOSTCC DEPYASM RM RANLIB +BRIEF = CC HOSTCC AS YASM AR LD +SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM MSG = $@ M = @$(call ECHO,$(TAG),$@); $(foreach VAR,$(BRIEF), \ @@ -103,8 +103,9 @@ config.h: .config SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ - ALTIVEC-OBJS ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS MMI-OBJS \ - MMX-OBJS NEON-OBJS VIS-OBJS YASM-OBJS \ + ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS NEON-OBJS \ + MMI-OBJS ALTIVEC-OBJS VIS-OBJS \ + MMX-OBJS YASM-OBJS \ OBJS TESTOBJS define RESET -- cgit v1.2.3