ecasound-link.patch

   1 --- ecasound-2.3.0/ecasound/Makefile.am.orig    2003-05-30 02:15:49.000000000 +0200
   2 +++ ecasound-2.3.0/ecasound/Makefile.am 2003-09-07 14:39:50.724992384 +0200
   3 @@ -44,12 +44,12 @@
   4  if ECA_AM_SYSTEM_READLINE
   5  ecasound_LDFLAGS = -export-dynamic
   6  ecasound_LDADD = $(termcap_library) \
   7 -               $(readline_library} -lreadline -lhistory \
   8 +               $(readline_library) -lreadline -lhistory \
   9                 $(top_builddir)/libecasound/libecasound.la \
  10                 $(top_builddir)/kvutils/libkvutils.la
  11  ecasound_debug_LDFLAGS = $(ecasound_LDFLAGS)
  12  ecasound_debug_LDADD = $(termcap_library) \
  13 -               $(readline_library} -lreadline -lhistory \
  14 +               $(readline_library) -lreadline -lhistory \
  15                 $(top_builddir)/libecasound/libecasound_debug.la \
  16                 $(top_builddir)/kvutils/libkvutils_debug.la
  17
  18 --- ecasound-2.3.0.orig/kvutils/Makefile.am     Tue Nov  5 02:05:17 2002
  19 +++ ecasound-2.3.0/kvutils/Makefile.am  Sat Feb 15 11:07:24 2003
  20 @@ -41,13 +41,13 @@
  21                         kvu_inttypes.h
  22
  23  libkvutils_la_SOURCES = $(kvutil_sources) $(kvutil_headers)
  24 -libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@ -static
  25 +libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@
  26
  27  libkvutils_debug_la_SOURCES = $(libkvutils_la_SOURCES)
  28  libkvutils_debug_la_LDFLAGS = $(libkvutils_la_LDFLAGS)
  29
  30  libkvutils_tester_SOURCES = libkvutils_tester.cpp
  31 -libkvutils_tester_LDFLAGS = -static
  32 +libkvutils_tester_LDFLAGS =
  33  libkvutils_tester_LDADD = $(lib_LTLIBRARIES)
  34
  35  noinst_HEADERS = $(kvutil_headers)
  36 diff -Nur ecasound-2.2.0.orig/libecasound/Makefile.am ecasound-2.2.0/libecasound/Makefile.am
  37 --- ecasound-2.2.0.orig/libecasound/Makefile.am Tue Jan  7 23:35:13 2003
  38 +++ ecasound-2.2.0/libecasound/Makefile.am      Sat Feb 15 11:12:58 2003
  39 @@ -315,8 +315,8 @@
  40  libecasound_la_SOURCES = $(ecasound_common_src)
  41  libecasound_debug_la_SOURCES = $(ecasound_common_src)
  42  libecasound_la_CFLAGS = $(eca_cxxflags)
  43 -libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -static
  44 -libecasound_la_LIBADD = $(eca_libadd)
  45 +libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags)
  46 +libecasound_la_LIBADD = $(eca_libadd) ../kvutils/libkvutils.la
  47  libecasound_debug_la_CFLAGS = $(libecasound_la_CFLAGS)
  48  libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
  49  libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
  50 diff -Nur ecasound-2.2.3.orig/libecasound/plugins/Makefile.am ecasound-2.2.3/libecasound/plugins/Makefile.am
  51 --- ecasound-2.2.3.orig/libecasound/plugins/Makefile.am Thu Oct 17 03:09:07 2002
  52 +++ ecasound-2.2.3/libecasound/plugins/Makefile.am      Sat Feb 15 11:07:34 2003
  53 @@ -86,7 +86,7 @@
  54  libecasound_plugins_la_SOURCES          = audioio_dummy.cpp $(plugin_cond_sources)
  55  EXTRA_libecasound_plugins_la_SOURCES    = $(plugin_cond_sources)
  56  libecasound_plugins_la_LIBADD          = $(af_libs) $(alsa_libs) $(arts_libs) $(ECA_S_JACK_LIBS)
  57 -libecasound_plugins_la_LDFLAGS                 = -static
  58 +libecasound_plugins_la_LDFLAGS                 =
  59
  60  libecasound_plugins_debug_la_SOURCES   = $(libecasound_plugins_la_SOURCES)
  61  EXTRA_libecasound_plugins_debug_la_SOURCES = $(EXTRA_libecasound_plugins_la_SOURCES)
  62 --- ecasound-2.3.0.orig/libecasoundc/Makefile.am        Mon Dec 16 05:20:39 2002
  63 +++ ecasound-2.3.0/libecasoundc/Makefile.am     Sat Feb 15 11:07:07 2003
  64 @@ -8,9 +8,9 @@
  65  # !!!
  66  # remember to update eca-version.cpp
  67  if ECA_AM_DEBUG_MODE
  68 -eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static
  69 +eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@
  70  else
  71 -eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static
  72 +eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@
  73  endif
  74
  75  INCLUDES = -I$(srcdir)
  76 --- ecasound-2.2.3/pyecasound/Makefile.am.orig  2003-04-02 21:37:45.000000000 +0200
  77 +++ ecasound-2.2.3/pyecasound/Makefile.am       2003-05-10 20:48:34.000000000 +0200
  78 @@ -50,7 +50,7 @@
  79  all: pyecasound.so
  80
  81  pyecasound.so: pyecasound.lo
  82 -       $(CC) -o pyecasound.so -shared -nostartfiles $(libpyecasound_la_LDFLAGS) pyecasound.lo $(top_builddir)/libecasoundc/ecasoundc_sa.lo
  83 +       $(LINK) -o pyecasound.so -shared -nostartfiles $(libpyecasound_la_LDFLAGS) pyecasound.lo $(top_builddir)/libecasoundc/ecasoundc_sa.lo
  84  endif
  85
  86  # ----------------------------------------------------------------------