use relative libs for dist, add missing files, add define for sysconfdir
This commit is contained in:
@@ -3,6 +3,7 @@ AM_CXXFLAGS = -fpic \
|
||||
-Wextra \
|
||||
-isystem$(top_srcdir)/src/lib/utils \
|
||||
-isystem$(top_srcdir)/src/lib/ebus \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
-DLOCALSTATEDIR=\"$(localstatedir)\"
|
||||
|
||||
bin_PROGRAMS = ebusd
|
||||
@@ -13,10 +14,11 @@ ebusd_SOURCES = bushandler.cpp \
|
||||
network.h \
|
||||
mainloop.cpp \
|
||||
mainloop.h \
|
||||
main.h \
|
||||
main.cpp
|
||||
|
||||
ebusd_LDADD = $(top_srcdir)/src/lib/utils/libutils.a \
|
||||
$(top_srcdir)/src/lib/ebus/libebus.a \
|
||||
ebusd_LDADD = ../lib/utils/libutils.a \
|
||||
../lib/ebus/libebus.a \
|
||||
-lpthread \
|
||||
-lrt
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ libebus_a_SOURCES = result.cpp \
|
||||
result.h \
|
||||
symbol.cpp \
|
||||
symbol.h \
|
||||
filereader.h \
|
||||
data.cpp \
|
||||
data.h \
|
||||
device.cpp \
|
||||
|
||||
@@ -9,16 +9,16 @@ noinst_PROGRAMS = test_device \
|
||||
test_message
|
||||
|
||||
test_device_SOURCES = test_device.cpp
|
||||
test_device_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a
|
||||
test_device_LDADD = ../libebus.a
|
||||
|
||||
test_symbol_SOURCES = test_symbol.cpp
|
||||
test_symbol_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a
|
||||
test_symbol_LDADD = ../libebus.a
|
||||
|
||||
test_data_SOURCES = test_data.cpp
|
||||
test_data_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a
|
||||
test_data_LDADD = ../libebus.a
|
||||
|
||||
test_message_SOURCES = test_message.cpp
|
||||
test_message_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a
|
||||
test_message_LDADD = ../libebus.a
|
||||
|
||||
distclean-local:
|
||||
-rm -f Makefile.in
|
||||
|
||||
@@ -8,13 +8,11 @@ bin_PROGRAMS = ebusctl \
|
||||
ebusfeed
|
||||
|
||||
ebusctl_SOURCES = ebusctl.cpp
|
||||
|
||||
ebusctl_LDADD = $(top_srcdir)/src/lib/utils/libutils.a
|
||||
ebusctl_LDADD = ../lib/utils/libutils.a
|
||||
|
||||
ebusfeed_SOURCES = ebusfeed.cpp
|
||||
|
||||
ebusfeed_LDADD = $(top_srcdir)/src/lib/utils/libutils.a \
|
||||
$(top_srcdir)/src/lib/ebus/libebus.a
|
||||
ebusfeed_LDADD = ../lib/utils/libutils.a \
|
||||
../lib/ebus/libebus.a
|
||||
|
||||
distclean-local:
|
||||
-rm -f Makefile.in
|
||||
|
||||
Reference in New Issue
Block a user