aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2016-03-15 12:47:13 +0100
committerAleksander Morgado <aleksander@aleksander.es>2016-03-15 19:15:25 +0100
commit3b8361eb0635e2a56f8db11823d0b5837f1bb6de (patch)
tree197abc191bd4d69bb5ee9ed473386208c3aca1ca /test
parent3bac0a17f5187aa22d433470146875cac15944bf (diff)
build,core: update build rules
We try to combine in common envvars the compiler and linker flags shared by the different components, and where possible, also re-using the implicit AM_CFLAGS and AM_LDFLAGS variables that automake provides, and which apply to all objects being built in the same Makefile.am. The internal libmodem-helpers.la library is also renamed to libhelpers.la
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am32
1 files changed, 26 insertions, 6 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 6e6779ac..4f6028b7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,11 +1,25 @@
-noinst_PROGRAMS = lsudev mmtty
+noinst_PROGRAMS =
+EXTRA_DIST =
-lsudev_SOURCES = lsudev.c
+################################################################################
+# lsudev
+################################################################################
+
+noinst_PROGRAMS += lsudev
+
+lsudev_SOURCES = lsudev.c
lsudev_CPPFLAGS = $(GUDEV_CFLAGS)
-lsudev_LDADD = $(GUDEV_LIBS)
+lsudev_LDADD = $(GUDEV_LIBS)
+
+################################################################################
+# mmtty
+################################################################################
+
+noinst_PROGRAMS += mmtty
mmtty_SOURCES = mmtty.c
+
mmtty_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir) \
@@ -15,10 +29,16 @@ mmtty_CPPFLAGS = \
-I$(top_srcdir)/libmm-glib \
-I$(top_srcdir)/libmm-glib/generated \
-I$(top_builddir)/libmm-glib/generated
+ $(NULL)
+
mmtty_LDADD = \
$(MM_LIBS) \
+ $(top_builddir)/src/libhelpers.la \
$(top_builddir)/src/libport.la \
- $(top_builddir)/src/libmodem-helpers.la
+ $(NULL)
+
+################################################################################
+# mmcli-test-sms
+################################################################################
-EXTRA_DIST = \
- mmcli-test-sms
+EXTRA_DIST += mmcli-test-sms