r54 - in trunk/src/target/OM-2007: libraries/framework libraries/framework/mokocore libraries/framework/mokonet libraries/framework/mokopim libraries/framework/mokoui qmake templates

mickey at gta01.hmw-consulting.de mickey at gta01.hmw-consulting.de
Mon Sep 25 19:47:55 CEST 2006


Author: mickey
Date: 2006-09-25 17:47:54 +0000 (Mon, 25 Sep 2006)
New Revision: 54

Modified:
   trunk/src/target/OM-2007/libraries/framework/include.pro
   trunk/src/target/OM-2007/libraries/framework/makevars.sh
   trunk/src/target/OM-2007/libraries/framework/mokocore/mokocore.pro
   trunk/src/target/OM-2007/libraries/framework/mokonet/mokonet.pro
   trunk/src/target/OM-2007/libraries/framework/mokopim/mokopim.pro
   trunk/src/target/OM-2007/libraries/framework/mokoui/mokoui.pro
   trunk/src/target/OM-2007/qmake/openmoko-include.pro
   trunk/src/target/OM-2007/templates/gtk-derived-class.c
   trunk/src/target/OM-2007/templates/gtk-derived-class.h
Log:
framework update. Warning: libraries will move directories tomorrow


Modified: trunk/src/target/OM-2007/libraries/framework/include.pro
===================================================================
--- trunk/src/target/OM-2007/libraries/framework/include.pro	2006-09-25 17:47:17 UTC (rev 53)
+++ trunk/src/target/OM-2007/libraries/framework/include.pro	2006-09-25 17:47:54 UTC (rev 54)
@@ -1,4 +1,4 @@
-include (../../openmoko-include.pro)
+include (../../qmake/openmoko-include.pro)
 
 DESTDIR = $(OPENMOKODIR)/lib
 

Modified: trunk/src/target/OM-2007/libraries/framework/makevars.sh
===================================================================
--- trunk/src/target/OM-2007/libraries/framework/makevars.sh	2006-09-25 17:47:17 UTC (rev 53)
+++ trunk/src/target/OM-2007/libraries/framework/makevars.sh	2006-09-25 17:47:54 UTC (rev 54)
@@ -1,2 +1,5 @@
 export OPENMOKODIR=$PWD
 
+find . -name "Makefile"|xargs rm -f
+rm -rf lib/*
+/usr/lib/qt4/bin/qmake

Modified: trunk/src/target/OM-2007/libraries/framework/mokocore/mokocore.pro
===================================================================
--- trunk/src/target/OM-2007/libraries/framework/mokocore/mokocore.pro	2006-09-25 17:47:17 UTC (rev 53)
+++ trunk/src/target/OM-2007/libraries/framework/mokocore/mokocore.pro	2006-09-25 17:47:54 UTC (rev 54)
@@ -1,4 +1,9 @@
-HEADERS = 
-SOURCES = 
+TEMPLATE = lib
+VERSION = 0.0.1
 
+HEADERS =
+SOURCES =
+
+PKGCONFIG += dbus-glib-1
+
 include ( ../include.pro )

Modified: trunk/src/target/OM-2007/libraries/framework/mokonet/mokonet.pro
===================================================================
--- trunk/src/target/OM-2007/libraries/framework/mokonet/mokonet.pro	2006-09-25 17:47:17 UTC (rev 53)
+++ trunk/src/target/OM-2007/libraries/framework/mokonet/mokonet.pro	2006-09-25 17:47:54 UTC (rev 54)
@@ -1,3 +1,6 @@
+TEMPLATE = lib
+VERSION = 0.0.1
+
 HEADERS = 
 SOURCES = 
 

Modified: trunk/src/target/OM-2007/libraries/framework/mokopim/mokopim.pro
===================================================================
--- trunk/src/target/OM-2007/libraries/framework/mokopim/mokopim.pro	2006-09-25 17:47:17 UTC (rev 53)
+++ trunk/src/target/OM-2007/libraries/framework/mokopim/mokopim.pro	2006-09-25 17:47:54 UTC (rev 54)
@@ -1,3 +1,6 @@
+TEMPLATE = lib
+VERSION = 0.0.1
+
 HEADERS = 
 SOURCES = 
 

Modified: trunk/src/target/OM-2007/libraries/framework/mokoui/mokoui.pro
===================================================================
--- trunk/src/target/OM-2007/libraries/framework/mokoui/mokoui.pro	2006-09-25 17:47:17 UTC (rev 53)
+++ trunk/src/target/OM-2007/libraries/framework/mokoui/mokoui.pro	2006-09-25 17:47:54 UTC (rev 54)
@@ -1,4 +1,9 @@
-HEADERS = 
-SOURCES = 
+TEMPLATE = lib
+VERSION = 0.0.1
 
+HEADERS = moko-application.h moko-window.h moko-menubar.h
+SOURCES = moko-application.c moko-window.c moko-menubar.c
+
+PKGCONFIG += gtk+-2.0
+
 include ( ../include.pro )

Modified: trunk/src/target/OM-2007/qmake/openmoko-include.pro
===================================================================
--- trunk/src/target/OM-2007/qmake/openmoko-include.pro	2006-09-25 17:47:17 UTC (rev 53)
+++ trunk/src/target/OM-2007/qmake/openmoko-include.pro	2006-09-25 17:47:54 UTC (rev 54)
@@ -1,13 +1,7 @@
-CONFIG = debug warn_on link_pkgconfig console
+CONFIG = debug warn_on link_pkgconfig console $$MOKOCONFIG
 
-# handle pkg-config files (from qt4)
-for(PKGCONFIG_LIB, $$list($$unique(PKGCONFIG))) {
-	QMAKE_CXXFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB)
-	QMAKE_CFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB)
-	LIBS += $$system(pkg-config --libs $$PKGCONFIG_LIB)
-}
-
 QMAKE_CFLAGS += -std=c99 -pedantic
+INCLUDEPATH += $(OPENMOKODIR)
 
 MOC_DIR=.moc/$(PLATFORM)
 OBJECTS_DIR=.obj/$(PLATFORM)
@@ -20,3 +14,28 @@
 dbus-binding-tool.variable_out = HEADERS
 dbus-binding-tool = SERVICES
 QMAKE_EXTRA_UNIX_COMPILERS += dbus-binding-tool
+
+mokocore {
+	LIBS += -lmokocore -L${OPENMOKODIR}/lib
+}
+
+mokoui {
+	PKGCONFIG += gtk+-2.0
+	LIBS += -lmokoui -L${OPENMOKODIR}/lib
+}
+
+mokopim {
+	LIBS += -lmokopim -L${OPENMOKODIR}/lib
+}
+
+mokonet {
+	LIBS += -lmokonet -L${OPENMOKODIR}/lib
+}
+
+# handle pkg-config files (from qt4)
+for(PKGCONFIG_LIB, $$list($$unique(PKGCONFIG))) {
+        QMAKE_CXXFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB)
+        QMAKE_CFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB)
+        LIBS += $$system(pkg-config --libs $$PKGCONFIG_LIB)
+}
+

Modified: trunk/src/target/OM-2007/templates/gtk-derived-class.c
===================================================================
--- trunk/src/target/OM-2007/templates/gtk-derived-class.c	2006-09-25 17:47:17 UTC (rev 53)
+++ trunk/src/target/OM-2007/templates/gtk-derived-class.c	2006-09-25 17:47:54 UTC (rev 54)
@@ -7,15 +7,15 @@
 };
 
 static void myobject_class_init          (MyobjectClass *klass);
-static void myobject_init                (Myobject      *f);
+static void myobject_init                (Myobject      *self);
 
 static guint myobject_signals[LAST_SIGNAL] = { 0 };
 
 GType myobject_get_type (void) /* Typechecking */
 {
-    static GType f_type = 0;
+    static GType self_type = 0;
 
-    if (!f_type)
+    if (!self_type)
     {
         static const GTypeInfo f_info =
         {
@@ -31,10 +31,10 @@
         };
 
         /* add the type of your parent class here */
-        f_type = g_type_register_static(MYOBJECT_PARENT, "Myobject", &f_info, 0);
+        self_type = g_type_register_static(MYOBJECT_PARENT, "Myobject", &f_info, 0);
     }
 
-    return f_type;
+    return self_type;
 }
 
 static void myobject_class_init (MyobjectClass *klass) /* Class Initialization */
@@ -49,7 +49,7 @@
             G_TYPE_NONE, 0);
 }
 
-static void myobject_init (Myobject *f) /* Instance Construction */
+static void myobject_init (Myobject *self) /* Instance Construction */
 {
     /* populate your widget here */
 }
@@ -59,7 +59,7 @@
     return GTK_WIDGET(g_object_new(myobject_get_type(), NULL));
 }
 
-void myobject_clear(Myobject *f) /* Destruction */
+void myobject_clear(Myobject *self) /* Destruction */
 {
     /* destruct your widgets here */
 }

Modified: trunk/src/target/OM-2007/templates/gtk-derived-class.h
===================================================================
--- trunk/src/target/OM-2007/templates/gtk-derived-class.h	2006-09-25 17:47:17 UTC (rev 53)
+++ trunk/src/target/OM-2007/templates/gtk-derived-class.h	2006-09-25 17:47:54 UTC (rev 54)
@@ -28,12 +28,12 @@
 {
     /* add your parent class here */
     MyObjectParentClass parent_class;
-    void (*myobject) (Myobject *f);
+    void (*myobject) (Myobject *self);
 };
 
 GType          myobject_get_type        (void);
 GtkWidget*     myobject_new             (void);
-void           myobject_clear           (Myobject *f);
+void           myobject_clear           (Myobject *self);
 
 /* add additional methods here */
 





More information about the commitlog mailing list