1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103
|
Author: Andreas Tille <tille@debian.org>
Last-Update: 2018-07-18
Description: Drop version number from library file name
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ projects/libMems.sln \
projects/libMems.vcproj
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libMems-@GENERIC_API_VERSION@.pc
+pkgconfig_DATA = libMems.pc
SUBDIRS = libMems
--- /dev/null
+++ b/libMems.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libMems
+Description: c++ library supporting DNA sequence and genome alignment
+Version: @VERSION@
+Requires: libGenome libMUSCLE
+Libs: -L${libdir} @OPENMP_CXXFLAGS@ -lMems @BOOST_SYSTEM_LDFLAGS@ @BOOST_SYSTEM_LIBS@ @BOOST_FILESYSTEM_LIBS@ @BOOST_PROGRAM_OPTIONS_LIBS@ @BOOST_IOSTREAMS_LIBS@ @LIBS@
+Cflags: -I${includedir}/@GENERIC_LIBRARY_NAME@ @BOOST_CPPFLAGS@ @OPENMP_CXXFLAGS@ @EXTRA_CXX_FLAGS@
+
--- a/libMems-1.6.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libMems
-Description: c++ library supporting DNA sequence and genome alignment
-Version: @VERSION@
-Requires: libGenome-1.3 libMUSCLE-3.7
-Libs: -L${libdir} @OPENMP_CXXFLAGS@ -lMems-@GENERIC_API_VERSION@ @BOOST_SYSTEM_LDFLAGS@ @BOOST_SYSTEM_LIBS@ @BOOST_FILESYSTEM_LIBS@ @BOOST_PROGRAM_OPTIONS_LIBS@ @BOOST_IOSTREAMS_LIBS@ @LIBS@
-Cflags: -I${includedir}/@GENERIC_LIBRARY_NAME@-@GENERIC_API_VERSION@ @BOOST_CPPFLAGS@ @OPENMP_CXXFLAGS@ @EXTRA_CXX_FLAGS@
-
--- a/libMems/Makefile.am
+++ b/libMems/Makefile.am
@@ -55,19 +55,19 @@ dmSML/util.c dmSML/sorting.c dmSML/dmsor
dmSML/timing.c dmSML/sml.c
-libmems_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)-$(GENERIC_API_VERSION)/$(GENERIC_LIBRARY_NAME)
+libmems_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)
libmems_include_HEADERS = $(LIBMEMS_H)
# build libraries with gcc (no suffix)
-lib_LTLIBRARIES = libMems-1.6.la
-libMems_1_6_la_SOURCES = $(LIBMEMS_SRC) $(HOMOLOGYHMM_SRC) $(DMSML_SRC)
-libMems_1_6_la_LIBADD = @DEPS_LIBS@ @BOOST_FILESYSTEM_LIBS@ @BOOST_IOSTREAMS_LIBS@ @BOOST_SYSTEM_LIBS@
-libMems_1_6_la_LDFLAGS= -version-info $(GENERIC_LIBRARY_VERSION)
+lib_LTLIBRARIES = libMems.la
+libMems_la_SOURCES = $(LIBMEMS_SRC) $(HOMOLOGYHMM_SRC) $(DMSML_SRC)
+libMems_la_LIBADD = @DEPS_LIBS@ @BOOST_FILESYSTEM_LIBS@ @BOOST_IOSTREAMS_LIBS@ @BOOST_SYSTEM_LIBS@
+libMems_la_LDFLAGS= -version-info $(GENERIC_LIBRARY_VERSION)
-homologyhmm_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)-$(GENERIC_API_VERSION)/$(GENERIC_LIBRARY_NAME)/HomologyHMM
+homologyhmm_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/HomologyHMM
homologyhmm_include_HEADERS = $(HOMOLOGYHMM_H)
-dmsml_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)-$(GENERIC_API_VERSION)/$(GENERIC_LIBRARY_NAME)/dmSML
+dmsml_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/dmSML
dmsml_include_HEADERS = $(DMSML_H)
EXTRA_DIST = \
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,7 @@ BOOST_PROGRAM_OPTIONS
BOOST_IOSTREAMS
dnl Get location of libGenome Headers
-PKG_CHECK_MODULES(DEPS, libGenome-1.3 >= 1.3.1 libMUSCLE-3.7 >= 1.0.0)
+PKG_CHECK_MODULES(DEPS, libGenome >= 1.3.1 libMUSCLE >= 1.0.0)
AC_SUBST(DEPS_CFLAGS)
dnl Check for OpenMP
@@ -133,5 +133,5 @@ AC_PROG_GCC_TRADITIONAL
dnl SAVE_LIBRARY_VERSION
AC_SUBST(LIBTOOL_VERSION_INFO)
-AC_OUTPUT(Makefile libMems/Makefile libMems-1.6.pc )
+AC_OUTPUT(Makefile libMems/Makefile libMems.pc )
#doc/html/Makefile doc/man/Makefile doc/man/man3/Makefile)
--- a/libMems/dmSML/Makefile.am
+++ b/libMems/dmSML/Makefile.am
@@ -12,7 +12,7 @@ alibc.c awin32aio.c buffer.c \
util.c sorting.c dmsort.c \
timing.c sml.c
-library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)-$(GENERIC_API_VERSION)/$(GENERIC_LIBRARY_NAME)/dmSML
+library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/dmSML
library_include_HEADERS = $(DMSML_H)
|