r59 - in trunk/src/target/OM-2007: . bin lib libraries/mokonet libraries/mokopim libraries/mokoui qmake

mickey at gta01.hmw-consulting.de mickey at gta01.hmw-consulting.de
Wed Sep 27 14:40:34 CEST 2006


Author: mickey
Date: 2006-09-27 12:40:33 +0000 (Wed, 27 Sep 2006)
New Revision: 59

Added:
   trunk/src/target/OM-2007/bin/
   trunk/src/target/OM-2007/bin/README
   trunk/src/target/OM-2007/lib/
   trunk/src/target/OM-2007/lib/README
Modified:
   trunk/src/target/OM-2007/libraries/mokonet/mokonet.pro
   trunk/src/target/OM-2007/libraries/mokopim/mokopim.pro
   trunk/src/target/OM-2007/libraries/mokoui/mokoui.pro
   trunk/src/target/OM-2007/qmake/openmoko-include.pro
Log:
.pro file updates to make everything buildable in one run


Added: trunk/src/target/OM-2007/bin/README
===================================================================
--- trunk/src/target/OM-2007/bin/README	2006-09-26 21:04:27 UTC (rev 58)
+++ trunk/src/target/OM-2007/bin/README	2006-09-27 12:40:33 UTC (rev 59)
@@ -0,0 +1,2 @@
+application binaries here
+

Added: trunk/src/target/OM-2007/lib/README
===================================================================
--- trunk/src/target/OM-2007/lib/README	2006-09-26 21:04:27 UTC (rev 58)
+++ trunk/src/target/OM-2007/lib/README	2006-09-27 12:40:33 UTC (rev 59)
@@ -0,0 +1,2 @@
+library binaries here
+

Modified: trunk/src/target/OM-2007/libraries/mokonet/mokonet.pro
===================================================================
--- trunk/src/target/OM-2007/libraries/mokonet/mokonet.pro	2006-09-26 21:04:27 UTC (rev 58)
+++ trunk/src/target/OM-2007/libraries/mokonet/mokonet.pro	2006-09-27 12:40:33 UTC (rev 59)
@@ -4,4 +4,4 @@
 HEADERS = 
 SOURCES = 
 
-include ( ../include.pro )
+include ( $(OPENMOKODIR)/qmake/openmoko-include.pro )

Modified: trunk/src/target/OM-2007/libraries/mokopim/mokopim.pro
===================================================================
--- trunk/src/target/OM-2007/libraries/mokopim/mokopim.pro	2006-09-26 21:04:27 UTC (rev 58)
+++ trunk/src/target/OM-2007/libraries/mokopim/mokopim.pro	2006-09-27 12:40:33 UTC (rev 59)
@@ -4,4 +4,4 @@
 HEADERS = 
 SOURCES = 
 
-include ( ../include.pro )
+include ( $(OPENMOKODIR)/qmake/openmoko-include.pro )

Modified: trunk/src/target/OM-2007/libraries/mokoui/mokoui.pro
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/mokoui.pro	2006-09-26 21:04:27 UTC (rev 58)
+++ trunk/src/target/OM-2007/libraries/mokoui/mokoui.pro	2006-09-27 12:40:33 UTC (rev 59)
@@ -6,4 +6,4 @@
 
 PKGCONFIG += gtk+-2.0
 
-include ( ../include.pro )
+include ( $(OPENMOKODIR)/qmake/openmoko-include.pro )

Modified: trunk/src/target/OM-2007/qmake/openmoko-include.pro
===================================================================
--- trunk/src/target/OM-2007/qmake/openmoko-include.pro	2006-09-26 21:04:27 UTC (rev 58)
+++ trunk/src/target/OM-2007/qmake/openmoko-include.pro	2006-09-27 12:40:33 UTC (rev 59)
@@ -16,19 +16,23 @@
 QMAKE_EXTRA_UNIX_COMPILERS += dbus-binding-tool
 
 mokocore {
+	INCLUDEPATH += ${OPENMOKODIR}/libraries
 	LIBS += -lmokocore -L${OPENMOKODIR}/lib
 }
 
 mokoui {
+	INCLUDEPATH += ${OPENMOKODIR}/libraries
 	PKGCONFIG += gtk+-2.0
 	LIBS += -lmokoui -L${OPENMOKODIR}/lib
 }
 
 mokopim {
+	INCLUDEPATH += ${OPENMOKODIR}/libraries
 	LIBS += -lmokopim -L${OPENMOKODIR}/lib
 }
 
 mokonet {
+	INCLUDEPATH += ${OPENMOKODIR}/libraries
 	LIBS += -lmokonet -L${OPENMOKODIR}/lib
 }
 
@@ -39,3 +43,13 @@
         LIBS += $$system(pkg-config --libs $$PKGCONFIG_LIB)
 }
 
+contains( TEMPLATE, app ) {
+	message( configuring application $$TARGET )
+	DESTDIR = ${OPENMOKODIR}/bin
+}
+
+contains( TEMPLATE, lib ) {
+	message( configuring library $$TARGET )
+	DESTDIR = ${OPENMOKODIR}/lib
+}
+





More information about the commitlog mailing list