From 2ecb1e6f8d02679735fb0c326ddfe62748c70a41 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Mon, 28 Feb 2011 11:00:58 +0100 Subject: [PATCH 1/1] Use curses_cppflags only for building gui.o. It's only required there, and having the -I options for the curses headers everywhere could be problematic for building other objects. --- Makefile.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 8a769607..ff5150b6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -54,7 +54,6 @@ CPPFLAGS += -Wbad-function-cast CPPFLAGS += -fno-strict-aliasing CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F) CPPFLAGS += @SSL_CPPFLAGS@ -CPPFLAGS += @curses_cppflags@ CPPFLAGS += @arch_cppflags@ CPPFLAGS += -I/usr/local/include CPPFLAGS += -I$(cmdline_dir) @@ -194,6 +193,10 @@ $(object_dir)/aac_afh.o: aac_afh.c | $(object_dir) @[ -z "$(Q)" ] || echo 'CC $<' $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $< +$(object_dir)/gui%.o: gui%.c | $(object_dir) + @[ -z "$(Q)" ] || echo 'CC $<' + $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @curses_cppflags@ $< + $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir) @[ -z "$(Q)" ] || echo 'CC $<' $(Q) $(CC) -c $(CPPFLAGS) -Wno-unused-function -o $@ $< @@ -210,6 +213,7 @@ $(object_dir)/%.d: %.c | $(object_dir) @[ -z "$(Q)" ] || echo 'DEP $<' $(Q) ./depend.sh $(object_dir) $(cmdline_dir) $(CPPFLAGS) $< > $@ + recv_objs := $(addprefix $(object_dir)/, @recv_objs@) filter_objs := $(addprefix $(object_dir)/, @filter_objs@) client_objs := $(addprefix $(object_dir)/, @client_objs@) -- 2.39.2