package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch

   1 From b6dcae8ec4334e2436cfa19a8052c3473f57a586 Mon Sep 17 00:00:00 2001
   2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
   3 Date: Sat, 4 Mar 2017 15:02:43 +0100
   4 Subject: [PATCH 1/2] src/Makefile.am: don't use VPATH
   5
   6 VPATH is a mechanism used to allow out-of-tree build, not to use source
   7 code from a different directory. For this purpose, one should simply use
   8 the "subdir-objects" AUTOMAKE_OPTIONS, and reference the source code of
   9 the sub-directory in the <prog>_SOURCES variable.
  10
  11 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  12 Upstream-status: https://github.com/irontec/sngrep/pull/176
  13 ---
  14  src/Makefile.am | 10 +++++-----
  15  1 file changed, 5 insertions(+), 5 deletions(-)
  16
  17 diff --git a/src/Makefile.am b/src/Makefile.am
  18 index 931ee06..961f4a0 100644
  19 --- a/src/Makefile.am
  20 +++ b/src/Makefile.am
  21 @@ -1,5 +1,5 @@
  22 +AUTOMAKE_OPTIONS=subdir-objects
  23  bin_PROGRAMS=sngrep
  24 -VPATH=curses
  25  sngrep_SOURCES=capture.c
  26  if USE_EEP
  27  sngrep_SOURCES+=capture_eep.c
  28 @@ -12,8 +12,8 @@ sngrep_SOURCES+=capture_openssl.c
  29  endif
  30  sngrep_SOURCES+=address.c packet.c sip.c sip_call.c sip_msg.c sip_attr.c main.c
  31  sngrep_SOURCES+=option.c group.c filter.c keybinding.c media.c setting.c rtp.c
  32 -sngrep_SOURCES+=util.c hash.c vector.c ui_panel.c scrollbar.c
  33 -sngrep_SOURCES+=ui_manager.c ui_call_list.c ui_call_flow.c ui_call_raw.c
  34 -sngrep_SOURCES+=ui_stats.c ui_filter.c ui_save.c ui_msg_diff.c
  35 -sngrep_SOURCES+=ui_column_select.c ui_settings.c
  36 +sngrep_SOURCES+=util.c hash.c vector.c curses/ui_panel.c curses/scrollbar.c
  37 +sngrep_SOURCES+=curses/ui_manager.c curses/ui_call_list.c curses/ui_call_flow.c curses/ui_call_raw.c
  38 +sngrep_SOURCES+=curses/ui_stats.c curses/ui_filter.c curses/ui_save.c curses/ui_msg_diff.c
  39 +sngrep_SOURCES+=curses/ui_column_select.c curses/ui_settings.c
  40
  41 --
  42 2.7.4
  43