From 14ca5388a4a1594e69069fb06d7e68efeb026c95 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sat, 19 Apr 2014 23:22:18 +0000 Subject: [PATCH] build: Only compile with osl_cppflags where necessary. Currently we include $(osl_cppflags) in the CC command used to compile all objects, regardless of whether the command needs these flags. This commit changes Makefile.real to add the flags only for those objects which actually include osl.h. --- Makefile.real | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Makefile.real b/Makefile.real index fdae39a8..19e229dd 100644 --- a/Makefile.real +++ b/Makefile.real @@ -110,7 +110,6 @@ CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F) CPPFLAGS += $(arch_cppflags) CPPFLAGS += -I/usr/local/include CPPFLAGS += -I$(cmdline_dir) -CPPFLAGS += $(osl_cppflags) LDFLAGS += $(clock_gettime_ldflags) @@ -204,6 +203,23 @@ $(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)/afs.o $(dep_dir)/afs.d \ +$(object_dir)/aft.o $(dep_dir)/aft.d \ +$(object_dir)/attribute.o $(dep_dir)/attribute.d \ +$(object_dir)/blob.o $(dep_dir)/blob.d \ +$(object_dir)/mood.o $(dep_dir)/mood.d \ +$(object_dir)/playlist.o $(dep_dir)/playlist.d \ +$(object_dir)/score.o $(dep_dir)/score.d \ +$(object_dir)/server.o $(dep_dir)/server.d \ +$(object_dir)/vss.o $(dep_dir)/vss.d \ +$(object_dir)/command.o $(dep_dir)/command.d \ +$(object_dir)/http_send.o $(dep_dir)/http_send.d \ +$(object_dir)/dccp_send.o $(dep_dir)/dccp_send.d \ +$(object_dir)/udp_send.o $(dep_dir)/udp_send.d \ +$(object_dir)/send_common.o $(dep_dir)/send_common.d \ +$(object_dir)/mm.o $(dep_dir)/mm.d \ +: CPPFLAGS += $(osl_cppflags) + $(object_dir)/%.o: %.c | $(object_dir) @[ -z "$(Q)" ] || echo 'CC $<' $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $< -- 2.39.2