author | kergoth <kergoth> | 2002-11-05 23:26:33 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-05 23:26:33 (UTC) |
commit | 76f38e36b7a875a1763d1e6ce5e00cc8dd736263 (patch) (unidiff) | |
tree | 758e4858912d3ef391200d312a188fc9bffa91d9 | |
parent | b14da9c14c5f1968fb4ba07c3fa0b3888e57ff2f (diff) | |
download | opie-76f38e36b7a875a1763d1e6ce5e00cc8dd736263.zip opie-76f38e36b7a875a1763d1e6ce5e00cc8dd736263.tar.gz opie-76f38e36b7a875a1763d1e6ce5e00cc8dd736263.tar.bz2 |
Adjust makefile to check both /usr/share/qt and /usr/lib/qt for QTDIR, and to check for the existance of qt-mt and qt both
-rw-r--r-- | scripts/kconfig/Makefile | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 7553311..caad231 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
@@ -6,14 +6,34 @@ CXXFLAGS=$(CFLAGS) -I$(HOSTQTDIR)/include | |||
6 | LDFLAGS= | 6 | LDFLAGS= |
7 | LXXFLAGS=$(LDFLAGS) -L$(HOSTQTDIR)/lib -Wl,-rpath,$(HOSTQTDIR)/lib | 7 | LXXFLAGS=$(LDFLAGS) -L$(HOSTQTDIR)/lib -Wl,-rpath,$(HOSTQTDIR)/lib |
8 | LEX=flex | 8 | LEX=flex |
9 | YACC=bison | 9 | YACC=bison |
10 | YFLAGS=-d -t -v | 10 | YFLAGS=-d -t -v |
11 | ifndef HOSTQTDIR | 11 | ifndef HOSTQTDIR |
12 | ifeq ($(shell if [ -e /usr/share/qt ]; then echo foundit; fi),foundit) | ||
12 | HOSTQTDIR=/usr/share/qt | 13 | HOSTQTDIR=/usr/share/qt |
14 | else | ||
15 | ifeq ($(shell if [ -e /usr/lib/qt ]; then echo foundit; fi),foundit) | ||
16 | HOSTQTDIR=/usr/lib/qt | ||
17 | endif | ||
18 | endif | ||
19 | endif | ||
20 | |||
21 | ifndef QTLIB | ||
22 | ifeq ($(shell if [ -e $(HOSTQTDIR)/lib/libqt.so ]; then echo foundit; fi),foundit) | ||
23 | QTLIB=-lqt | ||
24 | else | ||
25 | ifeq ($(shell if [ -e $(HOSTQTDIR)/lib/libqt-mt.so ]; then echo foundit; fi),foundit) | ||
26 | QTLIB=-lqt-mt | ||
27 | else | ||
28 | QTLIB=-lqt | ||
29 | $(warning Unable to locate libqt.so!) | ||
30 | endif | ||
13 | endif | 31 | endif |
32 | endif | ||
33 | |||
14 | MOC=$(wildcard $(HOSTQTDIR)/bin/moc) | 34 | MOC=$(wildcard $(HOSTQTDIR)/bin/moc) |
15 | 35 | ||
16 | parse_SRC=zconf.y | 36 | parse_SRC=zconf.y |
17 | conf_SRC=conf.c $(parse_SRC) | 37 | conf_SRC=conf.c $(parse_SRC) |
18 | mconf_SRC=mconf.c $(parse_SRC) | 38 | mconf_SRC=mconf.c $(parse_SRC) |
19 | qconf_SRC=qconf.cc | 39 | qconf_SRC=qconf.cc |
@@ -108,13 +128,13 @@ qconf: | |||
108 | @echo Unable to find the QT installation. Please make sure that the | 128 | @echo Unable to find the QT installation. Please make sure that the |
109 | @echo QT development package is correctly installed and the HOSTQTDIR | 129 | @echo QT development package is correctly installed and the HOSTQTDIR |
110 | @echo environment variable is set to the correct location. | 130 | @echo environment variable is set to the correct location. |
111 | @false | 131 | @false |
112 | else | 132 | else |
113 | qconf: $(qconf_OBJ) libkconfig.so | 133 | qconf: $(qconf_OBJ) libkconfig.so |
114 | $(CXX) $(LXXFLAGS) $^ -lqt -o $@ | 134 | $(CXX) $(LXXFLAGS) $^ $(QTLIB) -o $@ |
115 | endif | 135 | endif |
116 | 136 | ||
117 | lkcc: $(lkcc_OBJ) | 137 | lkcc: $(lkcc_OBJ) |
118 | $(CC) $(LDFLAGS) $^ -o $@ | 138 | $(CC) $(LDFLAGS) $^ -o $@ |
119 | 139 | ||
120 | libkconfig.so: $(parse_OBJ) | 140 | libkconfig.so: $(parse_OBJ) |