diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-07-04 19:03:04 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-07-04 19:03:04 +0000 |
| commit | aad9f50751b86ddd7ae03c641c2673ba77dafd29 (patch) | |
| tree | f53d68741137dc33c0cc5e2523bcb9d3b3806c1c /libavcodec | |
| parent | b9796cc7c7f5f2cdbcc2bcc6eb9d8461c0fb4cab (diff) | |
| download | ffmpeg-aad9f50751b86ddd7ae03c641c2673ba77dafd29.tar.gz | |
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.
Originally committed as revision 24046 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1fa4254058..f57532caa2 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -655,7 +655,12 @@ endif $(SUBDIR)%_tablegen$(HOSTEXESUF): $(SUBDIR)%_tablegen.c $(SUBDIR)%_tablegen.h $(SUBDIR)tableprint.c $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $(filter %.c,$^) $(HOSTLIBS) -$(SUBDIR)%_tables.h: $(SUBDIR)%_tablegen$(HOSTEXESUF) +GEN_HEADERS = cbrt_tables.h aacps_tables.h aac_tables.h dv_tables.h \ + mdct_tables.h mpegaudio_tables.h motionpixels_tables.h \ + pcm_tables.h qdm2_tables.h +GEN_HEADERS := $(addprefix $(SUBDIR), $(GEN_HEADERS)) + +$(GEN_HEADERS): $(SUBDIR)%_tables.h: $(SUBDIR)%_tablegen$(HOSTEXESUF) $(M)./$< > $@ ifdef CONFIG_HARDCODED_TABLES |