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

Fri, 13 May 2005 12:22:43 +0000

Author: enrico
Date: Fri May 13 12:22:42 2005
New Revision: 723

Added:
   libtagcoll/trunk/libtagcoll1.m4
      - copied, changed from r721, libtagcoll/trunk/libtagcoll.m4
   libtagcoll/trunk/libtagcoll1.pc.in
      - copied unchanged from r722, libtagcoll/trunk/libtagcoll1.pc.it
Removed:
   libtagcoll/trunk/libtagcoll.m4
   libtagcoll/trunk/libtagcoll.pc.in
   libtagcoll/trunk/libtagcoll1.pc.it
Modified:
   libtagcoll/trunk/Makefile.am
   libtagcoll/trunk/TODO
   libtagcoll/trunk/configure.ac
   libtagcoll/trunk/debian/libtagcoll1-dev.install
   libtagcoll/trunk/debian/libtagcoll1-pic.install
   libtagcoll/trunk/tagcoll/Makefile.am
   libtagcoll/trunk/tagcoll/tagexpr/Makefile.am
   libtagcoll/trunk/tests/Makefile.am
Log:
Build and package static and static-pic libraries nice and fine

Modified: libtagcoll/trunk/Makefile.am
==============================================================================

--- libtagcoll/trunk/Makefile.am	(original)
+++ libtagcoll/trunk/Makefile.am	Fri May 13 12:22:42 2005
@@ -4,9 +4,9 @@
 #test doc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA=libtagcoll.pc
+pkgconfig_DATA=libtagcoll1.pc
 
 m4dir = $(datadir)/aclocal
-m4_DATA = libtagcoll.m4
+m4_DATA = libtagcoll1.m4
 
-EXTRA_DIST = libtagcoll.m4 libtagcoll.pc.in
+EXTRA_DIST = libtagcoll1.m4 libtagcoll1.pc.in

Modified: libtagcoll/trunk/TODO
==============================================================================
--- libtagcoll/trunk/TODO	(original)
+++ libtagcoll/trunk/TODO	Fri May 13 12:22:42 2005
@@ -1,12 +1,12 @@
 *** TODO for libtagcoll
 
- - Generate -pic library together with the normal -dev
+ + Generate -pic library together with the normal -dev
    http://lists.debian.org/debian-devel/2005/05/msg00425.html
    discover1-1.7.7 is an example of program generating -pic libraries with automake
 	from discover1's debian/rules:
 	  # This builds the pic library
 	  ar cqv lib/libdiscover_pic.a lib/.libs/*.o
-
+ - Report a wishlist bug to libtool asking for a feature to generate PIC libraries
 
  - Replace Consumers with functors:
    class Collection

Modified: libtagcoll/trunk/configure.ac
==============================================================================
--- libtagcoll/trunk/configure.ac	(original)
+++ libtagcoll/trunk/configure.ac	Fri May 13 12:22:42 2005
@@ -20,7 +20,9 @@
 AC_PROG_YACC
 
 dnl Use libtool
-AM_PROG_LIBTOOL
+dnl AM_PROG_LIBTOOL
+dnl Use ranlib instead while we don't need to generate shared libraries
+AC_PROG_RANLIB
 
 LIBTAGCOLL_VERSION_INFO=`echo $VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
 AC_SUBST(LIBTAGCOLL_VERSION_INFO)
@@ -33,7 +35,7 @@
 tagcoll/tagexpr/Makefile
 tests/Makefile
 doc/Makefile
-libtagcoll.pc
+libtagcoll1.pc
 ])
 AC_OUTPUT
 

Modified: libtagcoll/trunk/debian/libtagcoll1-dev.install
==============================================================================
--- libtagcoll/trunk/debian/libtagcoll1-dev.install	(original)
+++ libtagcoll/trunk/debian/libtagcoll1-dev.install	Fri May 13 12:22:42 2005
@@ -1,5 +1,4 @@
 debian/tmp/usr/include/*
 debian/tmp/usr/lib/libtagcoll1.a
-debian/tmp/usr/lib/libtagcoll1.la
 debian/tmp/usr/lib/pkgconfig/*
 debian/tmp/usr/share/aclocal/*.m4

Modified: libtagcoll/trunk/debian/libtagcoll1-pic.install
==============================================================================
--- libtagcoll/trunk/debian/libtagcoll1-pic.install	(original)
+++ libtagcoll/trunk/debian/libtagcoll1-pic.install	Fri May 13 12:22:42 2005
@@ -1,2 +1 @@
 debian/tmp/usr/lib/libtagcoll1_pic.a
-debian/tmp/usr/lib/libtagcoll1_pic.la

Copied: libtagcoll/trunk/libtagcoll1.m4 (from r721, libtagcoll/trunk/libtagcoll.m4)
==============================================================================
--- libtagcoll/trunk/libtagcoll.m4	(original)
+++ libtagcoll/trunk/libtagcoll1.m4	Fri May 13 12:22:42 2005
@@ -1,11 +1,11 @@
-# LIBTAGCOLL_DEFS([LIBTAGCOLL_REQS=libtagcoll1])
+# LIBTAGCOLL_DEFS([LIBTAGCOLL1_REQS=libtagcoll1])
 # ---------------------------------------
-AC_DEFUN([LIBTAGCOLL_DEFS],
+AC_DEFUN([LIBTAGCOLL1_DEFS],
 [
 	dnl Import libtagcoll data
-	PKG_CHECK_MODULES(LIBTAGCOLL,m4_default([$1], libtagcoll1))
-	AC_SUBST(LIBTAGCOLL_CFLAGS)
-	AC_SUBST(LIBTAGCOLL_LIBS)
-	LIBTAGCOLL_PICLIBS=`pkg-config --variable=PicLibs libtagcoll1`
-	AC_SUBST(LIBTAGCOLL_PICLIBS)
+	PKG_CHECK_MODULES(LIBTAGCOLL1,m4_default([$1], libtagcoll1))
+	AC_SUBST(LIBTAGCOLL1_CFLAGS)
+	AC_SUBST(LIBTAGCOLL1_LIBS)
+	LIBTAGCOLL1_PICLIBS=`pkg-config --variable=PicLibs m4_default([$1], libtagcoll1)`
+	AC_SUBST(LIBTAGCOLL1_PICLIBS)
 ])

Modified: libtagcoll/trunk/tagcoll/Makefile.am
==============================================================================
--- libtagcoll/trunk/tagcoll/Makefile.am	(original)
+++ libtagcoll/trunk/tagcoll/Makefile.am	Fri May 13 12:22:42 2005
@@ -58,8 +58,8 @@
 		TDBReadonlyDiskIndex.cc \
 		TaggedCollection.h
 
-lib_LTLIBRARIES = libtagcoll1.la libtagcoll1_pic.la
-libtagcoll1_la_SOURCES = \
+lib_LIBRARIES = libtagcoll1.a libtagcoll1_pic.a
+libtagcoll1_a_SOURCES = \
 		OpSet.cc \
 		TagcollConsumer.cc \
 		TagcollFilter.cc \
@@ -93,8 +93,14 @@
 		instantiations1.cc \
 		instantiations2.cc \
 		instantiations3.cc
-libtagcoll1_la_LIBADD = tagexpr/libtagexpr.la -ltdb
-libtagcoll1_la_LDFLAGS = -version-info @LIBTAGCOLL_VERSION_INFO@ -static
+libtagcoll1_a_LIBADD = \
+		tagexpr/Tagexpr.o \
+		tagexpr/TagexprParser.o \
+		tagexpr/Tagexpr_parser_l.o \
+		tagexpr/Tagexpr_parser_y.o
+
+#libtagcoll1_a_LDFLAGS = -ltdb
+#libtagcoll1_a_LDFLAGS = -version-info @LIBTAGCOLL_VERSION_INFO@ -static
 
 # Build a _pic library so that one can statically link tagcoll code into a
 # shared object (such as perl or python bindings)
@@ -102,11 +108,51 @@
 # 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
+#libtagcoll1_pic_a_DEPENDENCIES = libtagcoll1.la
+libtagcoll1_pic_a_SOURCES =
+libtagcoll1_pic_a_LIBADD = \
+	OpSet_pic.o \
+	TagcollConsumer_pic.o \
+	TagcollFilter_pic.o \
+	Changes_pic.o \
+	DerivedTags_pic.o \
+	Exception_pic.o \
+	ExpressionFilter_pic.o \
+	FilterChain_pic.o \
+	Implications_pic.o \
+	InputMerger_pic.o \
+	Patches_pic.o \
+	SmartHierarchy_pic.o \
+	stringf_pic.o \
+	ParserBase_pic.o \
+	StringParserInput_pic.o \
+	StdioParserInput_pic.o \
+	TextFormat_pic.o \
+	TagcollBuilder_pic.o \
+	TagcollReverser_pic.o \
+	ItemGrouper_pic.o \
+	UnfacetedRemover_pic.o \
+	TagCollection_pic.o \
+	Serializer_pic.o \
+	SerializationFilters_pic.o \
+	DiskIndex_pic.o \
+	TDBFile_pic.o \
+	TDBIndexer_pic.o \
+	TDBDiskIndex_pic.o \
+	TDBReadonlyDiskIndex_pic.o \
+	instantiations0_pic.o \
+	instantiations1_pic.o \
+	instantiations2_pic.o \
+	instantiations3_pic.o \
+	tagexpr/Tagexpr_pic.o \
+	tagexpr/TagexprParser_pic.o \
+	tagexpr/Tagexpr_parser_l_pic.o \
+	tagexpr/Tagexpr_parser_y_pic.o
+#libtagcoll1_pic_la_LDFLAGS = -ltdb	
+#libtagcoll1_pic_la_LDFLAGS = -static
+
+%_pic.$(OBJEXT): %.cc
+	$(CXXCOMPILE) -fPIC -c $< -o $@
+
 
 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	Fri May 13 12:22:42 2005
@@ -6,8 +6,8 @@
 		Tagexpr.h \
 		TagexprParser.h
 
-noinst_LTLIBRARIES = libtagexpr.la libtagexpr_pic.la
-libtagexpr_la_SOURCES = \
+noinst_LIBRARIES = libtagexpr.a libtagexpr_pic.a
+libtagexpr_a_SOURCES = \
 		Tagexpr.cc \
 		TagexprParser.cc \
 		Tagexpr_parser_y.yy Tagexpr_parser_l.ll
@@ -18,9 +18,17 @@
 # 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)) 
+#libtagexpr_pic_la_DEPENDENCIES = libtagexpr.la
+libtagexpr_pic_a_SOURCES =
+libtagexpr_pic_a_LIBADD = \
+		Tagexpr_pic.o \
+		TagexprParser_pic.o \
+		Tagexpr_parser_l_pic.o \
+		Tagexpr_parser_y_pic.o
+
+%_pic.$(OBJEXT): %.cc
+	$(CXXCOMPILE) -fPIC -c $< -o $@
+
 
 INCLUDES = -I..
 

Modified: libtagcoll/trunk/tests/Makefile.am
==============================================================================
--- libtagcoll/trunk/tests/Makefile.am	(original)
+++ libtagcoll/trunk/tests/Makefile.am	Fri May 13 12:22:42 2005
@@ -1,14 +1,14 @@
 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/libtagcoll1.la
+libtagcoll_test_LDADD = ../tagcoll/libtagcoll1.a -ltdb
 
 noinst_PROGRAMS = dump-tdbdi
 # test-tagset
 
 dump_tdbdi_SOURCES = \
 	dump-tdbdi.cc
-dump_tdbdi_LDADD = ../tagcoll/libtagcoll1.la
+dump_tdbdi_LDADD = ../tagcoll/libtagcoll1.a -ltdb
 
 #test_tagset_SOURCES = \
 	#test-tagset.cc


