summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--scripts/kconfig/Makefile4
-rw-r--r--scripts/lxdialog/Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 6006a80..492eb0a 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -1,27 +1,27 @@
1VERSION=1.4 1VERSION=1.4
2CC=gcc 2CC=$(CCACHE) gcc
3CXX=g++ 3CXX=$(CCACHE) g++
4CFLAGS=-O0 -Wall -g -fPIC 4CFLAGS=-O0 -Wall -g -fPIC
5CXXFLAGS=$(CFLAGS) -I$(QTDIR)/include 5CXXFLAGS=$(CFLAGS) -I$(QTDIR)/include
6LDFLAGS= 6LDFLAGS=
7LXXFLAGS=$(LDFLAGS) -L$(QTDIR)/lib -Wl,-rpath,$(QTDIR)/lib 7LXXFLAGS=$(LDFLAGS) -L$(QTDIR)/lib -Wl,-rpath,$(QTDIR)/lib
8LEX=flex 8LEX=flex
9LFLAGS=-L 9LFLAGS=-L
10YACC=bison 10YACC=bison
11YFLAGS=-l 11YFLAGS=-l
12#YFLAGS=-t -v -l 12#YFLAGS=-t -v -l
13ifndef QTDIR 13ifndef QTDIR
14QTDIR=/usr/share/qt3 14QTDIR=/usr/share/qt3
15endif 15endif
16MOC=$(wildcard $(QTDIR)/bin/moc) 16MOC=$(wildcard $(QTDIR)/bin/moc)
17GTKCFLAGS=`pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --cflags` 17GTKCFLAGS=`pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --cflags`
18GTKLDFLAGS=`pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs` 18GTKLDFLAGS=`pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs`
19 19
20parse_SRC=zconf.y 20parse_SRC=zconf.y
21conf_SRC=conf.c $(parse_SRC) 21conf_SRC=conf.c $(parse_SRC)
22mconf_SRC=mconf.c $(parse_SRC) 22mconf_SRC=mconf.c $(parse_SRC)
23qconf_SRC=qconf.cc 23qconf_SRC=qconf.cc
24gconf_SRC=gconf.c kconfig_load.c 24gconf_SRC=gconf.c kconfig_load.c
25HDR=expr.h lkc.h lkc_proto.h qconf.h 25HDR=expr.h lkc.h lkc_proto.h qconf.h
26OTHER=README lkc-language.txt Makefile.kernel \ 26OTHER=README lkc-language.txt Makefile.kernel \
27 kconfig.i extconf.rb example 27 kconfig.i extconf.rb example
diff --git a/scripts/lxdialog/Makefile b/scripts/lxdialog/Makefile
index 6d05cfd..e606d4b 100644
--- a/scripts/lxdialog/Makefile
+++ b/scripts/lxdialog/Makefile
@@ -1,27 +1,27 @@
1HOST_EXTRACFLAGS := -DLOCALE 1HOST_EXTRACFLAGS := -DLOCALE
2HOST_LOADLIBES := -lncurses 2HOST_LOADLIBES := -lncurses
3HOSTCC = gcc 3HOSTCC = $(CCACHE) gcc
4 4
5ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h)) 5ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
6HOST_EXTRACFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" 6HOST_EXTRACFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
7else 7else
8ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h)) 8ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h))
9HOST_EXTRACFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>" 9HOST_EXTRACFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
10else 10else
11ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h)) 11ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h))
12HOST_EXTRACFLAGS += -DCURSES_LOC="<ncurses.h>" 12HOST_EXTRACFLAGS += -DCURSES_LOC="<ncurses.h>"
13else 13else
14HOST_EXTRACFLAGS += -DCURSES_LOC="<curses.h>" 14HOST_EXTRACFLAGS += -DCURSES_LOC="<curses.h>"
15endif 15endif
16endif 16endif
17endif 17endif
18 18
19ifeq ($(filter clean mrproper distclean,$(MAKECMDGOALS)),) 19ifeq ($(filter clean mrproper distclean,$(MAKECMDGOALS)),)
20ifeq ($(filter -DCURSES_LOC%,$(HOST_EXTRACFLAGS)),) 20ifeq ($(filter -DCURSES_LOC%,$(HOST_EXTRACFLAGS)),)
21$(error Unable to locate ncurses.h or curses.h) 21$(error Unable to locate ncurses.h or curses.h)
22endif 22endif
23endif 23endif
24 24
25 host-progs:= lxdialog 25 host-progs:= lxdialog
26 always := $(host-progs) 26 always := $(host-progs)
27 27