Mercurial > libavcodec.hg
comparison Makefile @ 12090:82d32c82289d libavcodec
Fix build with hardcoded tables
The recently added dummy rule for missing headers took precedence
over the tablegen rules. Listing the generated headers explicitly
overrides this. A cleaner solution would be preferable.
author | mru |
---|---|
date | Sun, 04 Jul 2010 19:03:04 +0000 |
parents | aa0b01031adf |
children | 14f1cfd2f1f2 |
comparison
equal
deleted
inserted
replaced
12089:5638941ec8ef | 12090:82d32c82289d |
---|---|
653 endif | 653 endif |
654 | 654 |
655 $(SUBDIR)%_tablegen$(HOSTEXESUF): $(SUBDIR)%_tablegen.c $(SUBDIR)%_tablegen.h $(SUBDIR)tableprint.c | 655 $(SUBDIR)%_tablegen$(HOSTEXESUF): $(SUBDIR)%_tablegen.c $(SUBDIR)%_tablegen.h $(SUBDIR)tableprint.c |
656 $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $(filter %.c,$^) $(HOSTLIBS) | 656 $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $(filter %.c,$^) $(HOSTLIBS) |
657 | 657 |
658 $(SUBDIR)%_tables.h: $(SUBDIR)%_tablegen$(HOSTEXESUF) | 658 GEN_HEADERS = cbrt_tables.h aacps_tables.h aac_tables.h dv_tables.h \ |
659 mdct_tables.h mpegaudio_tables.h motionpixels_tables.h \ | |
660 pcm_tables.h qdm2_tables.h | |
661 GEN_HEADERS := $(addprefix $(SUBDIR), $(GEN_HEADERS)) | |
662 | |
663 $(GEN_HEADERS): $(SUBDIR)%_tables.h: $(SUBDIR)%_tablegen$(HOSTEXESUF) | |
659 $(M)./$< > $@ | 664 $(M)./$< > $@ |
660 | 665 |
661 ifdef CONFIG_HARDCODED_TABLES | 666 ifdef CONFIG_HARDCODED_TABLES |
662 $(SUBDIR)aacdec.o: $(SUBDIR)cbrt_tables.h | 667 $(SUBDIR)aacdec.o: $(SUBDIR)cbrt_tables.h |
663 $(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h | 668 $(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h |