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

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Thu Jan 10 16:37:59 EET 2008 
Author: xan
Date: 2008-01-10 16:37:58 +0200 (Thu, 10 Jan 2008)
New Revision: 15050

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/configure.ac
   projects/haf/trunk/hildon-1/pkgconfig/Makefile.am
   projects/haf/trunk/hildon-1/pkgconfig/hildon.pc.in
   projects/haf/trunk/hildon-1/src/Makefile.am
Log:
2008-01-10  Xan Lopez  <xan.lopez at nokia.com>

	* configure.ac:
	* pkgconfig/Makefile.am:
	* pkgconfig/hildon.pc.in:
	* src/Makefile.am:

	Do not use PACKAGE_VERSION_MAJOR as the API revision,
	use newly created API_MAJOR_VERSION.


Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2008-01-10 12:46:13 UTC (rev 15049)
+++ projects/haf/trunk/hildon-1/ChangeLog	2008-01-10 14:37:58 UTC (rev 15050)
@@ -1,3 +1,13 @@
+2008-01-10  Xan Lopez  <xan.lopez at nokia.com>
+
+	* configure.ac:
+	* pkgconfig/Makefile.am:
+	* pkgconfig/hildon.pc.in:
+	* src/Makefile.am:
+
+	Do not use PACKAGE_VERSION_MAJOR as the API revision,
+	use newly created API_MAJOR_VERSION.
+	
 2008-01-09  Xan Lopez  <xan.lopez at nokia.com>
 
 	[2.0.0-1 release]

Modified: projects/haf/trunk/hildon-1/configure.ac
===================================================================
--- projects/haf/trunk/hildon-1/configure.ac	2008-01-10 12:46:13 UTC (rev 15049)
+++ projects/haf/trunk/hildon-1/configure.ac	2008-01-10 14:37:58 UTC (rev 15050)
@@ -9,6 +9,10 @@
 # define PACKAGE_VERSION_* variables
 AS_VERSION
 
+#define API_VERSION_MAJOR
+API_VERSION_MAJOR=1
+AC_SUBST(API_VERSION_MAJOR)
+
 # set the libtool versioning
 # Quick guide into libtool versioning:
 # 1. Start with version information of `0:0:0' for each libtool library.
@@ -171,7 +175,7 @@
 # includes all the low-level flags
 # FIXME Add esd and gconf flags
 HILDON_OBJ_CFLAGS="\$(CFLAGS) \$(GTK_CFLAGS) \$(CHECK_CFLAGS) \$(GCONF_CFLAGS) -I\$(top_builddir)/src/"
-HILDON_OBJ_LIBS="\$(top_builddir)/src/libhildon-\$(PACKAGE_VERSION_MAJOR).la \$(GTK_LIBS) \$(GCONF_LIBS) \$(CHECK_LIBS) `pkg-config --libs gthread-2.0`"
+HILDON_OBJ_LIBS="\$(top_builddir)/src/libhildon-\$(API_VERSION_MAJOR).la \$(GTK_LIBS) \$(GCONF_LIBS) \$(CHECK_LIBS) `pkg-config --libs gthread-2.0`"
 AC_SUBST(HILDON_OBJ_CFLAGS)
 AC_SUBST(HILDON_OBJ_LIBS)
 
@@ -195,7 +199,7 @@
 
 - Package:...........: ${PACKAGE}
 - Version............: ${VERSION}
-- Api................: ${PACKAGE}-${PACKAGE_VERSION_MAJOR}
+- Api................: ${PACKAGE}-${API_VERSION_MAJOR}
 - Compiler...........: ${CC}
 - gtk-doc support....: ${enable_gtk_doc}
 - Build examples.....: ${BUILD_EXAMPLES}

Modified: projects/haf/trunk/hildon-1/pkgconfig/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-1/pkgconfig/Makefile.am	2008-01-10 12:46:13 UTC (rev 15049)
+++ projects/haf/trunk/hildon-1/pkgconfig/Makefile.am	2008-01-10 14:37:58 UTC (rev 15050)
@@ -1,13 +1,13 @@
 MAINTAINERCLEANFILES			= Makefile.in
 
-all-local: hildon- at PACKAGE_VERSION_MAJOR@.pc
+all-local: hildon- at API_VERSION_MAJOR@.pc
 
-hildon- at PACKAGE_VERSION_MAJOR@.pc: hildon.pc
+hildon- at API_VERSION_MAJOR@.pc: hildon.pc
 	cp $< $@
 
 pkgconfigdir				= $(libdir)/pkgconfig
-pkgconfig_DATA				= hildon- at PACKAGE_VERSION_MAJOR@.pc
+pkgconfig_DATA				= hildon- at API_VERSION_MAJOR@.pc
 
 EXTRA_DIST				= hildon.pc.in
-CLEANFILES				= hildon- at PACKAGE_VERSION_MAJOR@.pc
+CLEANFILES				= hildon- at API_VERSION_MAJOR@.pc
 

Modified: projects/haf/trunk/hildon-1/pkgconfig/hildon.pc.in
===================================================================
--- projects/haf/trunk/hildon-1/pkgconfig/hildon.pc.in	2008-01-10 12:46:13 UTC (rev 15049)
+++ projects/haf/trunk/hildon-1/pkgconfig/hildon.pc.in	2008-01-10 14:37:58 UTC (rev 15050)
@@ -1,11 +1,11 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/hildon- at PACKAGE_VERSION_MAJOR@
+includedir=@includedir@/hildon- at API_VERSION_MAJOR@
 
 Name: hildon
 Description: Hildon widgets library
 Requires: gtk+-2.0 >= @GTK_VERSION@
 Version: @VERSION@
-Libs: -L${libdir} -lhildon- at PACKAGE_VERSION_MAJOR@
+Libs: -L${libdir} -lhildon- at API_VERSION_MAJOR@
 Cflags: -I${includedir} @MAEMO_CHANGES@

Modified: projects/haf/trunk/hildon-1/src/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-1/src/Makefile.am	2008-01-10 12:46:13 UTC (rev 15049)
+++ projects/haf/trunk/hildon-1/src/Makefile.am	2008-01-10 14:37:58 UTC (rev 15050)
@@ -1,4 +1,4 @@
-INCLUDES 						= -DG_LOG_DOMAIN=\"hildon- at PACKAGE_VERSION_MAJOR@\" \
+INCLUDES 						= -DG_LOG_DOMAIN=\"hildon- at API_VERSION_MAJOR@\" \
 							  -DLOCALEDIR=\"$(localedir)\"
 
 MAINTAINERCLEANFILES 					= Makefile.in 					\
@@ -9,21 +9,21 @@
 
 EXTRA_DIST 						= hildon-marshalers.list
 
-lib_LTLIBRARIES 					= libhildon- at PACKAGE_VERSION_MAJOR@.la
+lib_LTLIBRARIES 					= libhildon- at API_VERSION_MAJOR@.la
 
-libhildon_ at PACKAGE_VERSION_MAJOR@_la_LDFLAGS 		= $(HILDON_WIDGETS_LT_LDFLAGS)
+libhildon_ at API_VERSION_MAJOR@_la_LDFLAGS 		= $(HILDON_WIDGETS_LT_LDFLAGS)
 
-libhildon_ at PACKAGE_VERSION_MAJOR@_la_LIBADD 		= $(GTK_LIBS) 					\
+libhildon_ at API_VERSION_MAJOR@_la_LIBADD 		= $(GTK_LIBS) 					\
 							  $(GCONF_LIBS) 				\
 							  $(ESD_LIBS)					\
 							  @HILDON_LT_LDFLAGS@ 
 
 
-libhildon_ at PACKAGE_VERSION_MAJOR@_la_CFLAGS		= $(GTK_CFLAGS) 				\
+libhildon_ at API_VERSION_MAJOR@_la_CFLAGS		        = $(GTK_CFLAGS) 				\
 							  $(GCONF_CFLAGS) 				\
 							  $(ESD_CFLAGS)	
 
-libhildon_ at PACKAGE_VERSION_MAJOR@_la_SOURCES 		= hildon-private.c				\
+libhildon_ at API_VERSION_MAJOR@_la_SOURCES 		= hildon-private.c				\
 							  hildon-controlbar.c 				\
 							  hildon-seekbar.c 				\
 							  hildon-note.c 				\
@@ -63,13 +63,13 @@
 							  hildon-bread-crumb.c				\
 							  hildon-bread-crumb-widget.c
 
-libhildon_ at PACKAGE_VERSION_MAJOR@_built_public_headers  = \
+libhildon_ at API_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 API_VERSION_MAJOR@_includedir		= $(includedir)/$(PACKAGE)-$(API_VERSION_MAJOR)/$(PACKAGE)
 
-libhildon_ at PACKAGE_VERSION_MAJOR@_public_headers 	= hildon-banner.h 				\
+libhildon_ at API_VERSION_MAJOR@_public_headers 	        = hildon-banner.h 				\
 							  hildon-calendar-popup.h 			\
 							  hildon-caption.h 				\
 							  hildon-code-dialog.h 				\
@@ -107,8 +107,8 @@
 							  hildon-bread-crumb.h				\
 							  hildon-version.h
 
-libhildon_ at PACKAGE_VERSION_MAJOR@_include_HEADERS 	= $(libhildon_ at PACKAGE_VERSION_MAJOR@_public_headers)			\
-							  $(libhildon_ at PACKAGE_VERSION_MAJOR@_built_public_headers)
+libhildon_ at API_VERSION_MAJOR@_include_HEADERS 	        = $(libhildon_ at API_VERSION_MAJOR@_public_headers)			\
+							  $(libhildon_ at API_VERSION_MAJOR@_built_public_headers)
 
 noinst_HEADERS						= hildon-banner-private.h 			\
 							  hildon-calendar-popup-private.h 		\
@@ -141,9 +141,9 @@
 							  hildon-bread-crumb-widget.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 hildon-marshalers.c hildon-marshalers.h
+$(OBJECTS) $(libhildon_$(API_VERSION_MAJOR)_la_OBJECTS): hildon-enum-types.h hildon-marshalers.c hildon-marshalers.h
 
-hildon-enum-types.h: 					  @REBUILD@ $(libhildon_$(PACKAGE_VERSION_MAJOR)_public_headers) Makefile
+hildon-enum-types.h: 					  @REBUILD@ $(libhildon_$(API_VERSION_MAJOR)_public_headers) Makefile
 	(cd $(srcdir) && glib-mkenums 						\
 			--fhead "#ifndef __HILDON_ENUM_TYPES_H__\n" 		\
 			--fhead "#define __HILDON_ENUM_TYPES_H__\n" 		\
@@ -155,9 +155,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)_public_headers)) > $@
+		$(libhildon_$(API_VERSION_MAJOR)_public_headers)) > $@
 
-hildon-enum-types.c: 					  @REBUILD@ $(libhildon_$(PACKAGE_VERSION_MAJOR)_public_headers) Makefile
+hildon-enum-types.c: 					  @REBUILD@ $(libhildon_$(API_VERSION_MAJOR)_public_headers) Makefile
 	(cd $(srcdir) && glib-mkenums 						\
 			--fhead "#include \"hildon.h\"\n" 			\
 			--fhead "#include <glib-object.h>" 			\
@@ -165,7 +165,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)_public_headers)) > $@
+		$(libhildon_$(API_VERSION_MAJOR)_public_headers)) > $@
 
 hildon-marshalers.h: 					hildon-marshalers.list
 	glib-genmarshal --prefix _hildon_marshal --header hildon-marshalers.list >hildon-marshalers.h
More information about the maemo-commits mailing list