Moving libcompat.la to the compat/ subdirectory and building it before
every other libs.
(closes #101 #153)
Signed-off-by: David Goulet <dgoulet@efficios.com>
src/common/ust-consumer/Makefile
src/common/hashtable/Makefile
src/common/sessiond-comm/Makefile
src/common/ust-consumer/Makefile
src/common/hashtable/Makefile
src/common/sessiond-comm/Makefile
+ src/common/compat/Makefile
src/lib/Makefile
src/lib/lttng-ctl/Makefile
src/bin/Makefile
src/lib/Makefile
src/lib/lttng-ctl/Makefile
src/bin/Makefile
$(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
$(top_builddir)/src/common/hashtable/libhashtable.la \
$(top_builddir)/src/common/libcommon.la \
$(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
$(top_builddir)/src/common/hashtable/libhashtable.la \
$(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/common/libcompat.la
+ $(top_builddir)/src/common/compat/libcompat.la
if HAVE_LIBLTTNG_UST_CTL
lttng_sessiond_LDADD += -llttng-ust-ctl
if HAVE_LIBLTTNG_UST_CTL
lttng_sessiond_LDADD += -llttng-ust-ctl
-SUBDIRS = hashtable kernel-ctl sessiond-comm kernel-consumer ust-consumer
+SUBDIRS = compat hashtable kernel-ctl sessiond-comm kernel-consumer ust-consumer
AM_CFLAGS = -fno-strict-aliasing
AM_CFLAGS = -fno-strict-aliasing
libcommon_la_SOURCES = runas.c runas.h common.h
libcommon_la_SOURCES = runas.c runas.h common.h
-if COMPAT_EPOLL
-COMPAT=compat/compat-epoll.c
-else
-COMPAT=compat/compat-poll.c
-endif
-
-noinst_LTLIBRARIES += libcompat.la
-
-libcompat_la_SOURCES = compat/poll.h compat/fcntl.h compat/splice.h compat/endian.h \
- compat/socket.h compat/compat-fcntl.c $(COMPAT)
-
# Consumer library
noinst_LTLIBRARIES += libconsumer.la
# Consumer library
noinst_LTLIBRARIES += libconsumer.la
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
$(top_builddir)/src/common/kernel-consumer/libkernel-consumer.la \
$(top_builddir)/src/common/hashtable/libhashtable.la \
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
$(top_builddir)/src/common/kernel-consumer/libkernel-consumer.la \
$(top_builddir)/src/common/hashtable/libhashtable.la \
- $(top_builddir)/src/common/libcompat.la
+ $(top_builddir)/src/common/compat/libcompat.la
if HAVE_LIBLTTNG_UST_CTL
libconsumer_la_LIBADD += \
if HAVE_LIBLTTNG_UST_CTL
libconsumer_la_LIBADD += \
--- /dev/null
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
+noinst_LTLIBRARIES = libcompat.la
+
+if COMPAT_EPOLL
+COMPAT=compat-epoll.c
+else
+COMPAT=compat-poll.c
+endif
+
+libcompat_la_SOURCES = poll.h fcntl.h splice.h endian.h \
+ socket.h compat-fcntl.c $(COMPAT)