[PATCH] libsmpp34[master]: build: Fix parallel build issue

[roox]

Review at  https://gerrit.osmocom.org/6368

build: Fix parallel build issue

[   34s] gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I..
-D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS  -fmessage-length=0
-grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2
-fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables
-fstack-clash-protection -g -Wall -fPIC  -fmessage-length=0
-grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2
-fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables
-fstack-clash-protection -g -c -o submit_multi_resp_test.o `test -f
'../test_pdu/submit_multi_resp_test.c' || echo
'./'`../test_pdu/submit_multi_resp_test.c
[   34s] make[2]: *** No rule to make target '../binaries/libsmpp34.la',
needed by 'submit_multi_resp_test'.  Stop.
[   34s] make[2]: *** Waiting for unfinished jobs....

Change-Id: Ic8e8a80d5f12606fb417204da268e37c8ab9cf69
---
M binaries/Makefile.am
M src/Makefile.am
M test_apps/Makefile.am
3 files changed, 9 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/68/6368/1

diff --git a/binaries/Makefile.am b/binaries/Makefile.am
index ff7ddae..e9540fd 100644
--- a/binaries/Makefile.am
+++ b/binaries/Makefile.am
@@ -9,9 +9,9 @@
 include $(top_srcdir)/test_apps/Makefile.am
 include $(top_srcdir)/src/Makefile.am
 
-LDADD = $(top_builddir)/binaries/libsmpp34.la
+LDADD = libsmpp34.la
 AM_CPPFLAGS = -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS
 AM_CFLAGS = @CFLAGS@ -Wall -fPIC # -static
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)
-AM_LDFLAGS = -lrt -lpthread
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_srcdir)
+LDADD += -lrt -lpthread
 OBJ_EXTRA_DIST = $(esme_EXTRA_DIST)
diff --git a/src/Makefile.am b/src/Makefile.am
index 940fd0a..e72e107 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,9 +20,7 @@
     $(LIBRARY_SOURCE_DIR)/smpp34_params.h
 
 libsmpp34_la_CFLAGS = @CFLAGS@ -Wall
-libsmpp34_la_CFLAGS += -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS
-libsmpp34_la_INCLUDES = -I. -I..
+libsmpp34_la_CPPFLAGS = -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS
+libsmpp34_la_CPPFLAGS += -I. -I..
 libsmpp34_la_LDFLAGS = @LDFLAGS@ -version-info 0:1:0
-libsmpp34_la_LDFLAGS += -lrt -lpthread
-
-
+libsmpp34_la_LIBADD = -lrt -lpthread
diff --git a/test_apps/Makefile.am b/test_apps/Makefile.am
index 9089fc9..cbdb7fb 100644
--- a/test_apps/Makefile.am
+++ b/test_apps/Makefile.am
@@ -1,5 +1,6 @@
 # test_pdu/Makefile.am #
 
+AM_CPPFLAGS = -I${top_srcdir}/src $(LIBXML2_CFLAGS)
 TESTAPPS_SOURCE_DIR = $(top_srcdir)/test_apps
 sendwp_SOURCES = \
     $(TESTAPPS_SOURCE_DIR)/tcp.c\
@@ -7,8 +8,7 @@
     $(TESTAPPS_SOURCE_DIR)/sendwp.h\
     $(TESTAPPS_SOURCE_DIR)/sendwp.c
 
-sendwp_CPPFLAGS = $(LIBXML2_CFLAGS)
-sendwp_LDFLAGS = $(LIBXML2_LIBS)
+sendwp_LDADD = $(LIBXML2_LIBS) libsmpp34.la
 
 noinst_DATA = \
      $(TESTAPPS_SOURCE_DIR)/sendwp.xml \
@@ -20,11 +20,7 @@
     $(TESTAPPS_SOURCE_DIR)/esme.h\
     $(TESTAPPS_SOURCE_DIR)/esme.c
 
-esme_CPPFLAGS = $(LIBXML2_CFLAGS)
-esme_LDFLAGS = $(LIBXML2_LIBS)
+esme_LDADD = $(LIBXML2_LIBS) libsmpp34.la
 
 analizer_SOURCES = \
     $(TESTAPPS_SOURCE_DIR)/analizer.c
-
-analizer_CPPFLAGS = 
-analizer_LDFLAGS = 

-- 
To view, visit https://gerrit.osmocom.org/6368
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8e8a80d5f12606fb417204da268e37c8ab9cf69
Gerrit-PatchSet: 1
Gerrit-Project: libsmpp34
Gerrit-Branch: master
Gerrit-Owner: roox <mardnh at gmx.de>