diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-09 14:58:15 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-09 14:58:15 +0000 |
| commit | 8c5239b382519a12a74019849cf9d855a9afa2eb (patch) | |
| tree | 32085d7523edba0dffe90c91f29cb931cf04257b | |
| parent | 477b338266de65a91b8d18dbdbc72ed104de6db9 (diff) | |
| download | ffmpeg-8c5239b382519a12a74019849cf9d855a9afa2eb.tar.gz | |
Move some make rules outside of eval'd block
These rules use only global variables and thus do not need to be expanded.
Originally committed as revision 22393 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | subdir.mak | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/subdir.mak b/subdir.mak index 44e1505a47..e55189b298 100644 --- a/subdir.mak +++ b/subdir.mak @@ -7,6 +7,16 @@ LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR) INCINSTDIR := $(INCDIR)/lib$(NAME) THIS_LIB := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME) +$(SUBDIR)%-test.o: $(SUBDIR)%.c + $(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $(CC_O) $^ + +$(SUBDIR)%-test.o: $(SUBDIR)%-test.c + $(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $(CC_O) $^ + +$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm + $(YASMDEP) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d) + $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $< + $(OBJS) $(SUBDIR)%.ho $(SUBDIR)%-test.o $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H ifdef CONFIG_STATIC @@ -26,16 +36,6 @@ define RULES $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o $$(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS) -$(SUBDIR)%-test.o: $(SUBDIR)%.c - $$(CC) $$(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^ - -$(SUBDIR)%-test.o: $(SUBDIR)%-test.c - $$(CC) $$(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^ - -$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm - $$(YASMDEP) $(YASMFLAGS) -I $$(<D)/ -M -o $$@ $$< > $$(@:.o=.d) - $$(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$< - clean:: $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) \ |