[maemo-commits] [maemo-commits] r12252 - in projects/haf/trunk/hildon-1: . src

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-06-12 17:25:19 +0300 (Tue, 12 Jun 2007)
New Revision: 12252

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/src/Makefile.am
   projects/haf/trunk/hildon-1/src/hildon-seekbar.c
Log:
2007-06-12  Xan Lopez  <xan.lopez at nokia.com>

	* src/Makefile.am: remove circular dependency in hildon-enum-types.h creation
	by splitting the installed headers in generated and non-generated groups. Use
	only the non-generated headers to create the hildon-enum-types.h file.

	* src/hildon-seekbar.h: gtkscale.h already includes gtkrange.h.


Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2007-06-12 14:08:10 UTC (rev 12251)
+++ projects/haf/trunk/hildon-1/ChangeLog	2007-06-12 14:25:19 UTC (rev 12252)
@@ -1,3 +1,11 @@
+2007-06-12  Xan Lopez  <xan.lopez at nokia.com>
+
+	* src/Makefile.am: remove circular dependency in hildon-enum-types.h creation
+	by splitting the installed headers in generated and non-generated groups. Use
+	only the non-generated headers to create the hildon-enum-types.h file.
+
+	* src/hildon-seekbar.h: gtkscale.h already includes gtkrange.h.
+
 2007-06-12  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
 	* src/hildon-window.c: Hide the window before performing the destroy.

Modified: projects/haf/trunk/hildon-1/src/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-1/src/Makefile.am	2007-06-12 14:08:10 UTC (rev 12251)
+++ projects/haf/trunk/hildon-1/src/Makefile.am	2007-06-12 14:25:19 UTC (rev 12252)
@@ -63,9 +63,13 @@
 							  hildon-bread-crumb.c				\
 							  hildon-bread-crumb-widget.c
 
+libhildon_ at PACKAGE_VERSION_MAJOR@_built_public_headers  =
+							  hildon-enum-types.h                           \
+							  hildon-marshalers.h
+
 libhildon_ at PACKAGE_VERSION_MAJOR@_includedir		= $(includedir)/$(PACKAGE)-$(PACKAGE_VERSION_MAJOR)/$(PACKAGE)
 
-libhildon_ at PACKAGE_VERSION_MAJOR@_include_HEADERS 	= hildon-banner.h 				\
+libhildon_ at PACKAGE_VERSION_MAJOR@_public_headers 	= hildon-banner.h 				\
 							  hildon-calendar-popup.h 			\
 							  hildon-caption.h 				\
 							  hildon-code-dialog.h 				\
@@ -75,14 +79,12 @@
 							  hildon-controlbar.h 				\
 							  hildon-date-editor.h 				\
 							  hildon-defines.h 				\
-							  hildon-enum-types.h 				\
 							  hildon-find-toolbar.h 			\
 							  hildon-helper.h				\
 							  hildon-font-selection-dialog.h 		\
 							  hildon-get-password-dialog.h 			\
 							  hildon-hvolumebar.h 				\
 							  hildon-login-dialog.h 			\
-							  hildon-marshalers.h 				\
 							  hildon-note.h 				\
 							  hildon-number-editor.h 			\
 							  hildon-program.h 				\
@@ -103,6 +105,9 @@
 							  hildon-calendar.h				\
 							  hildon-bread-crumb-trail.h			\
 							  hildon-bread-crumb.h
+			  
+libhildon_ at PACKAGE_VERSION_MAJOR@_include_HEADERS 	= $(libhildon_public_sources)			\
+							  $(libhildon_built_public_sources)
 
 noinst_HEADERS						= hildon-banner-private.h 			\
 							  hildon-calendar-popup-private.h 		\
@@ -137,7 +142,7 @@
 # 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 hildon-marshalers.c hildon-marshalers.h
 
-hildon-enum-types.h: 					  @REBUILD@ $(libhildon_$(PACKAGE_VERSION_MAJOR)_include_HEADERS) Makefile
+hildon-enum-types.h: 					  @REBUILD@ $(libhildon_$(PACKAGE_VERSION_MAJOR)_public_headers) Makefile
 	(cd $(srcdir) && glib-mkenums 						\
 			--fhead "#ifndef __HILDON_ENUM_TYPES_H__\n" 		\
 			--fhead "#define __HILDON_ENUM_TYPES_H__\n" 		\
@@ -149,9 +154,9 @@
 			--fprod "/* Enumerations from \"@filename@\" */\n" 	\
 			--vhead "GType @enum_name at _get_type (void);\n#define HILDON_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
 			--ftail "\nG_END_DECLS\n\n#endif /* __HILDON_ENUM_TYPES_H__ */" \
-		$(libhildon_$(PACKAGE_VERSION_MAJOR)_include_HEADERS)) > $@
+		$(libhildon_$(PACKAGE_VERSION_MAJOR)_public_headers)) > $@
 
-hildon-enum-types.c: 					  @REBUILD@ $(libhildon_$(PACKAGE_VERSION_MAJOR)_include_HEADERS) Makefile
+hildon-enum-types.c: 					  @REBUILD@ $(libhildon_$(PACKAGE_VERSION_MAJOR)_public_headers) Makefile
 	(cd $(srcdir) && glib-mkenums 						\
 			--fhead "#include \"hildon.h\"\n" 			\
 			--fhead "#include <glib-object.h>" 			\
@@ -159,7 +164,7 @@
 			--vhead "GType\n at enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G at Type@Value values[] = {" 	\
 			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
 			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_ at type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-		$(libhildon_$(PACKAGE_VERSION_MAJOR)_include_HEADERS)) > $@
+		$(libhildon_$(PACKAGE_VERSION_MAJOR)_public_headers)) > $@
 
 hildon-marshalers.h: 					hildon-marshalers.list
 	glib-genmarshal --prefix _hildon_marshal --header hildon-marshalers.list >hildon-marshalers.h

Modified: projects/haf/trunk/hildon-1/src/hildon-seekbar.c
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-seekbar.c	2007-06-12 14:08:10 UTC (rev 12251)
+++ projects/haf/trunk/hildon-1/src/hildon-seekbar.c	2007-06-12 14:25:19 UTC (rev 12252)
@@ -47,7 +47,6 @@
 #include                                        <gtk/gtkalignment.h>
 #include                                        <gtk/gtkadjustment.h>
 #include                                        <gtk/gtktoolbar.h>
-#include                                        <gtk/gtkrange.h>
 #include                                        <gdk/gdkkeysyms.h>
 #include                                        "hildon-seekbar-private.h"