[Debtags-commits] [svn] r719 - in libtagcoll/trunk: . debian tagcoll tagcoll/tagexpr tests

[Enrico Zini]

Author: enrico
Date: Thu May 12 13:40:15 2005
New Revision: 719

Added:
   libtagcoll/trunk/debian/libtagcoll1-pic.install
      - copied, changed from r714, libtagcoll/trunk/debian/libtagcoll1-dev.install
Modified:
   libtagcoll/trunk/debian/control
   libtagcoll/trunk/debian/libtagcoll1-dev.install
   libtagcoll/trunk/libtagcoll.pc.in
   libtagcoll/trunk/tagcoll/Makefile.am
   libtagcoll/trunk/tagcoll/tagexpr/Makefile.am
   libtagcoll/trunk/tests/Makefile.am
Log:
Updated Debian control files to package the -pic library

Modified: libtagcoll/trunk/debian/control
==============================================================================
--- libtagcoll/trunk/debian/control	(original)
+++ libtagcoll/trunk/debian/control	Thu May 12 13:40:15 2005
@@ -24,3 +24,26 @@
  future versions.  This is why the library is distributed in a -dev package
  only.
 
+Package: libtagcoll1-pic
+Section: libdevel
+Depends: libtagcoll1-dev
+Architecture: any
+Description: Functions used to manipulate tagged collections (PIC library version)
+ Tagged collections are collections of items tagged with multiple categories.
+ libtagcoll provides general infrastructure to handle tagged collection data,
+ plus various kind of tagged collection manipulation functions:
+ .
+  * apply various kinds of transformations to the collection;
+  * generate and apply tag patches;
+  * discover and show implicit hierarchical relationships between
+    tags;
+  * organize the collection in an intuitively navigable hierarchy.
+  * keep an on-disk index of the tag data
+ .
+ Warning: the API has not yet been stabilized and is subject to change in
+ future versions.  This is why the library is distributed in a -dev package
+ only.
+ .
+ This package contains a library with position independent code that can be
+ used to link tagcoll functions into shared objects such as perl or python
+ bindings.

Modified: libtagcoll/trunk/debian/libtagcoll1-dev.install
==============================================================================
--- libtagcoll/trunk/debian/libtagcoll1-dev.install	(original)
+++ libtagcoll/trunk/debian/libtagcoll1-dev.install	Thu May 12 13:40:15 2005
@@ -1,6 +1,5 @@
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.a
+debian/tmp/usr/lib/libtagcoll1.a
+debian/tmp/usr/lib/libtagcoll1.la
 debian/tmp/usr/lib/pkgconfig/*
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/lib*.so
 debian/tmp/usr/share/aclocal/*.m4

Copied: libtagcoll/trunk/debian/libtagcoll1-pic.install (from r714, libtagcoll/trunk/debian/libtagcoll1-dev.install)
==============================================================================
--- libtagcoll/trunk/debian/libtagcoll1-dev.install	(original)
+++ libtagcoll/trunk/debian/libtagcoll1-pic.install	Thu May 12 13:40:15 2005
@@ -1,6 +1,2 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.a
-debian/tmp/usr/lib/pkgconfig/*
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/share/aclocal/*.m4
+debian/tmp/usr/lib/libtagcoll1_pic.a
+debian/tmp/usr/lib/libtagcoll1_pic.la

Modified: libtagcoll/trunk/libtagcoll.pc.in
==============================================================================
--- libtagcoll/trunk/libtagcoll.pc.in	(original)
+++ libtagcoll/trunk/libtagcoll.pc.in	Thu May 12 13:40:15 2005
@@ -7,4 +7,4 @@
 Description: Manipulate tags and tagged collections
 Version: @VERSION@
 Cflags: -I${includedir}/tagcoll-1.0
-Libs: -L${libdir} -ltagcoll -ltdb -lz
+Libs: -L${libdir} -ltagcoll1 -ltdb -lz

Modified: libtagcoll/trunk/tagcoll/Makefile.am
==============================================================================
--- libtagcoll/trunk/tagcoll/Makefile.am	(original)
+++ libtagcoll/trunk/tagcoll/Makefile.am	Thu May 12 13:40:15 2005
@@ -58,8 +58,8 @@
 		TDBReadonlyDiskIndex.cc \
 		TaggedCollection.h
 
-lib_LTLIBRARIES = libtagcoll.la libtagcoll_pic.la
-libtagcoll_la_SOURCES = \
+lib_LTLIBRARIES = libtagcoll1.la libtagcoll1_pic.la
+libtagcoll1_la_SOURCES = \
 		OpSet.cc \
 		TagcollConsumer.cc \
 		TagcollFilter.cc \
@@ -93,15 +93,20 @@
 		instantiations1.cc \
 		instantiations2.cc \
 		instantiations3.cc
-libtagcoll_la_LIBADD = tagexpr/libtagexpr.la -ltdb
-libtagcoll_la_LDFLAGS = -version-info @LIBTAGCOLL_VERSION_INFO@
+libtagcoll1_la_LIBADD = tagexpr/libtagexpr.la -ltdb
+libtagcoll1_la_LDFLAGS = -version-info @LIBTAGCOLL_VERSION_INFO@ -static
 
-# Build a _pic library so that 
-# Libtool complains 
-libtagcoll_pic_la_DEPENDENCIES = libtagcoll.la
-libtagcoll_pic_la_SOURCES =
-libtagcoll_pic_la_LIBADD = \
-	$(addprefix .libs/,$(libtagcoll_la_SOURCES:.cc=.o)) \
-	$(libtagcoll_la_LIBADD)
+# Build a _pic library so that one can statically link tagcoll code into a
+# shared object (such as perl or python bindings)
+# 
+# Libtool complains that linking non-libtool objects this way can be not
+# portable, but then I don't know how to convince libtool in doing things
+# differently
+libtagcoll1_pic_la_DEPENDENCIES = libtagcoll1.la
+libtagcoll1_pic_la_SOURCES =
+libtagcoll1_pic_la_LIBADD = \
+	$(addprefix .libs/,$(libtagcoll1_la_SOURCES:.cc=.o)) \
+	tagexpr/libtagexpr_pic.la -ltdb	
+libtagcoll1_pic_la_LDFLAGS = -static
 
 INCLUDES = -I$(top_srcdir)/tests/

Modified: libtagcoll/trunk/tagcoll/tagexpr/Makefile.am
==============================================================================
--- libtagcoll/trunk/tagcoll/tagexpr/Makefile.am	(original)
+++ libtagcoll/trunk/tagcoll/tagexpr/Makefile.am	Thu May 12 13:40:15 2005
@@ -1,17 +1,27 @@
 ## Process this file with automake to produce Makefile.in
 
-tagexprincludedir=$(includedir)/tagcoll/tagexpr
+tagexprincludedir = $(includedir)/tagcoll-1.0/tagcoll/tagexpr
 
 tagexprinclude_HEADERS = \
 		Tagexpr.h \
 		TagexprParser.h
 
-noinst_LTLIBRARIES = libtagexpr.la
+noinst_LTLIBRARIES = libtagexpr.la libtagexpr_pic.la
 libtagexpr_la_SOURCES = \
 		Tagexpr.cc \
 		TagexprParser.cc \
 		Tagexpr_parser_y.yy Tagexpr_parser_l.ll
 
+# Build a _pic library so that one can statically link tagcoll code into a
+# shared object (such as perl or python bindings)
+# 
+# Libtool complains that linking non-libtool objects this way can be not
+# portable, but then I don't know how to convince libtool in doing things
+# differently
+libtagexpr_pic_la_DEPENDENCIES = libtagexpr.la
+libtagexpr_pic_la_SOURCES =
+libtagexpr_pic_la_LIBADD = $(addprefix .libs/,$(libtagexpr_la_SOURCES:.cc=.o)) 
+
 INCLUDES = -I..
 
 AM_YFLAGS = -d

Modified: libtagcoll/trunk/tests/Makefile.am
==============================================================================
--- libtagcoll/trunk/tests/Makefile.am	(original)
+++ libtagcoll/trunk/tests/Makefile.am	Thu May 12 13:40:15 2005
@@ -1,17 +1,17 @@
 TESTS = libtagcoll-test
 check_PROGRAMS = libtagcoll-test
 libtagcoll_test_SOURCES = tut-main.cpp test-inputmerger.cc test-textformat.cc test-tdbindexer.cc test-tdbdiskindex.cc test-tdbreadonlydiskindex.cc
-libtagcoll_test_LDADD = ../tagcoll/libtagcoll.la
+libtagcoll_test_LDADD = ../tagcoll/libtagcoll1.la
 
 noinst_PROGRAMS = dump-tdbdi
 # test-tagset
 
 dump_tdbdi_SOURCES = \
 	dump-tdbdi.cc
-dump_tdbdi_LDADD = ../tagcoll/libtagcoll.la
+dump_tdbdi_LDADD = ../tagcoll/libtagcoll1.la
 
 #test_tagset_SOURCES = \
 	#test-tagset.cc
-#test_tagset_LDADD = ../tagcoll/libtagcoll.la
+#test_tagset_LDADD = ../tagcoll/libtagcoll1.la
 
 INCLUDES=-I..