[FFmpeg-cvslog] r24046 - trunk/libavcodec/Makefile

mru subversion
Sun Jul 4 21:03:05 CEST 2010


Author: mru
Date: Sun Jul  4 21:03:04 2010
New Revision: 24046

Log:
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.

Modified:
   trunk/libavcodec/Makefile

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Sun Jul  4 21:02:38 2010	(r24045)
+++ trunk/libavcodec/Makefile	Sun Jul  4 21:03:04 2010	(r24046)
@@ -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



More information about the ffmpeg-cvslog mailing list