author | kergoth <kergoth> | 2002-11-05 20:49:36 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-05 20:49:36 (UTC) |
commit | f8d2e3ed6d926e267bb5891f7e17ac094907a944 (patch) (side-by-side diff) | |
tree | 27cf0206b89b42e8577106a321478cac1ff77c68 | |
parent | 59320e9eca887102cd841d0f1787b74fe4a11700 (diff) | |
download | opie-f8d2e3ed6d926e267bb5891f7e17ac094907a944.zip opie-f8d2e3ed6d926e267bb5891f7e17ac094907a944.tar.gz opie-f8d2e3ed6d926e267bb5891f7e17ac094907a944.tar.bz2 |
Add libkconfig.so to the makefile dependencies for qconf, should ensure it gets built
-rw-r--r-- | scripts/kconfig/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index b60db9f..7553311 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -65,97 +65,97 @@ lkcc_OBJ=$(filter %.o, \ $(lkcc_SRC))))) OBJ=$(conf_OBJ) $(mconf_OBJ) $(qconf_OBJ) $(lkcc_OBJ) ifeq ($(MOC),) all: lkcc conf mconf else all: lkcc conf mconf qconf libkconfig.so endif lex.help.c: help.l lex.help.o: lex.help.c cml1.h expr.h lex.cml1.c: cml1.l lex.cml1.o: lex.cml1.c cml1.tab.h cml1.h expr.h cml1.tab.c: cml1.y cml1.tab.h: cml1.y cml1.tab.o: cml1.tab.c cml1.h expr.h expr1.o: expr1.c expr.h lkc_deps := lkc.h lkc_proto.h lkc_defs.h expr.h zconf.tab.c: zconf.y zconf.tab.h: zconf.y lex.zconf.c: zconf.l zconf.tab.o: zconf.tab.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(lkc_deps) #lex.zconf.o: lex.zconf.c zconf.tab.h $(lkc_deps) #confdata.o: confdata.c $(lkc_deps) #expr.o: expr.c $(lkc_deps) #symbol.o: symbol.c $(lkc_deps) #menu.o: menu.c $(lkc_deps) kconfig_load.o: kconfig_load.c $(lkc_deps) conf.o: conf.c $(lkc_deps) mconf.o: mconf.c $(lkc_deps) qconf.moc: qconf.h qconf.o: qconf.cc qconf.moc images.c $(lkc_deps) 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 HOSTQTDIR @echo environment variable is set to the correct location. @false else -qconf: $(qconf_OBJ) +qconf: $(qconf_OBJ) libkconfig.so $(CXX) $(LXXFLAGS) $^ -lqt -o $@ endif lkcc: $(lkcc_OBJ) $(CC) $(LDFLAGS) $^ -o $@ libkconfig.so: $(parse_OBJ) $(CC) -shared $^ -o $@ lkc_defs.h: lkc_proto.h sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/' clean: rm -f $(OBJ) lkcc conf qconf mconf *.moc lex.* *.tab.? *.output tgz: mkdir tmp mkdir tmp/lkc-$(VERSION) cp -ra Makefile $(sort $(SRC) $(HDR) $(OTHER) $(INST)) tmp/lkc-$(VERSION) tar -cpvz -C tmp -f lkc-$(VERSION).tar.gz lkc-$(VERSION) rm -rf tmp %.tab.c %.tab.h: %.y $(YACC) $(YFLAGS) -b $* -p $* $< lex.%.c: %.l $(LEX) $(LFLAGS) -P$* $< %.moc: %.h $(HOSTQTDIR)/bin/moc -i $< -o $@ %.o: %.c $(CC) $(CFLAGS) -c $< -o $@ %.o: %.cc $(CXX) $(CXXFLAGS) -c $< -o $@ ifdef KERNELSRC install: lkcc $(INSTGEN) set -x; mkdir $(KERNELSRC)/scripts/kconfig; \ cp $(sort $(INST)) $(KERNELSRC)/scripts/kconfig; \ for f in $(INSTGEN); do cp $$f $(KERNELSRC)/scripts/kconfig/$${f}_shipped; done; \ cp Makefile.kernel $(KERNELSRC)/scripts/kconfig/Makefile; \ LKCSRC=$$PWD; export LKCSRC; \ cd $(KERNELSRC); \ patch -p0 -N < $$LKCSRC/prepare-all.diff; \ sh $$LKCSRC/convert-all; \ patch -p0 -N < $$LKCSRC/fixup-all.diff |