diff --git a/NEWS b/NEWS index 36e0b77de..179d64efd 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,8 @@ New in spot 2.2.2.dev (Not yet released) * The development Debian packages for Spot now install static libraries as well. + * We now install configuration files for users of pkg-config. + Tools: * ltlcross supports translators that output alternating automata in diff --git a/debian/libbddx-dev.install b/debian/libbddx-dev.install index b278da165..4ee0cf574 100644 --- a/debian/libbddx-dev.install +++ b/debian/libbddx-dev.install @@ -3,3 +3,4 @@ usr/include/bvecx.h usr/include/bddx.h usr/lib/*-*/libbddx.so usr/lib/*-*/libbddx.a +usr/lib/*-*/pkgconfig/libbddx.pc diff --git a/debian/libspot-dev.install b/debian/libspot-dev.install index 9894e81e3..cafdaf2ea 100644 --- a/debian/libspot-dev.install +++ b/debian/libspot-dev.install @@ -1,5 +1,7 @@ usr/include/spot usr/lib/*-*/libspot.so usr/lib/*-*/libspot.a +usr/lib/*-*/pkgconfig/libspot.pc usr/lib/*-*/libspotltsmin.so usr/lib/*-*/libspotltsmin.a +usr/lib/*-*/pkgconfig/libspotltsmin.pc diff --git a/spot/.gitignore b/spot/.gitignore index e1a9c10d5..8fc81020a 100644 --- a/spot/.gitignore +++ b/spot/.gitignore @@ -6,3 +6,4 @@ libspot.la _.cc *.log *.dir +*.pc diff --git a/spot/Makefile.am b/spot/Makefile.am index dc1cd9228..871523d72 100644 --- a/spot/Makefile.am +++ b/spot/Makefile.am @@ -1,5 +1,5 @@ ## -*- coding: utf-8 -*- -## Copyright (C) 2009, 2010, 2012, 2013, 2014, 2015, 2016 Laboratoire +## Copyright (C) 2009, 2010, 2012, 2013, 2014, 2015, 2016, 2017 Laboratoire ## de Recherche et Développement de l'Epita (LRDE). ## Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6), ## département Systèmes Répartis Coopératifs (SRC), Université Pierre @@ -48,3 +48,18 @@ libspot_la_LIBADD = \ # Dummy C++ source to cause C++ linking. nodist_EXTRA_libspot_la_SOURCES = _.cc _.cc:; touch $@ + + +EXTRA_DIST = $(srcdir)/libspot.pc.in +pkgconfigdir = $(libdir)/pkgconfig +nodist_pkgconfig_DATA = libspot.pc + +libspot.pc: $(srcdir)/libspot.pc.in + sed -e 's![@]prefix[@]!$(prefix)!g' \ + -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ + -e 's![@]includedir[@]!$(includedir)!g' \ + -e 's![@]libdir[@]!$(libdir)!g' \ + -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ + $(srcdir)/libspot.pc.in > $@ + +DISTCLEANFILES = libspot.pc diff --git a/spot/libspot.pc.in b/spot/libspot.pc.in new file mode 100644 index 000000000..2dac1de5d --- /dev/null +++ b/spot/libspot.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +includedir=@includedir@ +libdir=@libdir@ + +Name: Spot +Description: A library of LTL and omega-automata algorithms for model checking +URL: https://spot.lrde.epita.fr/ +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -lspot +Requires: libbddx diff --git a/spot/ltsmin/Makefile.am b/spot/ltsmin/Makefile.am index 4a0d949d4..728280882 100644 --- a/spot/ltsmin/Makefile.am +++ b/spot/ltsmin/Makefile.am @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- -## Copyright (C) 2011, 2013, 2014, 2015, 2016 Laboratoire de Recherche -## et Developpement de l'Epita (LRDE). +## Copyright (C) 2011, 2013, 2014, 2015, 2016, 2017 Laboratoire de +## Recherche et Developpement de l'Epita (LRDE). ## ## This file is part of Spot, a model checking library. ## @@ -34,3 +34,18 @@ libspotltsmin_la_LIBADD = \ $(LIBLTDL) -lpthread libspotltsmin_la_LDFLAGS = -no-undefined $(SYMBOLIC_LDFLAGS) libspotltsmin_la_SOURCES = ltsmin.cc + + +EXTRA_DIST = $(srcdir)/libspotltsmin.pc.in +pkgconfigdir = $(libdir)/pkgconfig +nodist_pkgconfig_DATA = libspotltsmin.pc + +libspotltsmin.pc: $(srcdir)/libspotltsmin.pc.in + sed -e 's![@]prefix[@]!$(prefix)!g' \ + -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ + -e 's![@]includedir[@]!$(includedir)!g' \ + -e 's![@]libdir[@]!$(libdir)!g' \ + -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ + $(srcdir)/libspotltsmin.pc.in > $@ + +DISTCLEANFILES = libspotltsmin.pc diff --git a/spot/ltsmin/libspotltsmin.pc.in b/spot/ltsmin/libspotltsmin.pc.in new file mode 100644 index 000000000..b85a828ce --- /dev/null +++ b/spot/ltsmin/libspotltsmin.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +includedir=@includedir@ +libdir=@libdir@ + +Name: Spot-LTSmin +Description: Access to LTSmin-compatible state-space in Spot +URL: https://spot.lrde.epita.fr/ +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -lspotltsmin +Requires: libspot