← Back to branch summary

~damg/ubuntu/quantal/asterisk/LP1097687

« back to all changes in this revision

Viewing changes to debian/patches/h323-fix-makefile

  • Committer: Bazaar Package Importer
  • Author(s): Jean-Michel Dault
  • Date: 2010-02-16 14:08:54 UTC
  • mfrom: (1.2.5 upstream) (8.3.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100216140854-rb2godspb9lduazl
Tags: 1:1.6.2.2-1ubuntu1
* Merge from Debian: security update
  * Changes:
  - debian/control: Change Maintainer
  - debian/control: Removed Uploaders field.
  - debian/control: Removed Debian Vcs-Svn entry and replaced with
      ubuntu-voip Vcs-Bzr, to reflect divergence in packages.
  - debian/asterisk.init : chown /dev/dahdi
  - debian/backports/hardy : add file
  - debian/backports/asterisk.init.hardy : add file

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/h323-fix-makefile
1
 
Fix LD flags on chan_h323.so
 
1
Subject: Fix LD flags on chan_h323.so
 
2
Author: Faidon Liambotis <paravoid@debian.org>
 
3
Forwarded: no
 
4
Last-Update: 2009-12-19
2
5
 
3
6
chan_h323.so's LD flags are wrong in the first invocation of make: openh323 and
4
7
pt are not included.
8
11
 
9
12
Fix this properly by fixing channels/Makefile
10
13
 
11
 
  -- Faidon Liambotis <paravoid@debian.org>
12
 
 
13
14
--- a/channels/Makefile
14
15
+++ b/channels/Makefile
15
 
@@ -57,9 +57,7 @@
 
16
@@ -57,9 +57,7 @@ ifneq ($(findstring $(OSARCH), mingw32 c
16
17
   LIBS+= -lres_monitor.so -lres_features.so
17
18
 endif
18
19
 
23
24
 
24
25
 clean::
25
26
        $(MAKE) -C misdn clean
26
 
@@ -74,7 +72,7 @@
 
27
@@ -74,7 +72,7 @@ ifneq ($(filter chan_h323,$(EMBEDDED_MOD
27
28
 modules.link: h323/libchanh323.a
28
29
 else
29
30
 ifeq ($(OSARCH),linux-gnu)