From: Andre Noll <maan@systemlinux.org>
Date: Mon, 28 Feb 2011 10:00:58 +0000 (+0100)
Subject: Use curses_cppflags only for building gui.o.
X-Git-Tag: v0.4.7~22^2
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=2ecb1e6f8d02679735fb0c326ddfe62748c70a41;p=paraslash.git

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

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@)