Adjust specfile based on x11

2 files changed, 20 insertions, 6 deletions

diff --git a/Makefile.test b/Makefile.test
index b917c32..daa6d35 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -1,31 +1,37 @@
 #!/usr/bin/make -f
 export OPIEDIR:=$(shell pwd)
 export TOPDIR:=$(OPIEDIR)
 export QMAKE:=$(OPIEDIR)/qmake/qmake
 
 export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
 
+noconfig_targets := xconfig menuconfig config oldconfig randconfig \
+                    defconfig allyesconfig allnoconfig allmodconfig \
+                    clean mrproper distclean \
+                    help tags TAGS sgmldocs psdocs pdfdocs htmldocs \
+                    checkconfig checkhelp checkincludes
+
 configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/core/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/config.in $(TOPDIR)/noncore/todayplugins/config.in $(TOPDIR)/config.in
 
 # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
 # in order to have a full set of config.in files.
 # .depends depends on $(TOPDIR)/.config
 # everything else depends on .depends, to ensure the dependencies are
 # intact.
 #
 # NOTE: The order in which things happen in this makefile is
         # -critical-. Do not rearrange this!
  
 all : $(TOPDIR)/.config
 
 $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
 
 all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
 
 clean-configs : $(TOPDIR)/.depends.cfgs
         @echo "Wiping generated config.in files..."
         @-rm -f $(configs)
 
 -include $(TOPDIR)/.depends.cfgs
 
 all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
@@ -57,41 +63,46 @@ config :
  
 oldconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -o ./config.in
  
 randconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -r ./config.in
  
 allyesconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -y ./config.in
  
 allnoconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -n ./config.in
  
 defconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -d ./config.in
 
 
 export
 
-ifneq ($(filter-out config menuconfig xconfig randconfig allyesconfig allnoconfig defconfig,$(MAKECMDGOALS)),)
+ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
+
+export include-config := 1
+
 -include $(TOPDIR)/.config
--include $(TOPDIR)/..config.cmd
 -include $(TOPDIR)/.depends
+
 endif
 
-export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE))
+-include $(TOPDIR)/..config.cmd
+
+export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
 
 all clean: $(subdir-y)
 
 $(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \
         $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \
         $(TOPDIR)/library/custom.h
 
 clean : $(TOPDIR)/.config
 
 include $(TOPDIR)/Rules.make
diff --git a/config.in.in b/config.in.in
index 41998d4..7af1f17 100644
--- a/config.in.in
+++ b/config.in.in
@@ -15,45 +15,48 @@ menu "Build Parameters"
 
 choice
   prompt "Target Machine"
   default TARGET_X86
   help
     Please select the architecture of the machine you will be
     building the OpenZaurus buildroot for.
 
   config TARGET_X86
     boolean "Intel X86"
 
   config TARGET_SHARP
     boolean "Sharp Zaurus SL-5x00 - stock"
 
 #  config TARGET_OZ
 #    boolean "Sharp Zaurus SL-5x00 - OpenZaurus"
 
   config TARGET_IPAQ
     boolean "Ipaq"
 
 endchoice
 
 config SPECFILE
   string
-  default "linux-generic-g++" if TARGET_X86
-  default "linux-sharp-g++" if TARGET_SHARP
+  default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
+  default "linux-g++" if TARGET_X86 && X11
+  default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
+  default "linux-g++" if TARGET_SHARP && X11
 #  default "linux-oz-g++" if TARGET_OZ
-  default "linux-ipaq-g++" if TARGET_IPAQ
+  default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
+  default "linux-g++" if TARGET_IPAQ && X11
 
 config CUSTOMFILE
   string
   default "custom-ipaq.h" if TARGET_IPAQ
   default "custom-sharp.h" if TARGET_SHARP
   
 #config CROSS
 #  string "Crosscompilation prefix"
 #  default "arm-linux-"
 #  help
 #    Crosscompilation prefix is the prefix which will be prepended
 #    to all compilation commands. For example, a crosscompilation prefix
 #    of arm-linux-, results in the build calling arm-linux-gcc as its CC.
 
 endmenu
 
 @sources@