2006-11-23 Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>

* configure.ac: Fixing the build problem of the examples (missing _)

	* examples/Makefile.am:
	* examples/hildon-weekday-picker:
	* examples/hildon-weekday-picker/hildon-weekday-picker-example.c:
	Adding a weekday picker example.

	* src/Makefile.am: Fixing the problem mis-ordered build.

diff --git a/ChangeLog b/ChangeLog
index 8a43937..24a5b44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-11-23  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+
+       * configure.ac: Fixing the build problem of the examples (missing _)
+
+       * examples/Makefile.am:
+       * examples/hildon-weekday-picker:
+       * examples/hildon-weekday-picker/hildon-weekday-picker-example.c:
+       Adding a weekday picker example.
+
+       * src/Makefile.am: Fixing the problem mis-ordered build.
+
 2006-11-20  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
        * Makefile.am:

diff --git a/configure.ac b/configure.ac
index 716442c..f2e945e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,7 @@ AC_SUBST(REBUILD)
 # includes all the low-level flags
 # FIXME Add esd and gconf flags
 HILDON_WIDGETS_OBJ_CFLAGS="\$(CFLAGS) \$(GTK_CFLAGS) -I\$(top_builddir)/src/"
-HILDON_WIDGETS_OBJ_LIBS="\$(top_builddir)/src/libhildon\$(PACKAGE_VERSION_MAJOR).la \$(GTK_LIBS)"
+HILDON_WIDGETS_OBJ_LIBS="\$(top_builddir)/src/libhildon_\$(PACKAGE_VERSION_MAJOR).la \$(GTK_LIBS)"
 AC_SUBST(HILDON_WIDGETS_OBJ_CFLAGS)
 AC_SUBST(HILDON_WIDGETS_OBJ_LIBS)
 

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 336ac87..378d4b2 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,7 +2,8 @@ MAINTAINERCLEANFILES                    = Makefile.in
 
 noinst_PROGRAMS                                = hildon-window-example         \
                                          hildon-banner-example         \
-                                         hildon-caption-example
+                                         hildon-caption-example        \
+                                         hildon-weekday-picker-example
 
 # HIldon window
 hildon_window_example_LDADD            = $(HILDON_WIDGETS_OBJ_LIBS)
@@ -18,3 +19,8 @@ hildon_banner_example_SOURCES         = hildon-banner/hildon-banner-example.c
 hildon_caption_example_LDADD           = $(HILDON_WIDGETS_OBJ_LIBS)
 hildon_caption_example_CFLAGS          = $(HILDON_WIDGETS_OBJ_CFLAGS)
 hildon_caption_example_SOURCES         = hildon-caption/hildon-caption-example.c
+
+# Hildon weekday picker
+hildon_weekday_picker_example_LDADD    = $(HILDON_WIDGETS_OBJ_LIBS)
+hildon_weekday_picker_example_CFLAGS   = $(HILDON_WIDGETS_OBJ_CFLAGS)
+hildon_weekday_picker_example_SOURCES  = hildon-weekday-picker/hildon-weekday-picker-example.c

diff --git a/examples/hildon-weekday-picker/hildon-weekday-picker-example.c b/examples/hildon-weekday-picker/hildon-weekday-picker-example.c
new file mode 100644 (file)
index 0000000..c0b6019
--- /dev/null
+++ b/examples/hildon-weekday-picker/hildon-weekday-picker-example.c
@@ -0,0 +1,28 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+#include "hildon-widgets/hildon-window.h"
+#include "hildon-widgets/hildon-weekday-picker.h"
+#include "hildon-widgets/hildon-program.h"
+
+int
+main (int argc, char **args)
+{
+    gtk_init (&argc, &args);
+    
+    GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
+
+    GtkWidget *picker = hildon_weekday_picker_new ();
+
+    gtk_box_pack_start (GTK_BOX (dialog->vbox), picker, TRUE, TRUE, 0);
+
+    gtk_dialog_add_button (dialog, "Close", GTK_RESPONSE_CLOSE);
+
+    gtk_widget_show_all (GTK_WIDGET (dialog));
+    gtk_dialog_run (dialog);
+    
+    return 0;
+}
+
+

diff --git a/src/Makefile.am b/src/Makefile.am
index a16e313..068add1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,9 +104,9 @@ libhildon_@PACKAGE_VERSION_MAJOR@_include_HEADERS   = hildon-controlbar.h \
                                                          hildon-marshalers.h
 
 # Don't build the library until we have built the header that it needs:
-$(OBJECTS) $(libhildon_$(PACKAGE_VERSION_MAJOR)_la_OBJECTS): hildon-enum-types.h
+$(OBJECTS) $(libhildon_$(PACKAGE_VERSION_MAJOR)_la_OBJECTS): hildon-enum-types.h hildon-marshalers.c hildon-marshalers.h
 
-hildon-enum-types.h:                                     @REBUILD@ $(libhildon1_include_HEADERS) Makefile
+hildon-enum-types.h:                                     @REBUILD@ $(libhildon_$(PACKAGE_VERSION_MAJOR)_include_HEADERS) Makefile
        (cd $(srcdir) && glib-mkenums \
                        --fhead "#ifndef __HILDON_ENUM_TYPES_H__\n"     \
                        --fhead "#define __HILDON_ENUM_TYPES_H__\n"     \