r257 - in trunk/src/target/OM-2007/examples/openmoko-finger-demo: . data src
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Fri Nov 24 17:43:57 CET 2006
Author: mickey
Date: 2006-11-24 16:43:56 +0000 (Fri, 24 Nov 2006)
New Revision: 257
Added:
trunk/src/target/OM-2007/examples/openmoko-finger-demo/AUTHORS
trunk/src/target/OM-2007/examples/openmoko-finger-demo/ChangeLog
trunk/src/target/OM-2007/examples/openmoko-finger-demo/INSTALL
trunk/src/target/OM-2007/examples/openmoko-finger-demo/Makefile.am
trunk/src/target/OM-2007/examples/openmoko-finger-demo/configure.ac
trunk/src/target/OM-2007/examples/openmoko-finger-demo/data/
trunk/src/target/OM-2007/examples/openmoko-finger-demo/data/Makefile.am
trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/
trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/Makefile.am
trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/demo-main.c
trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/demo-main.h
Removed:
trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c
trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.h
Log:
openmoko-finger-demo: autotoolize
Added: trunk/src/target/OM-2007/examples/openmoko-finger-demo/AUTHORS
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-finger-demo/AUTHORS 2006-11-24 16:39:34 UTC (rev 256)
+++ trunk/src/target/OM-2007/examples/openmoko-finger-demo/AUTHORS 2006-11-24 16:43:56 UTC (rev 257)
@@ -0,0 +1,2 @@
+Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+
Added: trunk/src/target/OM-2007/examples/openmoko-finger-demo/ChangeLog
===================================================================
Added: trunk/src/target/OM-2007/examples/openmoko-finger-demo/INSTALL
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-finger-demo/INSTALL 2006-11-24 16:39:34 UTC (rev 256)
+++ trunk/src/target/OM-2007/examples/openmoko-finger-demo/INSTALL 2006-11-24 16:43:56 UTC (rev 257)
@@ -0,0 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script). Here is a another example:
+
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
Added: trunk/src/target/OM-2007/examples/openmoko-finger-demo/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-finger-demo/Makefile.am 2006-11-24 16:39:34 UTC (rev 256)
+++ trunk/src/target/OM-2007/examples/openmoko-finger-demo/Makefile.am 2006-11-24 16:43:56 UTC (rev 257)
@@ -0,0 +1,2 @@
+SUBDIRS = src data
+
Added: trunk/src/target/OM-2007/examples/openmoko-finger-demo/configure.ac
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-finger-demo/configure.ac 2006-11-24 16:39:34 UTC (rev 256)
+++ trunk/src/target/OM-2007/examples/openmoko-finger-demo/configure.ac 2006-11-24 16:43:56 UTC (rev 257)
@@ -0,0 +1,24 @@
+AC_PREREQ(2.53)
+AC_INIT(%(APPNAME), %(APPVERSION), %(APPCONTACT))
+AM_INIT_AUTOMAKE()
+AC_CONFIG_SRCDIR(src/demo-main.c)
+AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
+
+AC_ISC_POSIX
+AC_PROG_CC
+AC_STDC_HEADERS
+AC_PROG_LIBTOOL
+
+# base deps
+PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.1,,
+ AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.1 not installed ***]))
+LIBS="$LIBS $GTK_LIBS"
+CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
+
+# output stuff
+AC_OUTPUT([
+Makefile
+src/Makefile
+data/Makefile
+])
Added: trunk/src/target/OM-2007/examples/openmoko-finger-demo/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-finger-demo/data/Makefile.am 2006-11-24 16:39:34 UTC (rev 256)
+++ trunk/src/target/OM-2007/examples/openmoko-finger-demo/data/Makefile.am 2006-11-24 16:43:56 UTC (rev 257)
@@ -0,0 +1,5 @@
+EXTRA_DIST = accords.chords wood.png ball.png
+
+resourcedir = $(pkgdatadir)
+resource_DATA = accords.chords wood.png ball.png
+
Deleted: trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c 2006-11-24 16:39:34 UTC (rev 256)
+++ trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c 2006-11-24 16:43:56 UTC (rev 257)
@@ -1,140 +0,0 @@
-/*
- * Finger-Demo -- OpenMoko Demo Application
- *
- * Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
- *
- * Copyright (C) 2006 First International Computer Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Public License as published by
- * the Free Software Foundation; version 2.1 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Public License for more details.
- *
- * Current Version: $Rev$ ($Date$) [$Author$]
- */
-
-#include <libmokoui/moko-application.h>
-#include <libmokoui/moko-finger-tool-box.h>
-#include <libmokoui/moko-finger-window.h>
-#include <libmokoui/moko-finger-wheel.h>
-
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkvbox.h>
-
-static GtkVBox* vbox = NULL;
-static MokoFingerToolBox* tools = NULL;
-
-void cb_orange_button_clicked( GtkButton* button, MokoFingerWindow* window )
-{
- g_debug( "openmoko-finger-demo: orange button clicked" );
- static gboolean show = TRUE;
- static MokoFingerWheel* wheel = NULL;
-
- if (!wheel) wheel = moko_finger_wheel_new();
-
- if ( show )
- gtk_widget_show( GTK_WIDGET(wheel) );
- else
- gtk_widget_hide( GTK_WIDGET(wheel) );
-
- show = !show;
-}
-
-void cb_black_button_clicked( GtkButton* button, MokoFingerWindow* window )
-{
- g_debug( "openmoko-finger-demo: black button clicked" );
- static gboolean show = TRUE;
-
- if (!tools)
- {
- tools = moko_finger_tool_box_new();
- for ( int i = 0; i < 1; ++i )
- moko_finger_tool_box_add_button( tools );
- }
-
- if ( show )
- gtk_widget_show( GTK_WIDGET(tools) );
- else
- gtk_widget_hide( GTK_WIDGET(tools) );
-
- show = !show;
-}
-
-void cb_dialer_button_clicked( GtkButton* button, MokoFingerWindow* window )
-{
- if (!tools) return;
- moko_finger_tool_box_add_button( tools );
-}
-
-int main( int argc, char** argv )
-{
- g_debug( "openmoko-finger-demo starting up" );
- /* Initialize GTK+ */
- gtk_init( &argc, &argv );
-
- /* application object */
- MokoApplication* app = MOKO_APPLICATION(moko_application_get_instance());
- g_set_application_name( "Finger-Demo" );
-
- /* main window */
- MokoFingerWindow* window = MOKO_FINGER_WINDOW(moko_finger_window_new());
-
- /* application menu */
- GtkMenu* appmenu = GTK_MENU(gtk_menu_new());
- GtkMenuItem* closeitem = GTK_MENU_ITEM(gtk_menu_item_new_with_label( "Close" ));
- g_signal_connect( G_OBJECT(closeitem), "activate", G_CALLBACK(gtk_main_quit), NULL );
- gtk_menu_shell_append( appmenu, closeitem );
- moko_finger_window_set_application_menu( window, appmenu );
-
- /* connect close event */
- g_signal_connect( G_OBJECT(window), "delete_event", G_CALLBACK( gtk_main_quit ), NULL );
-
- /* contents */
- vbox = gtk_vbox_new( TRUE, 0 );
- GtkLabel* label1 = gtk_label_new( "Populate this area with finger widgets\n \nThere are three types of finger buttons:" );
-
- GtkLabel* label2 = gtk_label_new( "Orange button toggles finger scrolling wheel\nBlack button toggles finger toolbar\nDialer Button does nothing :)" );
-
- GtkHBox* hbox = gtk_hbox_new( TRUE, 10 );
-
- GtkButton* button1 = gtk_button_new();
- g_signal_connect( G_OBJECT(button1), "clicked", G_CALLBACK(cb_orange_button_clicked), window );
- gtk_widget_set_name( GTK_WIDGET(button1), "mokofingerbutton-orange" );
- gtk_box_pack_start( GTK_BOX(hbox), GTK_WIDGET(button1), TRUE, TRUE, 5 );
-
- GtkButton* button2 = gtk_button_new();
- //FIXME toggle buttons look odd... needs working on styling
- //gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button2), TRUE);
- g_signal_connect( G_OBJECT(button2), "clicked", G_CALLBACK(cb_dialer_button_clicked), window );
- gtk_widget_set_name( GTK_WIDGET(button2), "mokofingerbutton-dialer" );
- gtk_box_pack_start( GTK_BOX(hbox), GTK_WIDGET(button2), TRUE, TRUE, 5 );
-
- GtkButton* button3 = gtk_button_new();
- g_signal_connect( G_OBJECT(button3), "clicked", G_CALLBACK(cb_black_button_clicked), window );
- gtk_widget_set_name( GTK_WIDGET(button3), "mokofingerbutton-black" );
- gtk_box_pack_start( GTK_BOX(hbox), GTK_WIDGET(button3), TRUE, TRUE, 5 );
-
- gtk_box_pack_start( vbox, GTK_WIDGET(label1), TRUE, TRUE, 0 );
- gtk_box_pack_start( vbox, GTK_WIDGET(hbox), TRUE, TRUE, 0 );
- gtk_box_pack_start( vbox, GTK_WIDGET(label2), TRUE, TRUE, 0 );
-
- moko_finger_window_set_contents( window, GTK_WIDGET(vbox) );
-
- /* show everything and run main loop */
- gtk_widget_show_all( GTK_WIDGET(window) );
- g_debug( "openmoko-finger-demo entering main loop" );
- gtk_main();
- g_debug( "openmoko-finger-demo left main loop" );
-
- return 0;
-}
Deleted: trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.h
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.h 2006-11-24 16:39:34 UTC (rev 256)
+++ trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.h 2006-11-24 16:43:56 UTC (rev 257)
@@ -1,19 +0,0 @@
-/*
- * Finger-Demo -- OpenMoko Demo Application
- *
- * Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
- *
- * Copyright (C) 2006 First International Computer Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Public License as published by
- * the Free Software Foundation; version 2.1 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Public License for more details.
- *
- * Current Version: $Rev$ ($Date$) [$Author$]
- */
-
Added: trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/Makefile.am 2006-11-24 16:39:34 UTC (rev 256)
+++ trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/Makefile.am 2006-11-24 16:43:56 UTC (rev 257)
@@ -0,0 +1,8 @@
+INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" @OPENMOKO_CFLAGS@ -Wall -std=c99 -pedantic
+
+bin_PROGRAMS = %(APPNAME)
+
+%(APPCNAME)_SOURCES = demo-main.c
+
+$(APPCNAME)_LDADD = @OPENMOKO_LIBS@
+
Copied: trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/demo-main.c (from rev 255, trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c)
Copied: trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/demo-main.h (from rev 255, trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.h)
More information about the commitlog
mailing list