| -rw-r--r-- | scripts/kconfig/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index ed57c6f..b60db9f 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -1,22 +1,22 @@ VERSION=1.2 CC=gcc CXX=g++ CFLAGS=-O2 -Wall -g -fPIC -CXXFLAGS=$(CFLAGS) -I$(QTDIR)/include +CXXFLAGS=$(CFLAGS) -I$(HOSTQTDIR)/include LDFLAGS= -LXXFLAGS=$(LDFLAGS) -L$(QTDIR)/lib -Wl,-rpath,$(QTDIR)/lib +LXXFLAGS=$(LDFLAGS) -L$(HOSTQTDIR)/lib -Wl,-rpath,$(HOSTQTDIR)/lib LEX=flex YACC=bison YFLAGS=-d -t -v -ifndef QTDIR -QTDIR=/usr/share/qt +ifndef HOSTQTDIR +HOSTQTDIR=/usr/share/qt endif -MOC=$(wildcard $(QTDIR)/bin/moc) +MOC=$(wildcard $(HOSTQTDIR)/bin/moc) parse_SRC=zconf.y conf_SRC=conf.c $(parse_SRC) mconf_SRC=mconf.c $(parse_SRC) qconf_SRC=qconf.cc lkcc_SRC=cml1.y cml1.l help.l cml1.h expr1.c HDR=expr.h lkc.h lkc_proto.h qconf.h OTHER=README lkc_spec lkc_overview Makefile.kernel convert-all prepare-all.diff fixup-all.diff \ @@ -101,17 +101,17 @@ mconf: $(mconf_OBJ) $(CC) $(LDFLAGS) $^ -o $@ conf: $(conf_OBJ) $(CC) $(LDFLAGS) $^ -o $@ ifeq ($(MOC),) qconf: @echo Unable to find the QT installation. Please make sure that the - @echo QT development package is correctly installed and the QTDIR + @echo QT development package is correctly installed and the HOSTQTDIR @echo environment variable is set to the correct location. @false else qconf: $(qconf_OBJ) $(CXX) $(LXXFLAGS) $^ -lqt -o $@ endif lkcc: $(lkcc_OBJ) @@ -135,17 +135,17 @@ tgz: %.tab.c %.tab.h: %.y $(YACC) $(YFLAGS) -b $* -p $* $< lex.%.c: %.l $(LEX) $(LFLAGS) -P$* $< %.moc: %.h - $(QTDIR)/bin/moc -i $< -o $@ + $(HOSTQTDIR)/bin/moc -i $< -o $@ %.o: %.c $(CC) $(CFLAGS) -c $< -o $@ %.o: %.cc $(CXX) $(CXXFLAGS) -c $< -o $@ ifdef KERNELSRC |