X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=hildon-widgets%2FMakefile.am;h=39c17a3947b4bac0a1c8d90aea045aaa21c8ea47;hb=ebaa4f154516d524cd83a5200f1347eda8adb6b9;hp=8e642b73862b408945a230d5c8fba80b20e577cb;hpb=50106ac9fcb03d6440dc9f9282c0373f5f995d0a;p=hildon diff --git a/hildon-widgets/Makefile.am b/hildon-widgets/Makefile.am index 8e642b7..39c17a3 100644 --- a/hildon-widgets/Makefile.am +++ b/hildon-widgets/Makefile.am @@ -1,17 +1,21 @@ -INCLUDES = $(GTK_CFLAGS) $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) $(DBUS_CFLAGS) \ - -DLOCALEDIR=\"$(localedir)\" -I$(srcdir)/.. +INCLUDES = $(GTK_CFLAGS) $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) \ + $(ESD_CFLAGS) $(LIBMB_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -I$(srcdir)/.. lib_LTLIBRARIES = libhildonwidgets.la -EXTRA_DIST = +EXTRA_DIST = hildon-marshalers.list + +libhildonwidgets_la_LDFLAGS = -version-info 5:0:5 libhildonwidgets_la_LIBADD = $(GTK_LIBS) $(GNOME_VFS_LIBS) $(GCONF_LIBS) \ - $(DBUS_LIBS) -libhildonwidgets_la_LDFLAGS = -version-info 3:0:3 + $(ESD_LIBS) $(LIBMB_LIBS) + libhildonwidgets_la_SOURCES = \ - hildon-composite-widget.c \ + hildon-marshalers.c \ + hildon-marshalers.h \ + hildon-composite-widget.c \ hildon-composite-widget.h \ - hildon-controlbar.c \ + hildon-controlbar.c \ hildon-controlbar.h \ hildon-seekbar.c \ hildon-seekbar.h \ @@ -19,8 +23,6 @@ libhildonwidgets_la_SOURCES = \ hildon-color-selector.h \ hildon-note.c \ hildon-note.h \ - hildon-search.c \ - hildon-search.h \ hildon-volumebar.c \ hildon-volumebar.h \ hildon-volumebar-range.c \ @@ -56,25 +58,19 @@ libhildonwidgets_la_SOURCES = \ hildon-sort-dialog.h \ hildon-add-home-dialog.c \ hildon-add-home-dialog.h \ - hildon-find-object-dialog.c \ - hildon-find-object-dialog.h \ hildon-font-selection-dialog.c \ hildon-font-selection-dialog.h \ hildon-insert-object-dialog.c \ hildon-insert-object-dialog.h \ - hildon-file-details-dialog.c \ - hildon-file-details-dialog.h \ - hildon-grid.c \ - hildon-grid.h \ + hildon-grid.c \ + hildon-grid.h \ hildon-grid-item.c \ hildon-grid-item.h \ hildon-grid-item-private.h \ hildon-file-handling-note.c \ hildon-file-handling-note.h \ hildon-name-password-dialog.c \ - hildon-name-password-dialog.h \ - hildon-find-replace-dialog.c \ - hildon-find-replace-dialog.h \ + hildon-name-password-dialog.h \ hildon-scroll-area.c \ hildon-scroll-area.h \ hildon-wizard-dialog.c \ @@ -82,7 +78,44 @@ libhildonwidgets_la_SOURCES = \ hildon-color-popup.c \ hildon-color-popup.h \ hildon-color-button.c \ - hildon-color-button.h + hildon-color-button.h \ + hildon-system-sound.c \ + hildon-system-sound.h \ + hildon-app.c \ + hildon-app.h \ + hildon-defines.c \ + hildon-defines.h \ + hildon-appview.c \ + hildon-appview.h \ + hildon-find-toolbar.c \ + hildon-find-toolbar.h \ + gtk-infoprint.c \ + gtk-infoprint.h \ + hildon-banner.c \ + hildon-banner.h \ + hildon-input-mode-hint.h \ + hildon-app-private.h \ + hildon-caption.c \ + hildon-caption.h \ + hildon-window.c \ + hildon-window.h \ + hildon-window-private.h \ + hildon-program.c \ + hildon-program.h \ + hildon-code-dialog.c \ + hildon-code-dialog.h \ + $(hildonlibs_built_headers) \ + $(hildonlibs_built_cfiles) + + +hildon-marshalers.h: hildon-marshalers.list + glib-genmarshal --prefix _hildon_marshal --header \ + hildon-marshalers.list >hildon-marshalers.h + +hildon-marshalers.c: hildon-marshalers.list hildon-marshalers.h + echo '#include ' >hildon-marshalers.c + glib-genmarshal --prefix _hildon_marshal --body \ + hildon-marshalers.list >>hildon-marshalers.c hildonwidgetsincludeinstdir=$(includedir)/hildon-widgets hildonwidgetsincludeinst_DATA = \ @@ -90,7 +123,6 @@ hildonwidgetsincludeinst_DATA = \ hildon-note.h \ hildon-seekbar.h \ hildon-color-selector.h \ - hildon-search.h \ hildon-volumebar.h \ hildon-hvolumebar.h \ hildon-vvolumebar.h \ @@ -107,16 +139,64 @@ hildonwidgetsincludeinst_DATA = \ hildon-set-password-dialog.h \ hildon-sort-dialog.h \ hildon-add-home-dialog.h \ - hildon-find-object-dialog.h \ hildon-font-selection-dialog.h \ hildon-insert-object-dialog.h \ - hildon-file-details-dialog.h \ hildon-grid.h \ hildon-grid-item.h \ hildon-file-handling-note.h \ - hildon-name-password-dialog.h \ - hildon-find-replace-dialog.h \ + hildon-name-password-dialog.h \ hildon-scroll-area.h \ hildon-wizard-dialog.h \ hildon-color-popup.h \ - hildon-color-button.h + hildon-color-button.h \ + hildon-system-sound.h \ + hildon-app.h \ + hildon-defines.h \ + hildon-appview.h \ + hildon-find-toolbar.h \ + gtk-infoprint.h \ + hildon-banner.h \ + hildon-input-mode-hint.h \ + hildon-app-private.h \ + hildon-caption.h \ + hildon-window.h \ + hildon-program.h \ + hildon-window-private.h \ + hildon-code-dialog.h + +headers_to_scan_for_enums = $(hildonwidgetsincludeinst_DATA) + +# Generate the enums source code, with glib-mkenums: +# This is based on the same Makefile.am stuff in pango: +hildonlibs_built_headers = hildon-libs-enum-types.h +hildonlibs_built_cfiles = hildon-libs-enum-types.c + +# Don't build the library until we have built the header that it needs: +$(OBJECTS) $(libhildonwidgets_la_OBJECTS): $(hildonlibs_built_headers) + +hildon-libs-enum-types.h: @REBUILD@ $(headers_to_scan_for_enums) Makefile + (cd $(srcdir) && glib-mkenums \ + --fhead "#ifndef __HILDON_LIBS_ENUM_TYPES_H__\n#define __HILDON_LIBS_ENUM_TYPES_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define HILDON_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* __HILDON_LIBS_ENUM_TYPES_H__ */" \ + $(headers_to_scan_for_enums)) > $@ + +#FIXME: This would be shorter if there was a hildon-libs.h file: +hildon-libs-enum-types.c: @REBUILD@ $(headers_to_scan_for_enums) Makefile + (cd $(srcdir) && glib-mkenums \ + --fhead "#include \n" \ + --fhead "#include \n" \ + --fhead "#include \n" \ + --fhead "#include \n" \ + --fhead "#include \n" \ + --fhead "#include \n" \ + --fhead "#include \n" \ + --fhead "#include \n" \ + --fhead '#include "hildon-libs-enum-types.h"\n' \ + --fhead "#include " \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $(headers_to_scan_for_enums)) > $@