06-br-build-system-integration.patch 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374
  1. Index: kconfig/Makefile
  2. ===================================================================
  3. --- kconfig.orig/Makefile
  4. +++ kconfig/Makefile
  5. @@ -211,7 +211,35 @@ qconf-cxxobjs := qconf.o
  6. qconf-objs := zconf.tab.o
  7. gconf-objs := gconf.o zconf.tab.o
  8. -hostprogs-y := conf nconf mconf kxgettext qconf gconf
  9. +hostprogs-y := conf
  10. +
  11. +ifeq ($(MAKECMDGOALS),nconf)
  12. + hostprogs-y += nconf
  13. +endif
  14. +
  15. +ifeq ($(MAKECMDGOALS),mconf)
  16. + hostprogs-y += mconf
  17. +endif
  18. +
  19. +ifeq ($(MAKECMDGOALS),update-po-config)
  20. + hostprogs-y += kxgettext
  21. +endif
  22. +
  23. +ifeq ($(MAKECMDGOALS),qconf)
  24. + qconf-target := 1
  25. +endif
  26. +
  27. +ifeq ($(MAKECMDGOALS),gconf)
  28. + gconf-target := 1
  29. +endif
  30. +
  31. +ifeq ($(qconf-target),1)
  32. + hostprogs-y += qconf
  33. +endif
  34. +
  35. +ifeq ($(gconf-target),1)
  36. + hostprogs-y += gconf
  37. +endif
  38. targets += zconf.lex.c
  39. clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck
  40. @@ -243,7 +243,7 @@ HOSTLOADLIBES_nconf = $(shell \
  41. || echo "-lmenu -lpanel -lncurses" )
  42. $(obj)/qconf.o: $(obj)/.tmp_qtcheck
  43. -ifeq ($(MAKECMDGOALS),xconfig)
  44. +ifeq ($(MAKECMDGOALS),qconf)
  45. $(obj)/.tmp_qtcheck: $(src)/Makefile
  46. -include $(obj)/.tmp_qtcheck
  47. @@ -270,9 +276,8 @@
  48. echo "KC_QT_MOC=$$moc" >> $@
  49. endif
  50. +ifeq ($(MAKECMDGOALS),gconf)
  51. $(obj)/gconf.o: $(obj)/.tmp_gtkcheck
  52. -
  53. -ifeq ($(MAKECMDGOALS),gconfig)
  54. -include $(obj)/.tmp_gtkcheck
  55. # GTK+ needs some extra effort, too...
  56. @@ -300,11 +305,8 @@
  57. $(obj)/qconf.o: $(obj)/qconf.moc
  58. -quiet_cmd_moc = MOC $@
  59. - cmd_moc = $(KC_QT_MOC) -i $< -o $@
  60. -
  61. $(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck
  62. - $(call cmd,moc)
  63. + $(KC_QT_MOC) -i $< -o $@
  64. # Extract gconf menu items for i18n support
  65. $(obj)/gconf.glade.h: $(obj)/gconf.glade