diff options
| author | Martin Lucina <martin@lucina.net> | 2012-05-21 13:44:02 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2012-05-21 13:44:02 +0200 |
| commit | 9839659de3f7d8e8827af776d23efe15627c7d3e (patch) | |
| tree | 5c889b61984bd14f9990e34f69a7a43e01fd4024 /src/Makefile.am | |
| parent | 3f9d24d24322ed40d861c006671a386532728812 (diff) | |
Fixes a conflict with XenStore (see
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=668550)
Signed-off-by: Martin Lucina <martin@lucina.net>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 390dc50..8c3de7c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,16 +5,16 @@ lib_LTLIBRARIES = libxs.la libzmq.la pkgconfig_DATA = libxs.pc libzmq.pc -include_HEADERS = ../include/xs.h \ - ../include/zmq.h ../include/zmq_utils.h +include_HEADERS = ../include/zmq.h ../include/zmq_utils.h else lib_LTLIBRARIES = libxs.la pkgconfig_DATA = libxs.pc - -include_HEADERS = ../include/xs.h endif +xsincludedir = $(includedir)/xs +xsinclude_HEADERS = ../include/xs/xs.h + libxs_la_SOURCES = \ address.hpp \ array.hpp \ |