|
0 |
From: Adrian Bunk <bunk@debian.org>
|
|
1 |
Date: Sun, 19 Aug 2018 01:45:39 +0300
|
|
2 |
Subject: Fix the Makefile dependencies
|
|
3 |
|
|
4 |
Bug-Debian: https://bugs.debian.org/906553
|
|
5 |
---
|
|
6 |
ibis/src/Makefile.am | 8 +++-----
|
|
7 |
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
8 |
|
|
9 |
diff --git a/ibis/src/Makefile.am b/ibis/src/Makefile.am
|
|
10 |
index 9e1bfa2..3efddd0 100644
|
|
11 |
--- a/ibis/src/Makefile.am
|
|
12 |
+++ b/ibis/src/Makefile.am
|
|
13 |
@@ -53,12 +53,10 @@ LIB_VER_TRIPLET="1:0:0"
|
|
14 |
LIB_FILE_TRIPLET=1.0.0
|
|
15 |
|
|
16 |
lib_LTLIBRARIES = libibis.la
|
|
17 |
-noinst_LIBRARIES = libibiscom.a
|
|
18 |
+noinst_LTLIBRARIES = libibiscom.la
|
|
19 |
|
|
20 |
-libibiscom_a_SOURCES = ibbbm.c ibcr.c ibis.c ibis_gsi_mad_ctrl.c \
|
|
21 |
+libibiscom_la_SOURCES = ibbbm.c ibcr.c ibis.c ibis_gsi_mad_ctrl.c \
|
|
22 |
ibpm.c ibsac.c ibsm.c ibvs.c ibcc.c
|
|
23 |
-# Below op causes renaming of the obj files - used when same source creates 2 targets (TODO: is this duplication needed ?)
|
|
24 |
-libibiscom_a_CFLAGS = $(AM_CFLAGS)
|
|
25 |
|
|
26 |
# client library to be used by IBIS TCL package:
|
|
27 |
libibis_la_SOURCES = ibis_wrap.c ibbbm.c ibcr.c ibis.c ibis_gsi_mad_ctrl.c \
|
|
28 |
@@ -75,7 +73,7 @@ LDADD = $(OSM_LDFLAGS)
|
|
29 |
ibis_SOURCES = ibissh_wrap.cpp
|
|
30 |
|
|
31 |
# note the order of the libraries does matter as we static link
|
|
32 |
-ibis_LDADD = -L. -libiscom $(OSM_LDFLAGS) $(TCL_LIBS)
|
|
33 |
+ibis_LDADD = -L. libibiscom.la $(OSM_LDFLAGS) $(TCL_LIBS)
|
|
34 |
|
|
35 |
|
|
36 |
# SWIG FILES:
|