[Debtags-commits] [svn] r726 - in libdebtags/trunk: . debian debtags swig swig/perl swig/python tests
Enrico Zini
debtags-commits@lists.alioth.debian.org
Fri, 13 May 2005 13:27:18 +0000
Author: enrico
Date: Fri May 13 13:27:17 2005
New Revision: 726
Added:
libdebtags/trunk/libdebtags1.m4
- copied, changed from r717, libdebtags/trunk/libdebtags.m4
libdebtags/trunk/libdebtags1.pc.in
- copied, changed from r718, libdebtags/trunk/libdebtags.pc.in
Removed:
libdebtags/trunk/libdebtags.m4
libdebtags/trunk/libdebtags.pc.in
Modified:
libdebtags/trunk/Makefile.am
libdebtags/trunk/configure.ac
libdebtags/trunk/debian/control
libdebtags/trunk/debian/libdebtags1-dev.install
libdebtags/trunk/debian/libdebtags1-pic.install
libdebtags/trunk/debtags/Makefile.am
libdebtags/trunk/swig/Makefile.am
libdebtags/trunk/swig/libdebtags.i
libdebtags/trunk/swig/perl/test.pl
libdebtags/trunk/swig/python/Makefile.am
libdebtags/trunk/tests/Makefile.am
Log:
Fixed pkg-config file to also report _pic libraries; finally fixed build system
Modified: libdebtags/trunk/Makefile.am
==============================================================================
--- libdebtags/trunk/Makefile.am (original)
+++ libdebtags/trunk/Makefile.am Fri May 13 13:27:17 2005
@@ -3,9 +3,9 @@
SUBDIRS = . debtags tests swig doc
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA=libdebtags.pc
+pkgconfig_DATA=libdebtags1.pc
m4dir = $(datadir)/aclocal
-m4_DATA = libdebtags.m4
+m4_DATA = libdebtags1.m4
-EXTRA_DIST = libdebtags.m4 libdebtags.pc.in
+EXTRA_DIST = libdebtags1.m4 libdebtags1.pc.in
Modified: libdebtags/trunk/configure.ac
==============================================================================
--- libdebtags/trunk/configure.ac (original)
+++ libdebtags/trunk/configure.ac Fri May 13 13:27:17 2005
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(libdebtags, 1.0, [enrico@debian.org])
+AC_INIT(libdebtags1, 1.0, [enrico@debian.org])
AC_CONFIG_SRCDIR([configure.ac])
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
@@ -25,12 +25,14 @@
dnl Use libtool
AM_PROG_LIBTOOL
+dnl ..and ranlib
+AC_PROG_RANLIB
LIBDEBTAGS_VERSION_INFO=`echo $VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
AC_SUBST(LIBDEBTAGS_VERSION_INFO)
dnl Use libtagcoll
-LIBTAGCOLL_DEFS
+LIBTAGCOLL1_DEFS
statedir='$(localstatedir)'/lib/debtags
AC_SUBST(statedir)
@@ -82,7 +84,7 @@
swig/python/Makefile
swig/perl/Makefile.PL
doc/Makefile
-libdebtags.pc
+libdebtags1.pc
])
AC_OUTPUT
Modified: libdebtags/trunk/debian/control
==============================================================================
--- libdebtags/trunk/debian/control (original)
+++ libdebtags/trunk/debian/control Fri May 13 13:27:17 2005
@@ -10,7 +10,7 @@
Depends: libtagcoll1-dev (>= 1.0), libtagcoll1-dev (<< 1.1), libapt-pkg-dev
Recommends: pkg-config
Conflicts: libdebtags-dev
-Description: Unified access to Debtags and APT databases (development version)
+Description: Next generation Debian package categorization system (development version)
libdebtags provides functionality to search and categorize debian packages
using the Debtags and APT databases. Functions provided:
.
@@ -30,7 +30,7 @@
Section: libdevel
Architecture: any
Depends: libdebtags1-dev
-Description: Unified access to Debtags and APT databases (PIC library version)
+Description: Next generation Debian package categorization system (PIC library version)
libdebtags provides functionality to search and categorize debian packages
using the Debtags and APT databases. Functions provided:
.
@@ -54,7 +54,7 @@
Section: python
Architecture: any
Depends: ${python:Depends}, ${shlibs:Depends}
-Description: Python wrapper for the libdebtags library
+Description: Next generation Debian package categorization system (Python module)
libdebtags provides functionality to search and categorize debian packages
using the Debtags and APT databases. Functions provided:
.
Modified: libdebtags/trunk/debian/libdebtags1-dev.install
==============================================================================
--- libdebtags/trunk/debian/libdebtags1-dev.install (original)
+++ libdebtags/trunk/debian/libdebtags1-dev.install Fri May 13 13:27:17 2005
@@ -1,5 +1,5 @@
debian/tmp/usr/include/*
debian/tmp/usr/lib/libdebtags1.a
-debian/tmp/usr/lib/libdebtags1.la
debian/tmp/usr/lib/pkgconfig/*
debian/tmp/usr/share/aclocal/*.m4
+debian/tmp/usr/share/libdebtags1/*
Modified: libdebtags/trunk/debian/libdebtags1-pic.install
==============================================================================
--- libdebtags/trunk/debian/libdebtags1-pic.install (original)
+++ libdebtags/trunk/debian/libdebtags1-pic.install Fri May 13 13:27:17 2005
@@ -1,2 +1 @@
debian/tmp/usr/lib/libdebtags1_pic.a
-debian/tmp/usr/lib/libdebtags1_pic.la
Modified: libdebtags/trunk/debtags/Makefile.am
==============================================================================
--- libdebtags/trunk/debtags/Makefile.am (original)
+++ libdebtags/trunk/debtags/Makefile.am Fri May 13 13:27:17 2005
@@ -27,8 +27,8 @@
# Not include Regexp.h
-lib_LTLIBRARIES = libdebtags1.la libdebtags1_pic.la
-libdebtags1_la_SOURCES = \
+lib_LIBRARIES = libdebtags1.a libdebtags1_pic.a
+libdebtags1_a_SOURCES = \
Paths.cc \
Regexp.cc \
ZlibParserInput.cc \
@@ -52,8 +52,8 @@
BasicPackageMatcher.cc \
Environment.cc \
instantiations.cc
-libdebtags1_la_LDFLAGS = -version-info @LIBDEBTAGS_VERSION_INFO@ -static
-libdebtags1_la_LIBADD = $(LIBTAGCOLL_LIBS)
+#libdebtags1_la_LDFLAGS = -version-info @LIBDEBTAGS_VERSION_INFO@ -static
+#libdebtags1_la_LIBADD = $(LIBTAGCOLL1_LIBS)
# Build a _pic library so that one can statically link tagcoll code into a
# # shared object (such as perl or python bindings)
@@ -61,12 +61,36 @@
# # 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
-libdebtags1_pic_la_DEPENDENCIES = libdebtags1.la
-libdebtags1_pic_la_SOURCES =
-libdebtags1_pic_la_LIBADD = \
- $(addprefix .libs/,$(libdebtags1_la_SOURCES:.cc=.o)) \
- -ltagcoll1_pic
-libdebtags1_pic_la_LDFLAGS = -static
+#libdebtags1_pic_la_DEPENDENCIES = libdebtags1.la
+libdebtags1_pic_a_SOURCES =
+libdebtags1_pic_a_LIBADD = \
+ Paths_pic.o \
+ Regexp_pic.o \
+ ZlibParserInput_pic.o \
+ DebDBParser_pic.o \
+ VocabularyMerger_pic.o \
+ TagImpl_pic.o \
+ Tag_pic.o \
+ Vocabulary_pic.o \
+ DebtagsSerializer_pic.o \
+ TagDB_pic.o \
+ Update_pic.o \
+ TagSet_pic.o \
+ PackageDB_pic.o \
+ Debtags_pic.o \
+ Maintainer_pic.o \
+ MaintainerSet_pic.o \
+ PackageImpl_pic.o \
+ Package_pic.o \
+ PackageSet_pic.o \
+ BasicTagMatcher_pic.o \
+ BasicPackageMatcher_pic.o \
+ Environment_pic.o \
+ instantiations_pic.o
+#libdebtags1_pic_la_LDFLAGS = -static
+%_pic.$(OBJEXT): %.cc
+ $(CXXCOMPILE) -fPIC -c $< -o $@
-INCLUDES = $(LIBTAGCOLL_CFLAGS)
+
+INCLUDES = $(LIBTAGCOLL1_CFLAGS)
Copied: libdebtags/trunk/libdebtags1.m4 (from r717, libdebtags/trunk/libdebtags.m4)
==============================================================================
--- libdebtags/trunk/libdebtags.m4 (original)
+++ libdebtags/trunk/libdebtags1.m4 Fri May 13 13:27:17 2005
@@ -1,9 +1,11 @@
-# LIBDEBTAGS_DEFS([LIBDEBTAGS_REQS=libdebtags])
+# LIBDEBTAGS1_DEFS([LIBDEBTAGS1_REQS=libdebtags])
# ---------------------------------------
-AC_DEFUN([LIBDEBTAGS_DEFS],
+AC_DEFUN([LIBDEBTAGS1_DEFS],
[
dnl Import libdebtags data
- PKG_CHECK_MODULES(LIBDEBTAGS,m4_default([$1], libdebtags))
- AC_SUBST(LIBDEBTAGS_CFLAGS)
- AC_SUBST(LIBDEBTAGS_LIBS)
+ PKG_CHECK_MODULES(LIBDEBTAGS1,m4_default([$1], libdebtags1))
+ AC_SUBST(LIBDEBTAGS1_CFLAGS)
+ AC_SUBST(LIBDEBTAGS1_LIBS)
+ LIBDEBTAGS1_PICLIBS=`pkg-config --variable=PicLibs m4_default([$1], libdebtags1)`
+ AC_SUBST(LIBDEBTAGS1_PICLIBS)
])
Copied: libdebtags/trunk/libdebtags1.pc.in (from r718, libdebtags/trunk/libdebtags.pc.in)
==============================================================================
--- libdebtags/trunk/libdebtags.pc.in (original)
+++ libdebtags/trunk/libdebtags1.pc.in Fri May 13 13:27:17 2005
@@ -2,9 +2,10 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+PicLibs=-L${libdir} -ldebtags1_pic -lapt-pkg @LIBTAGCOLL1_PICLIBS@
Name: libdebtags
Description: Perform debian package search and categorization using Debtags and APT databases
Version: @VERSION@
Cflags: -I${includedir}/debtags-1.0
-Libs: -L${libdir} -ldebtags1 -lapt-pkg @LIBTAGCOLL_LIBS@
+Libs: -L${libdir} -ldebtags1 -lapt-pkg @LIBTAGCOLL1_LIBS@
Modified: libdebtags/trunk/swig/Makefile.am
==============================================================================
--- libdebtags/trunk/swig/Makefile.am (original)
+++ libdebtags/trunk/swig/Makefile.am Fri May 13 13:27:17 2005
@@ -1,6 +1,9 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = . perl python
+SUBDIRS = . python
+#SUBDIRS = . perl python
+
+pkgdata_DATA = libdebtags.i
export PREFIX=$(prefix)
Modified: libdebtags/trunk/swig/libdebtags.i
==============================================================================
--- libdebtags/trunk/swig/libdebtags.i (original)
+++ libdebtags/trunk/swig/libdebtags.i Fri May 13 13:27:17 2005
@@ -28,12 +28,12 @@
%}
// Instantiate the base class needed but dont wrap it
-%include "../debtags/Tag.h"
-%include "../debtags/Package.h"
+%include "debtags/Tag.h"
+%include "debtags/Package.h"
%import "tagcoll/OpSet.h"
%import "tagcoll/TDBReadonlyDiskIndex.h"
-//%import "/usr/include/tagcoll-1.0/tagcoll/OpSet.h"
-//%import "/usr/include/tagcoll-1.0/tagcoll/TDBReadonlyDiskIndex.h"
+//%import "tagcoll/OpSet.h"
+//%import "tagcoll/TDBReadonlyDiskIndex.h"
%template(vecString) std::vector<std::string>;
%template(vecTag) std::vector<Debtags::Tag>;
@@ -89,12 +89,12 @@
// Parse the original header file
-%include "../debtags/Vocabulary.h"
-%include "../debtags/TagSet.h"
-%include "../debtags/DebtagsSerializer.h"
-%include "../debtags/TagDB.h"
-%include "../debtags/Debtags.h"
-%include "../debtags/PackageSet.h"
+%include "debtags/Vocabulary.h"
+%include "debtags/TagSet.h"
+%include "debtags/DebtagsSerializer.h"
+%include "debtags/TagDB.h"
+%include "debtags/Debtags.h"
+%include "debtags/PackageSet.h"
%extend Debtags::TagSet {
std::vector<Debtags::Tag> getIterable() {
Modified: libdebtags/trunk/swig/perl/test.pl
==============================================================================
--- libdebtags/trunk/swig/perl/test.pl (original)
+++ libdebtags/trunk/swig/perl/test.pl Fri May 13 13:27:17 2005
@@ -2,6 +2,7 @@
use strict;
use warnings;
+use lib '.';
use Debtags;
my $dt = Debtags::DebtagsSimple->new(0);
Modified: libdebtags/trunk/swig/python/Makefile.am
==============================================================================
--- libdebtags/trunk/swig/python/Makefile.am (original)
+++ libdebtags/trunk/swig/python/Makefile.am Fri May 13 13:27:17 2005
@@ -5,11 +5,11 @@
nodist__Debtags_la_SOURCES = libdebtags_wrap_python.cc
_Debtags_la_LDFLAGS = -module
-_Debtags_la_LIBADD = $(LIBTAGCOLL_LIBS) -lapt-pkg ../../debtags/libdebtags1.la
+_Debtags_la_LIBADD = ../../debtags/libdebtags1_pic.a $(LIBTAGCOLL1_PICLIBS) -lapt-pkg
libdebtags_wrap_python.cc: ../libdebtags.i
- swig -python -c++ -o $@ -I/usr/include/tagcoll-1.0 $<
+ swig -python -c++ -o $@ -I/usr/include/tagcoll-1.0 -I../../ $<
-INCLUDES = $(LIBTAGCOLL_CFLAGS) -DSTATEDIR=\"$(statedir)\" -I/usr/include/python2.3
+INCLUDES = $(LIBTAGCOLL1_CFLAGS) -DSTATEDIR=\"$(statedir)\" -I/usr/include/python2.3
CLEANFILES = libdebtags_wrap_python.cc Debtags.py Debtags.pyc
Modified: libdebtags/trunk/tests/Makefile.am
==============================================================================
--- libdebtags/trunk/tests/Makefile.am (original)
+++ libdebtags/trunk/tests/Makefile.am Fri May 13 13:27:17 2005
@@ -1,44 +1,34 @@
TESTS = libdebtags-test
check_PROGRAMS = libdebtags-test
libdebtags_test_SOURCES = tut-main.cpp test-vocabulary.cc
-libdebtags_test_LDADD = ../debtags/libdebtags1.la @LIBTAGCOLL_LIBS@ -lapt-pkg
+libdebtags_test_LDADD = ../debtags/libdebtags1.a @LIBTAGCOLL1_LIBS@ -lapt-pkg
noinst_PROGRAMS = test-update test-packages test-packagedata test-dbcat ex-showpkg ex-showpkgs
#test-maintainers
-test_update_SOURCES = \
- test-update.cc
-test_update_LDADD = @LIBTAGCOLL_LIBS@ -lapt-pkg \
- ../debtags/libdebtags1.la
-
-test_packages_SOURCES = \
- test-packages.cc
-test_packages_LDADD = @LIBTAGCOLL_LIBS@ -lapt-pkg \
- ../debtags/libdebtags1.la
+test_update_SOURCES = test-update.cc
+test_update_LDADD = ../debtags/libdebtags1.a @LIBTAGCOLL1_LIBS@ -lapt-pkg
+
+test_packages_SOURCES = test-packages.cc
+test_packages_LDADD = ../debtags/libdebtags1.a @LIBTAGCOLL1_LIBS@ -lapt-pkg
+
#test_maintainers_SOURCES = \
# test-maintainers.cc
-#test_maintainers_LDADD = @LIBTAGCOLL_LIBS@ -lapt-pkg \
+#test_maintainers_LDADD = @LIBTAGCOLL1_LIBS@ -lapt-pkg \
# ../debtags/libdebtags1.la
-test_packagedata_SOURCES = \
- test-packagedata.cc
-test_packagedata_LDADD = @LIBTAGCOLL_LIBS@ -lapt-pkg \
- ../debtags/libdebtags1.la
-
-test_dbcat_SOURCES = \
- test-dbcat.cc
-test_dbcat_LDADD = @LIBTAGCOLL_LIBS@ -lapt-pkg \
- ../debtags/libdebtags1.la
-
-ex_showpkg_SOURCES = \
- ex-showpkg.cc
-ex_showpkg_LDADD = @LIBTAGCOLL_LIBS@ -lapt-pkg \
- ../debtags/libdebtags1.la
-
-ex_showpkgs_SOURCES = \
- ex-showpkgs.cc
-ex_showpkgs_LDADD = @LIBTAGCOLL_LIBS@ -lapt-pkg \
- ../debtags/libdebtags1.la
-
-INCLUDES=@LIBTAGCOLL_CFLAGS@
+test_packagedata_SOURCES = test-packagedata.cc
+test_packagedata_LDADD = ../debtags/libdebtags1.a @LIBTAGCOLL1_LIBS@ -lapt-pkg
+
+
+test_dbcat_SOURCES = test-dbcat.cc
+test_dbcat_LDADD = ../debtags/libdebtags1.a @LIBTAGCOLL1_LIBS@ -lapt-pkg
+
+ex_showpkg_SOURCES = ex-showpkg.cc
+ex_showpkg_LDADD = ../debtags/libdebtags1.a @LIBTAGCOLL1_LIBS@ -lapt-pkg
+
+ex_showpkgs_SOURCES = ex-showpkgs.cc
+ex_showpkgs_LDADD = ../debtags/libdebtags1.a @LIBTAGCOLL1_LIBS@ -lapt-pkg
+
+INCLUDES=@LIBTAGCOLL1_CFLAGS@