denemo (0.8.16-1) use_libsmf_of_os.diff

Summary

 Makefile.am     |    2 +-
 configure.in    |    4 ++++
 src/Makefile.am |    3 +--
 3 files changed, 6 insertions(+), 3 deletions(-)

    
download this patch

Patch contents

Description: Denemo include a convenience copy of libsmf
 This patch ensures that the Debian package of denemo
 reference to the debian package of libsmf and that
 the convenience copy is not used.
 See: Debian Policy Manual section 4.13 (Convenience
 copies of code) for details.

Author: Josue Abarca <jmaslibre@debian.org.gt>
Forwarded: not-needed
Last-Update: 2010-04-09


--- a/configure.in
+++ b/configure.in
@@ -30,6 +30,10 @@
 CFLAGS="$CFLAGS $GTK2_CFLAGS"
 LIBS="$GTK2_LIBS"
 
+PKG_CHECK_MODULES(LIBSMF, smf >= 1.3)
+LIBS="$LIBS $LIBSMF_LIBS"
+CFLAGS="$CFLAGS $LIBSMF_CFLAGS"
+
 PKG_CHECK_MODULES(GUILE, guile-1.8 >= 1.8)
 LIBS="$LIBS $GUILE_LIBS"
 CFLAGS="$CFLAGS $GUILE_CFLAGS"
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,6 @@
 
 localedir = $(datadir)/locale
 INCLUDES = -I../intl -I$(top_srcdir)/intl -I$(top_srcdir)/include \
--I$(top_srcdir)/libsmf \
 -I$(top_srcdir)/pixmaps \
 -DLOCALEDIR=\"$(localedir)\" \
 -DSYSCONFDIR=\"$(sysconfdir)/\" \
@@ -61,7 +60,7 @@
 -DPKGNAME=\"denemo\" 
 
 
-denemo_LDADD = $(INTLLIBS) ../libsmf/libsmf.a 
+denemo_LDADD = $(INTLLIBS)
 AM_CPPFLAGS = $(BINRELOC_CFLAGS)
 
 
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libsmf m4 doc actions pixmaps po src \
+SUBDIRS = m4 doc actions pixmaps po src \
 	  fonts soundfonts bin