Make libcompat independent not to confuse automake

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>

diff --git a/configure.ac b/configure.ac
index a0f0bad1619f7b08640afada7bf4e74050f4c5fb..3156273df0c974540f94bfbde752478c61a02358 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -177,6 +177,7 @@ AC_CONFIG_FILES([
        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

diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am
index 88b7c6974f35acf77f733700a5b7b7544842bfa8..44948fc1428ed0fa78f2caefb6ed7c43c3e116db 100644 (file)
--- a/src/bin/lttng-sessiond/Makefile.am
+++ b/src/bin/lttng-sessiond/Makefile.am
@@ -32,7 +32,7 @@ lttng_sessiond_LDADD = -lrt -lurcu-common -lurcu \
                $(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

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index ba93810a8c3fe6af5bf8bd7c4188d037de4421ec..5d79210b802819cd07e14e5b11338c16acfdca09 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS =
 
 AM_CPPFLAGS =
 

-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
 


@@ -10,17 +10,6 @@ noinst_LTLIBRARIES = libcommon.la
 
 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
 


@@ -30,7 +19,7 @@ libconsumer_la_LIBADD = \
                $(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 += \

diff --git a/src/common/compat/Makefile.am b/src/common/compat/Makefile.am
new file mode 100644 (file)
index 0000000..ee5aaba
--- /dev/null
+++ b/src/common/compat/Makefile.am
@@ -0,0 +1,12 @@
+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)