Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Stefan Wahren 2013-04-11 22:12:16 +02:00
commit f07d4fc579

View File

@ -13,12 +13,16 @@ VERSION = @VERSION@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/mbus AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/mbus
noinst_HEADERS = noinst_HEADERS =
noinst_PROGRAMS = mbus_unit_test1 mbus_parse mbus_parse_hex noinst_PROGRAMS = mbus_unit_test1 mbus_unit_test2 mbus_parse mbus_parse_hex
mbus_unit_test1_LDFLAGS = -L$(top_builddir)/mbus mbus_unit_test1_LDFLAGS = -L$(top_builddir)/mbus
mbus_unit_test1_LDADD = -lmbus -lcunit -lncurses -lm mbus_unit_test1_LDADD = -lmbus -lcunit -lncurses -lm
mbus_unit_test1_SOURCES = mbus_unit_test1.c mbus_unit_test1_SOURCES = mbus_unit_test1.c
mbus_unit_test2_LDFLAGS = -L$(top_builddir)/mbus
mbus_unit_test2_LDADD = -lmbus -lcunit -lncurses -lm
mbus_unit_test2_SOURCES = mbus_unit_test2.c
mbus_parse_LDFLAGS = -L$(top_builddir)/mbus mbus_parse_LDFLAGS = -L$(top_builddir)/mbus
mbus_parse_LDADD = -lmbus -lm mbus_parse_LDADD = -lmbus -lm
mbus_parse_SOURCES = mbus_parse.c mbus_parse_SOURCES = mbus_parse.c