r2558 - in trunk/src/target/OM-2007.2/libraries/libmokojournal2: . mokojournal tests

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-07-28 14:36:08 +0200 (Sat, 28 Jul 2007)
New Revision: 2558

Added:
   trunk/src/target/OM-2007.2/libraries/libmokojournal2/libmokojournal2.pc.in
Removed:
   trunk/src/target/OM-2007.2/libraries/libmokojournal2/libmokojournal.pc.in
Modified:
   trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
   trunk/src/target/OM-2007.2/libraries/libmokojournal2/Makefile.am
   trunk/src/target/OM-2007.2/libraries/libmokojournal2/configure.ac
   trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/Makefile.am
   trunk/src/target/OM-2007.2/libraries/libmokojournal2/tests/Makefile.am
Log:
libmokojournal2: bump library name and version


Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog	2007-07-28 12:31:58 UTC (rev 2557)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog	2007-07-28 12:36:08 UTC (rev 2558)
@@ -1,3 +1,12 @@
+2007-07-28	Michael Lauer <mickey at openmoko.org>
+
+	* configure.ac:
+	* Makefile.am:
+	* libmokojournal2.pc.in:
+	* libmokojournal.pc.in:
+	* libmokojournal/Makefile.am:
+	Bump library name and version.
+
 2007-07-27  Neil J. Patel  <njp at o-hand.com>
 
 	* mokojournal/moko-journal.c: (moko_journal_class_init):

Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/Makefile.am	2007-07-28 12:31:58 UTC (rev 2557)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/Makefile.am	2007-07-28 12:36:08 UTC (rev 2558)
@@ -1,6 +1,6 @@
 SUBDIRS = mokojournal tests
 
-pcdata_DATA= libmokojournal.pc
+pcdata_DATA= libmokojournal2.pc
 pcdatadir= $(libdir)/pkgconfig
 
 EXTRA_DIST= $(pcdata_DATA)

Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/configure.ac	2007-07-28 12:31:58 UTC (rev 2557)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/configure.ac	2007-07-28 12:36:08 UTC (rev 2558)
@@ -1,5 +1,5 @@
 AC_PREREQ(2.53)
-AC_INIT(libmokojournal, 0.0.4, http://www.openmoko.org/)
+AC_INIT(libmokojournal2, 0.1.0, http://www.openmoko.org/)
 AM_INIT_AUTOMAKE()
 AC_CONFIG_SRCDIR(mokojournal/moko-journal.c)
 AM_CONFIG_HEADER(config.h)
@@ -28,7 +28,7 @@
 # output stuff
 AC_OUTPUT([
 Makefile
-libmokojournal.pc
+libmokojournal2.pc
 mokojournal/Makefile
 tests/Makefile
 ])

Deleted: trunk/src/target/OM-2007.2/libraries/libmokojournal2/libmokojournal.pc.in
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/libmokojournal.pc.in	2007-07-28 12:31:58 UTC (rev 2557)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/libmokojournal.pc.in	2007-07-28 12:36:08 UTC (rev 2558)
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/libmokojournal
-
-Name: libmokojournal
-Description: OpenMoko Journal Development Library
-Version: @VERSION@
-Cflags: -I${includedir}
-Libs: -L${libdir} -lmokojournal
-Requires: libecal-1.2 

Copied: trunk/src/target/OM-2007.2/libraries/libmokojournal2/libmokojournal2.pc.in (from rev 2556, trunk/src/target/OM-2007.2/libraries/libmokojournal2/libmokojournal.pc.in)

Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/Makefile.am	2007-07-28 12:31:58 UTC (rev 2557)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/Makefile.am	2007-07-28 12:36:08 UTC (rev 2558)
@@ -1,13 +1,13 @@
-lib_LTLIBRARIES=libmokojournal.la
+lib_LTLIBRARIES=libmokojournal2.la
 
 public_headers=moko-journal.h moko-time.h
 sources=moko-journal.c moko-time.c
 
-libmokojournal_la_SOURCES= $(sources) $(public_headers)
-libmokojournal_la_LIBADD=
-libmokojournal_la_LDFLAGS= -version-info 0:0:0
+libmokojournal2_la_SOURCES= $(sources) $(public_headers)
+libmokojournal2_la_LIBADD=
+libmokojournal2_la_LDFLAGS= -version-info 0:1:0
 AM_CFLAGS = -Wall -pedantic -std=c99
 
-libmokojournalheadersdir=$(includedir)/libmokojournal
-libmokojournalheaders_DATA=$(public_headers)
+libmokojournal2headersdir=$(includedir)/libmokojournal2
+libmokojournal2headers_DATA=$(public_headers)
 

Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/tests/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/tests/Makefile.am	2007-07-28 12:31:58 UTC (rev 2557)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/tests/Makefile.am	2007-07-28 12:36:08 UTC (rev 2558)
@@ -1,13 +1,13 @@
 noinst_PROGRAMS=testcreate testdelete testdeleteuid
 
 testcreate_SOURCES=test-create.c
-testcreate_LDADD=@LIBS@ $(top_srcdir)/mokojournal/libmokojournal.la
+testcreate_LDADD=@LIBS@ $(top_srcdir)/mokojournal/libmokojournal2.la
 
 testdelete_SOURCES=test-delete.c
-testdelete_LDADD=@LIBS@ $(top_srcdir)/mokojournal/libmokojournal.la
+testdelete_LDADD=@LIBS@ $(top_srcdir)/mokojournal/libmokojournal2.la
 
 testdeleteuid_SOURCES=test-delete-uid.c
-testdeleteuid_LDADD=@LIBS@ $(top_srcdir)/mokojournal/libmokojournal.la
+testdeleteuid_LDADD=@LIBS@ $(top_srcdir)/mokojournal/libmokojournal2.la
 
 INCLUDES= -I $(top_srcdir)/mokojournal