File build-fixes.diff of Package libsmpp34

---
 binaries/Makefile.am  |    6 +++---
 src/Makefile.am       |    8 +++-----
 test_apps/Makefile.am |   10 +++-------
 3 files changed, 9 insertions(+), 15 deletions(-)

Index: libsmpp34-1.10.27/binaries/Makefile.am
===================================================================
--- libsmpp34-1.10.27.orig/binaries/Makefile.am
+++ libsmpp34-1.10.27/binaries/Makefile.am
@@ -9,9 +9,9 @@ include $(top_srcdir)/test_pdu/Makefile.
 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)
Index: libsmpp34-1.10.27/src/Makefile.am
===================================================================
--- libsmpp34-1.10.27.orig/src/Makefile.am
+++ libsmpp34-1.10.27/src/Makefile.am
@@ -20,9 +20,7 @@ include_HEADERS = \
     $(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
Index: libsmpp34-1.10.27/test_apps/Makefile.am
===================================================================
--- libsmpp34-1.10.27.orig/test_apps/Makefile.am
+++ libsmpp34-1.10.27/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 @@ sendwp_SOURCES = \
     $(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 @@ esme_SOURCES = \
     $(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 =