nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use relative libs for dist, add missing files, add define for sysconfdir

Browse Source
This commit is contained in:
john30
2015-02-14 14:18:43 +01:00
parent 0e5e11e22b
commit 1e150844c3
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/Makefile.am
+4 -2
View File
@@ -3,6 +3,7 @@ AM_CXXFLAGS = -fpic \
-Wextra \ -Wextra \
-isystem$(top_srcdir)/src/lib/utils \ -isystem$(top_srcdir)/src/lib/utils \
-isystem$(top_srcdir)/src/lib/ebus \ -isystem$(top_srcdir)/src/lib/ebus \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLOCALSTATEDIR=\"$(localstatedir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
bin_PROGRAMS = ebusd bin_PROGRAMS = ebusd
@@ -13,10 +14,11 @@ ebusd_SOURCES = bushandler.cpp \
network.h \ network.h \
mainloop.cpp \ mainloop.cpp \
mainloop.h \ mainloop.h \
main.h \
main.cpp main.cpp
ebusd_LDADD = $(top_srcdir)/src/lib/utils/libutils.a \ ebusd_LDADD = ../lib/utils/libutils.a \
$(top_srcdir)/src/lib/ebus/libebus.a \ ../lib/ebus/libebus.a \
-lpthread \ -lpthread \
-lrt -lrt
src/lib/ebus/Makefile.am
+1
View File
@@ -9,6 +9,7 @@ libebus_a_SOURCES = result.cpp \
result.h \ result.h \
symbol.cpp \ symbol.cpp \
symbol.h \ symbol.h \
filereader.h \
data.cpp \ data.cpp \
data.h \ data.h \
device.cpp \ device.cpp \
src/lib/ebus/test/Makefile.am
+4 -4
View File
@@ -9,16 +9,16 @@ noinst_PROGRAMS = test_device \
test_message test_message
test_device_SOURCES = test_device.cpp 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_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_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_SOURCES = test_message.cpp
test_message_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a test_message_LDADD = ../libebus.a
distclean-local: distclean-local:
-rm -f Makefile.in -rm -f Makefile.in
src/tools/Makefile.am
+3 -5
View File
@@ -8,13 +8,11 @@ bin_PROGRAMS = ebusctl \
ebusfeed ebusfeed
ebusctl_SOURCES = ebusctl.cpp ebusctl_SOURCES = ebusctl.cpp
ebusctl_LDADD = ../lib/utils/libutils.a
ebusctl_LDADD = $(top_srcdir)/src/lib/utils/libutils.a
ebusfeed_SOURCES = ebusfeed.cpp ebusfeed_SOURCES = ebusfeed.cpp
ebusfeed_LDADD = ../lib/utils/libutils.a \
ebusfeed_LDADD = $(top_srcdir)/src/lib/utils/libutils.a \ ../lib/ebus/libebus.a
$(top_srcdir)/src/lib/ebus/libebus.a
distclean-local: distclean-local:
-rm -f Makefile.in -rm -f Makefile.in