r2554 - in trunk/src/target/OM-2007.2/libraries/libmokogsmd2: . libmokogsmd

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-07-28 13:46:00 +0200 (Sat, 28 Jul 2007)
New Revision: 2554

Added:
   trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd2.pc.in
Removed:
   trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd.pc.in
Modified:
   trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
   trunk/src/target/OM-2007.2/libraries/libmokogsmd2/Makefile.am
   trunk/src/target/OM-2007.2/libraries/libmokogsmd2/configure.ac
   trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/Makefile.am
Log:
libmokogsmd2: catch up with name changes


Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog	2007-07-28 11:30:06 UTC (rev 2553)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog	2007-07-28 11:46:00 UTC (rev 2554)
@@ -1,3 +1,11 @@
+2007-07-28	Michael Lauer <mickey at openmoko.org>
+
+	* configure.ac:
+	* libmokogsmd.pc.in:
+	* libmokogsmd2.pc.in:
+	* libmokogsmd/Makefile.am:
+	Change library name to libmokogsmd2
+
 2007-07-09  Neil J. Patel  <njp at o-hand.com>
 
 	* Makefile.am:

Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/Makefile.am	2007-07-28 11:30:06 UTC (rev 2553)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/Makefile.am	2007-07-28 11:46:00 UTC (rev 2554)
@@ -1,6 +1,6 @@
 SUBDIRS = libmokogsmd
 
-pcdata_DATA= libmokogsmd.pc
+pcdata_DATA= libmokogsmd2.pc
 pcdatadir= $(libdir)/pkgconfig
 
 EXTRA_DIST= $(pcdata_DATA)

Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/configure.ac	2007-07-28 11:30:06 UTC (rev 2553)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/configure.ac	2007-07-28 11:46:00 UTC (rev 2554)
@@ -1,5 +1,5 @@
 AC_PREREQ(2.53)
-AC_INIT(libmokogsmd, 0.0.4, http://www.openmoko.org/)
+AC_INIT(libmokogsmd2, 0.1.0, http://www.openmoko.org/)
 AM_INIT_AUTOMAKE()
 AC_CONFIG_SRCDIR(libmokogsmd/moko-gsmd-connection.c)
 AM_CONFIG_HEADER(config.h)
@@ -34,7 +34,7 @@
 # output stuff
 AC_OUTPUT([
 Makefile
-libmokogsmd.pc
+libmokogsmd2.pc
 libmokogsmd/Makefile
 ])
 

Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/Makefile.am	2007-07-28 11:30:06 UTC (rev 2553)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/Makefile.am	2007-07-28 11:46:00 UTC (rev 2554)
@@ -1,18 +1,18 @@
-lib_LTLIBRARIES=libmokogsmd.la
+lib_LTLIBRARIES=libmokogsmd2.la
 
 public_headers=moko-gsmd-connection.h
 built_sources=moko-gsmd-marshal.h moko-gsmd-marshal.c
 stamp_files=stamp-moko-gsmd-marshal.h stamp-moko-gsmd-marshal.c
 sources=moko-gsmd-connection.c
 
-$(libmokogsmd_la_OBJECTS): $(built_sources)
-libmokogsmd_la_SOURCES= $(public_headers) $(sources) $(built_sources)
-libmokogsmd_la_LIBADD=
-libmokogsmd_la_LDFLAGS= -version-info 0:0:0
+$(libmokogsmd2_la_OBJECTS): $(built_sources)
+libmokogsmd2_la_SOURCES= $(public_headers) $(sources) $(built_sources)
+libmokogsmd2_la_LIBADD=
+libmokogsmd2_la_LDFLAGS= -version-info 0:1:0
 AM_CFLAGS = -Wall -pedantic -std=c99
 
-libmokogsmdheadersdir=$(includedir)/libmokogsmd
-libmokogsmdheaders_DATA=$(public_headers)
+libmokogsmd2headersdir=$(includedir)/libmokogsmd2
+libmokogsmd2headers_DATA=$(public_headers)
 
 
 moko-gsmd-marshal.c: stamp-moko-gsmd-marshal.c

Deleted: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd.pc.in
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd.pc.in	2007-07-28 11:30:06 UTC (rev 2553)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd.pc.in	2007-07-28 11:46:00 UTC (rev 2554)
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/libmokoui
-
-Name: libmokogsmd
-Description: OpenMoko Gsmd Development Library
-Version: @VERSION
-Cflags: -I${includedir}
-Libs: -L${libdir} -lmokogsmd
-Requires: libgsmd glib-2.0

Copied: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd2.pc.in (from rev 2552, trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd.pc.in)
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd.pc.in	2007-07-28 11:05:46 UTC (rev 2552)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd2.pc.in	2007-07-28 11:46:00 UTC (rev 2554)
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include/libmokogsmd2
+
+Name: libmokogsmd
+Description: OpenMoko Gsmd GObject Development Library
+Version: @VERSION
+Cflags: -I${includedir}
+Libs: -L${libdir} -lmokogsmd2
+Requires: libgsmd glib-2.0