Merge pull request #474 from InuSasha/fixes/lirc_build

lirc: replace parallel build fix
This commit is contained in:
Lukas Rusak 2016-06-24 00:32:13 -07:00 committed by GitHub
commit fd0391fa09
2 changed files with 22 additions and 28 deletions

View File

@ -0,0 +1,22 @@
--- a/lib/Makefile.am.org 2016-05-23 19:18:48.000000000 +0200
+++ a/lib/Makefile.am 2016-06-22 22:15:26.511048224 +0200
@@ -31,9 +31,11 @@
libirrecord_la_LDFLAGS = -llirc
libirrecord_la_SOURCES = irrecord.c
+libirrecord_la_DEPENDENCIES = liblirc.la
liblirc_client_la_LDFLAGS = -version-info 4:0:4
liblirc_client_la_SOURCES = lirc_client.c lirc_client.h lirc_log.c lirc_log.h
+liblirc_client_la_DEPENDENCIES = liblirc.la
liblirc_driver_la_LDFLAGS = -version-info 0:0:0
liblirc_driver_la_SOURCES = driver.h \
@@ -49,6 +51,7 @@
serial.c \
transmit.c \
transmit.h
+liblirc_driver_la_DEPENDENCIES = liblirc.la
dist_include_HEADERS = lirc_client.h \
lirc_driver.h \

View File

@ -1,28 +0,0 @@
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -29,7 +29,7 @@
transmit.c \
util.c
-libirrecord_la_LDFLAGS = -llirc
+libirrecord_la_LIBADD = -llirc
libirrecord_la_SOURCES = irrecord.c
liblirc_client_la_LDFLAGS = -version-info 4:0:4
@@ -98,10 +98,16 @@
input_map.inc: lirc/input_map.inc
+if BSD
+lirc/input_map.inc:
+ touch $@
+ touch touch input_map.inc
+else
lirc/input_map.inc:
ln -s . lirc || :
$(top_srcdir)/tools/lirc-make-devinput -i > input_map.inc
$(top_srcdir)/tools/lirc-make-devinput -i > $@
+endif
checkfiles:
../git-tools/checkfiles $(SOURCES) $(HEADERS)