fix stupid merge
This commit is contained in:
@@ -3,7 +3,6 @@ AM_CXXFLAGS = -I$(top_srcdir)/src \
|
||||
-Wno-unused-parameter
|
||||
|
||||
noinst_PROGRAMS = test_filereader \
|
||||
test_device \
|
||||
test_symbol \
|
||||
test_data \
|
||||
test_message
|
||||
@@ -11,9 +10,6 @@ noinst_PROGRAMS = test_filereader \
|
||||
test_filereader_SOURCES = test_filereader.cpp
|
||||
test_filereader_LDADD = ../libebus.a -lpthread
|
||||
|
||||
test_device_SOURCES = test_device.cpp
|
||||
test_device_LDADD = ../libebus.a -lpthread
|
||||
|
||||
test_symbol_SOURCES = test_symbol.cpp
|
||||
test_symbol_LDADD = ../libebus.a -lpthread
|
||||
|
||||
@@ -24,7 +20,6 @@ test_message_SOURCES = test_message.cpp
|
||||
test_message_LDADD = ../libebus.a -lpthread
|
||||
|
||||
if CONTRIB
|
||||
test_device_LDADD += ../contrib/libebuscontrib.a
|
||||
test_data_LDADD += ../contrib/libebuscontrib.a
|
||||
test_message_LDADD += ../contrib/libebuscontrib.a
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user