From 9738dfa897e9558390580a36325180bfb02d6f72 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 23 Sep 2013 14:33:05 +0200 Subject: Rename binary to binaries to fix building a debian package dh will execute the binary rule and this will not do anything as a directory with that name already exists.. --- Makefile.am | 2 +- binaries/Makefile.am | 17 +++++++++++++++++ binary/Makefile.am | 17 ----------------- configure.ac | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 binaries/Makefile.am delete mode 100644 binary/Makefile.am diff --git a/Makefile.am b/Makefile.am index 17062c9..7f175ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = binary def_frame def_list +SUBDIRS = binaries def_frame def_list if HAVE_LIBXML2 SUBDIRS += test_apps diff --git a/binaries/Makefile.am b/binaries/Makefile.am new file mode 100644 index 0000000..308acac --- /dev/null +++ b/binaries/Makefile.am @@ -0,0 +1,17 @@ +# Makefile.am # +if HAVE_LIBXML2 +noinst_PROGRAMS = submit_multi_resp_test submit_multi_test alert_notification_test bind_receiver_resp_test bind_receiver_test bind_transceiver_resp_test bind_transceiver_test bind_transmitter_resp_test bind_transmitter_test cancel_sm_resp_test cancel_sm_test data_sm_resp_test data_sm_test deliver_sm_resp_test deliver_sm_test enquire_link_resp_test enquire_link_test generic_nack_test outbind_test query_sm_resp_test query_sm_test replace_sm_resp_test replace_sm_test submit_sm_resp_test submit_sm_test unbind_resp_test unbind_test esme analizer sendwp +else +noinst_PROGRAMS = submit_multi_resp_test submit_multi_test alert_notification_test bind_receiver_resp_test bind_receiver_test bind_transceiver_resp_test bind_transceiver_test bind_transmitter_resp_test bind_transmitter_test cancel_sm_resp_test cancel_sm_test data_sm_resp_test data_sm_test deliver_sm_resp_test deliver_sm_test enquire_link_resp_test enquire_link_test generic_nack_test outbind_test query_sm_resp_test query_sm_test replace_sm_resp_test replace_sm_test submit_sm_resp_test submit_sm_test unbind_resp_test unbind_test analizer +endif + +include $(top_srcdir)/test_pdu/Makefile.am +include $(top_srcdir)/test_apps/Makefile.am +include $(top_srcdir)/src/Makefile.am + +LDADD = $(top_builddir)/binaries/libsmpp34.la +AM_CPPFLAGS = -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS +AM_CFLAGS = @CFLAGS@ -Wall -fPIC # -static +INCLUDES = -I../src -I.. +AM_LDFLAGS = -lrt -lpthread +OBJ_EXTRA_DIST = $(esme_EXTRA_DIST) diff --git a/binary/Makefile.am b/binary/Makefile.am deleted file mode 100644 index 9b61e9f..0000000 --- a/binary/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Makefile.am # -if HAVE_LIBXML2 -noinst_PROGRAMS = submit_multi_resp_test submit_multi_test alert_notification_test bind_receiver_resp_test bind_receiver_test bind_transceiver_resp_test bind_transceiver_test bind_transmitter_resp_test bind_transmitter_test cancel_sm_resp_test cancel_sm_test data_sm_resp_test data_sm_test deliver_sm_resp_test deliver_sm_test enquire_link_resp_test enquire_link_test generic_nack_test outbind_test query_sm_resp_test query_sm_test replace_sm_resp_test replace_sm_test submit_sm_resp_test submit_sm_test unbind_resp_test unbind_test esme analizer sendwp -else -noinst_PROGRAMS = submit_multi_resp_test submit_multi_test alert_notification_test bind_receiver_resp_test bind_receiver_test bind_transceiver_resp_test bind_transceiver_test bind_transmitter_resp_test bind_transmitter_test cancel_sm_resp_test cancel_sm_test data_sm_resp_test data_sm_test deliver_sm_resp_test deliver_sm_test enquire_link_resp_test enquire_link_test generic_nack_test outbind_test query_sm_resp_test query_sm_test replace_sm_resp_test replace_sm_test submit_sm_resp_test submit_sm_test unbind_resp_test unbind_test analizer -endif - -include $(top_srcdir)/test_pdu/Makefile.am -include $(top_srcdir)/test_apps/Makefile.am -include $(top_srcdir)/src/Makefile.am - -LDADD = $(top_builddir)/binary/libsmpp34.la -AM_CPPFLAGS = -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -AM_CFLAGS = @CFLAGS@ -Wall -fPIC # -static -INCLUDES = -I../src -I.. -AM_LDFLAGS = -lrt -lpthread -OBJ_EXTRA_DIST = $(esme_EXTRA_DIST) diff --git a/configure.ac b/configure.ac index 29f851c..6d5b3b3 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,6 @@ AC_CHECK_FUNCS([memset]) AC_OUTPUT([Makefile def_frame/Makefile def_list/Makefile - binary/Makefile + binaries/Makefile test_apps/Makefile libsmpp34.pc]) -- cgit v1.2.3