<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/14964">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">build: fix mess with 'db_test_SOURCES' and 'db_test_LDADD'<br><br>Somehow both 'db_test_SOURCES' and 'db_test_LDADD' ended up in<br>'src/Makefile.am'. This causes automake / autoconf to complain.<br>Let's get rid of both useless declarations.<br><br>Furthermore, the actual 'db_test_LDADD' in 'tests/Makefile.am'<br>contained references to the source files from '$(top_srcdir)'.<br>Most likely, the original intention was to depend on the object<br>files in '$(top_builddir)'. Let's also fix this.<br><br>Change-Id: Ib2e436ed91d9b7551dc5b205329d468c2b0ced04<br>---<br>M src/Makefile.am<br>M tests/db/Makefile.am<br>2 files changed, 4 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/64/14964/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index 7ee019f..131b44f 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -87,21 +87,6 @@</span><br><span>  $(SQLITE3_LIBS) \</span><br><span>    $(NULL)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_test_SOURCES = \</span><br><span style="color: hsl(0, 100%, 40%);">-  auc.c \</span><br><span style="color: hsl(0, 100%, 40%);">- db.c \</span><br><span style="color: hsl(0, 100%, 40%);">-  db_auc.c \</span><br><span style="color: hsl(0, 100%, 40%);">-      db_test.c \</span><br><span style="color: hsl(0, 100%, 40%);">-     logging.c \</span><br><span style="color: hsl(0, 100%, 40%);">-     rand_fake.c \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-db_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(SQLITE3_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> osmo_euse_demo_SOURCES = \</span><br><span>        osmo-euse-demo.c \</span><br><span>   $(NULL)</span><br><span>diff --git a/tests/db/Makefile.am b/tests/db/Makefile.am</span><br><span>index afda5be..fa925f8 100644</span><br><span>--- a/tests/db/Makefile.am</span><br><span>+++ b/tests/db/Makefile.am</span><br><span>@@ -26,10 +26,10 @@</span><br><span>   $(NULL)</span><br><span> </span><br><span> db_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_srcdir)/src/db.c \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_srcdir)/src/db_hlr.c \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_srcdir)/src/db_auc.c \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_srcdir)/src/logging.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/logging.o \</span><br><span style="color: hsl(120, 100%, 40%);">+       $(top_builddir)/src/db_auc.o \</span><br><span style="color: hsl(120, 100%, 40%);">+        $(top_builddir)/src/db_hlr.o \</span><br><span style="color: hsl(120, 100%, 40%);">+        $(top_builddir)/src/db.o \</span><br><span>   $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>         $(LIBOSMOABIS_LIBS) \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/14964">change 14964</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-hlr/+/14964"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib2e436ed91d9b7551dc5b205329d468c2b0ced04 </div>
<div style="display:none"> Gerrit-Change-Number: 14964 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>