From d67061d23fa2757b7d06328bfc9f4e5c3c733f40 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Thu, 24 Jul 2014 22:47:23 +0200 Subject: [PATCH] build: Honor --with-xxx-headers also for dependencies. This is necessary for depend.sh to do the right thing. Without it the generated dependency files may contain a reference to a system header. --- Makefile.real | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/Makefile.real b/Makefile.real index ab238953..506c588d 100644 --- a/Makefile.real +++ b/Makefile.real @@ -171,34 +171,37 @@ error2.h: $(hostbin_dir)/error2 Makefile @echo "$(object_executable_matrix)" | $< > $@ $(object_dir)/%.o: %.c | $(object_dir) -$(object_dir)/opus%.o: CPPFLAGS += $(opus_cppflags) -$(object_dir)/gui%.o: CPPFLAGS += $(curses_cppflags) -$(object_dir)/spx%.o: CPPFLAGS += $(speex_cppflags) +$(object_dir)/opus%.o $(dep_dir)/opus%.d: CPPFLAGS += $(opus_cppflags) +$(object_dir)/gui%.o $(dep_dir)/gui%.d: CPPFLAGS += $(curses_cppflags) +$(object_dir)/spx%.o $(dep_dir)/spx%.d: CPPFLAGS += $(speex_cppflags) $(object_dir)/%.cmdline.o: CPPFLAGS += -Wno-unused-function -$(object_dir)/mp3_afh.o: CPPFLAGS += $(id3tag_cppflags) -$(object_dir)/crypt.o: CPPFLAGS += $(openssl_cppflags) -$(object_dir)/gcrypt.o: CPPFLAGS += $(gcrypt_cppflags) -$(object_dir)/mp3dec_filter.o: CPPFLAGS += $(mad_cppflags) +$(object_dir)/mp3_afh.o $(dep_dir)/mp3_afh.d: CPPFLAGS += $(id3tag_cppflags) +$(object_dir)/crypt.o $(dep_dir)/crypt.d: CPPFLAGS += $(openssl_cppflags) +$(object_dir)/gcrypt.o $(dep_dir)/gcrypt.d: CPPFLAGS += $(gcrypt_cppflags) + +$(object_dir)/mp3dec_filter.o $(dep_dir)/mp3dec_filter.d \ +: CPPFLAGS += $(mad_cppflags) + $(object_dir)/compress_filter.o: CPPFLAGS += -O3 -$(object_dir)/ao_write.o: CPPFLAGS += $(ao_cppflags) +$(object_dir)/ao_write.o $(dep_dir)/ao_write.d: CPPFLAGS += $(ao_cppflags) -$(object_dir)/aacdec_filter.o \ -$(object_dir)/aac_common.o \ -$(object_dir)/aac_afh.o \ +$(object_dir)/aacdec_filter.o $(dep_dir)/aacdec_filter.d \ +$(object_dir)/aac_common.o $(dep_dir)/aac_common.d \ +$(object_dir)/aac_afh.o $(dep_dir)/aac_afh.d \ : CPPFLAGS += $(faad_cppflags) -$(object_dir)/ogg_afh.o \ -$(object_dir)/oggdec_filter.o \ +$(object_dir)/ogg_afh.o $(dep_dir)/ogg_afh.d \ +$(object_dir)/oggdec_filter.o $(dep_dir)/oggdec_filter.d \ : CPPFLAGS += $(vorbis_cppflags) -$(object_dir)/spx_common.o \ -$(object_dir)/spxdec_filter.o \ -$(object_dir)/spx_afh.o \ -$(object_dir)/oggdec_filter.o \ -$(object_dir)/ogg_afh.o \ -$(object_dir)/ogg_afh_common.o \ -$(object_dir)/opus%.o \ +$(object_dir)/spx_common.o $(dep_dir)/spx_common.d \ +$(object_dir)/spxdec_filter.o $(dep_dir)/spxdec_filter.d \ +$(object_dir)/spx_afh.o $(dep_dir)/spx_afh.d \ +$(object_dir)/oggdec_filter.o $(dep_dir)/oggdec_filter.d \ +$(object_dir)/ogg_afh.o $(dep_dir)/ogg_afh.d \ +$(object_dir)/ogg_afh_common.o $(dep_dir)/ogg_afh_common.d \ +$(object_dir)/opus%.o $(dep_dir)/opus%.d \ : CPPFLAGS += $(ogg_cppflags) $(object_dir)/%.o: %.c | $(object_dir) -- 2.39.5