On Mon, May 21, 2012 at 04:38:23PM +0200, Nikola Pajkovsky wrote:
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
Acked-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
Makefile | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 1429aca..dd5aed2 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@ all::
#
# Define NO_NCURSES if not linking with ncurses.
-
VERSION-FILE: FORCE
@$(SHELL_PATH) ./GEN-VERSION-FILE
-include VERSION-FILE
@@ -208,13 +207,12 @@ NCURSES_LDFLAGS += $(NCURSES6_LDFLAGS)
endif
NCURSES5_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null)
-ifneq ($(NCURSES5_LDFLAGS),)
-NCURSES_LDFLAGS += $(NCURSES5_CFLAGS)
+ifneq ($(NCURSES5_CFLAGS),)
+NCURSES_CFLAGS += $(NCURSES5_CFLAGS)
endif
-
-NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null)
-ifneq ($(NCURSES_LDFLAGS),)
-NCURSES_LDFLAGS += $(NCURSES_LDFLAGS)
+NCURSES5_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null)
+ifneq ($(NCURSES5_LDFLAGS),)
+NCURSES_LDFLAGS += $(NCURSES5_LDFLAGS)
endif
NCURSES_LDFLAGS += -lpanel
@@ -329,7 +327,7 @@ endif
ifndef CHECK_HEADER_DEPENDENCIES
$(OBJECTS): %.o: %.c $(missing_dep_dirs)
- $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
+ $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(NCURSES_CFLAGS) $(ALL_CFLAGS)
$(EXTRA_CPPFLAGS) $<
endif
ifdef USE_COMPUTED_HEADER_DEPENDENCIES
--
1.7.10