]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
build-sys: move fdset.[ch] src/basic → src/shared (#3580)
authorLennart Poettering <lennart@poettering.net>
Thu, 23 Jun 2016 02:10:53 +0000 (04:10 +0200)
committerEvgeny Vereshchagin <evvers@ya.ru>
Thu, 23 Jun 2016 02:10:53 +0000 (05:10 +0300)
It makes use of the sd_listen_fds() call, and as such should live in
src/shared, as the distinction between src/basic and src/shared is that the
latter may use libsystemd APIs, the former does not.

Note that btrfs-util.[ch] and log.[ch] also include header files from
libsystemd, but they only need definitions, they do not invoke any function
from it. Hence they may stay in src/basic.

Makefile.am
src/shared/fdset.c [moved from src/basic/fdset.c with 100% similarity]
src/shared/fdset.h [moved from src/basic/fdset.h with 100% similarity]

index 3c13acf28d0a9bc3bff12757d5e9c6eddb3e0e5e..02329284f5790046b0328a4fd9e61f7ee3bbaed5 100644 (file)
@@ -836,8 +836,6 @@ libbasic_la_SOURCES = \
        src/basic/ordered-set.c \
        src/basic/bitmap.c \
        src/basic/bitmap.h \
-       src/basic/fdset.c \
-       src/basic/fdset.h \
        src/basic/prioq.c \
        src/basic/prioq.h \
        src/basic/web-util.c \
@@ -1050,7 +1048,9 @@ libshared_la_SOURCES = \
        src/shared/vlan-util.h \
        src/shared/vlan-util.c \
        src/shared/tests.h \
-       src/shared/tests.c
+       src/shared/tests.c \
+       src/shared/fdset.c \
+       src/shared/fdset.h
 
 if HAVE_UTMP
 libshared_la_SOURCES += \
similarity index 100%
rename from src/basic/fdset.c
rename to src/shared/fdset.c
similarity index 100%
rename from src/basic/fdset.h
rename to src/shared/fdset.h