remove arm-linux'isms from linux-oe-g++ and make it depending on the value of OE_TARGET_SYS

this enables to build Opie against OE staging area targetting e.g. uclibc, mips, or whatever
author: mickeyl <mickeyl> 2005-02-12 15:47:06 (UTC)
committer: mickeyl <mickeyl> 2005-02-12 15:47:06 (UTC)
commit: 0bf0f893a82426615cfe9f0bf764e1344c733ee3 (patch) (unidiff)
tree: ba147bb8ea70b409f15a76196097de49056576b6 /mkspecs
parent: f13760433a6526555bc5a4378ee3517f4053ac61 (diff)
download: opie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.zip
opie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.tar.gz
opie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.tar.bz2
1 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/qws/linux-oe-g++/qmake.conf b/mkspecs/qws/linux-oe-g++/qmake.conf
index 72bb489..bae5dbb 100644
--- a/mkspecs/qws/linux-oe-g++/qmake.conf
+++ b/mkspecs/qws/linux-oe-g++/qmake.conf
@@ -7,16 +7,16 @@
        MAKEFILE_GENERATOR= UNIX
        TEMPLATE        = app
        CONFIG          += qt link_prl
 STAGING_BINDIR          = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin
 STAGING_CROSSDIR        = $(OEDIR)/tmp/cross/bin
-STAGING_INCDIR          = $(OEDIR)/tmp/staging/arm-linux/include $(OEDIR)/tmp/staging/arm-linux/include/freetype2/include
+STAGING_INCDIR          = $(OEDIR)/tmp/staging/$(OETARGETSYS)/include $(OEDIR)/tmp/staging/$(OETARGETSYS)/include/freetype2/include
-STAGING_LIBDIR          = $(OEDIR)/tmp/staging/arm-linux/lib
+STAGING_LIBDIR          = $(OEDIR)/tmp/staging/$(OETARGETSYS)/lib
-        QMAKE_CC        = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-gcc
+        QMAKE_CC        = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/$(OETARGETSYS)-gcc
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  =
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
        QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_WARN_ON= -Wall -W
@@ -24,13 +24,13 @@ QMAKE_CFLAGS_WARN_OFF	=
        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB= -fPIC
        QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
        QMAKE_CFLAGS_THREAD= -D_REENTRANT
-        QMAKE_CXX       = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM 
+        QMAKE_CXX       = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/$(OETARGETSYS)-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM 
        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS  -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
        QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
        QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
        QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
        QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
        QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
@@ -45,14 +45,14 @@ QMAKE_INCDIR_QT		= $(QTDIR)/include
        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
        QMAKE_INCDIR_OPENGL= 
        QMAKE_LIBDIR_OPENGL= 
        QMAKE_INCDIR_QTOPIA= 
        QMAKE_LIBDIR_QTOPIA= 
-        QMAKE_LINK      = $$STAGING_CROSSDIR/arm-linux-g++
+        QMAKE_LINK      = $$STAGING_CROSSDIR/$(OETARGETSYS)-g++
-        QMAKE_LINK_SHLIB= $$STAGING_CROSSDIR/arm-linux-g++
+        QMAKE_LINK_SHLIB= $$STAGING_CROSSDIR/$(OETARGETSYS)-g++
        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE=
        QMAKE_LFLAGS_DEBUG=
 QMAKE_LFLAGS_SHLIB      = -shared
 QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME     = -Wl,-soname,
author	mickeyl <mickeyl>	2005-02-12 15:47:06 (UTC)
committer	mickeyl <mickeyl>	2005-02-12 15:47:06 (UTC)
commit	0bf0f893a82426615cfe9f0bf764e1344c733ee3 (patch) (unidiff)
tree	ba147bb8ea70b409f15a76196097de49056576b6 /mkspecs
parent	f13760433a6526555bc5a4378ee3517f4053ac61 (diff)
download	opie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.zip opie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.tar.gz opie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.tar.bz2

diff --git a/mkspecs/qws/linux-oe-g++/qmake.conf b/mkspecs/qws/linux-oe-g++/qmake.conf index 72bb489..bae5dbb 100644 --- a/mkspecs/qws/linux-oe-g++/qmake.conf +++ b/mkspecs/qws/linux-oe-g++/qmake.conf
@@ -7,16 +7,16 @@
7	MAKEFILE_GENERATOR= UNIX	7	MAKEFILE_GENERATOR= UNIX
8	TEMPLATE = app	8	TEMPLATE = app
9	CONFIG += qt link_prl	9	CONFIG += qt link_prl
10		10
11	STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin	11	STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin
12	STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin	12	STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin
13	STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include $(OEDIR)/tmp/staging/arm-linux/include/freetype2/include	13	STAGING_INCDIR = $(OEDIR)/tmp/staging/$(OETARGETSYS)/include $(OEDIR)/tmp/staging/$(OETARGETSYS)/include/freetype2/include
14	STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib	14	STAGING_LIBDIR = $(OEDIR)/tmp/staging/$(OETARGETSYS)/lib
15		15
16	QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-gcc	16	QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/$(OETARGETSYS)-gcc
17	QMAKE_LEX = flex	17	QMAKE_LEX = flex
18	QMAKE_LEXFLAGS =	18	QMAKE_LEXFLAGS =
19	QMAKE_YACC = yacc	19	QMAKE_YACC = yacc
20	QMAKE_YACCFLAGS = -d	20	QMAKE_YACCFLAGS = -d
21	QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA)	21	QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA)
22	QMAKE_CFLAGS_WARN_ON= -Wall -W	22	QMAKE_CFLAGS_WARN_ON= -Wall -W
@@ -24,13 +24,13 @@ QMAKE_CFLAGS_WARN_OFF =
24	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)	24	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
25	QMAKE_CFLAGS_DEBUG= -g	25	QMAKE_CFLAGS_DEBUG= -g
26	QMAKE_CFLAGS_SHLIB= -fPIC	26	QMAKE_CFLAGS_SHLIB= -fPIC
27	QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses	27	QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
28	QMAKE_CFLAGS_THREAD= -D_REENTRANT	28	QMAKE_CFLAGS_THREAD= -D_REENTRANT
29		29
30	QMAKE_CXX = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM	30	QMAKE_CXX = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/$(OETARGETSYS)-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM
31	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)	31	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
32	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	32	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
33	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	33	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
34	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	34	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
35	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	35	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
36	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	36	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
@@ -45,14 +45,14 @@ QMAKE_INCDIR_QT = $(QTDIR)/include
45	QMAKE_LIBDIR_QT = $(QTDIR)/lib	45	QMAKE_LIBDIR_QT = $(QTDIR)/lib
46	QMAKE_INCDIR_OPENGL=	46	QMAKE_INCDIR_OPENGL=
47	QMAKE_LIBDIR_OPENGL=	47	QMAKE_LIBDIR_OPENGL=
48	QMAKE_INCDIR_QTOPIA=	48	QMAKE_INCDIR_QTOPIA=
49	QMAKE_LIBDIR_QTOPIA=	49	QMAKE_LIBDIR_QTOPIA=
50		50
51	QMAKE_LINK = $$STAGING_CROSSDIR/arm-linux-g++	51	QMAKE_LINK = $$STAGING_CROSSDIR/$(OETARGETSYS)-g++
52	QMAKE_LINK_SHLIB= $$STAGING_CROSSDIR/arm-linux-g++	52	QMAKE_LINK_SHLIB= $$STAGING_CROSSDIR/$(OETARGETSYS)-g++
53	QMAKE_LFLAGS = $(LFLAGS_EXTRA)	53	QMAKE_LFLAGS = $(LFLAGS_EXTRA)
54	QMAKE_LFLAGS_RELEASE=	54	QMAKE_LFLAGS_RELEASE=
55	QMAKE_LFLAGS_DEBUG=	55	QMAKE_LFLAGS_DEBUG=
56	QMAKE_LFLAGS_SHLIB = -shared	56	QMAKE_LFLAGS_SHLIB = -shared
57	QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB	57	QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
58	QMAKE_LFLAGS_SONAME = -Wl,-soname,	58	QMAKE_LFLAGS_SONAME = -Wl,-soname,