From 4b7abb5b1186422637089f2863cb8c3705c026e0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 23 Jun 2016 04:10:53 +0200 Subject: [PATCH] =?utf8?q?build-sys:=20move=20fdset.[ch]=20src/basic=20?= =?utf8?q?=E2=86=92=20src/shared=20(#3580)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 | 6 +++--- src/{basic => shared}/fdset.c | 0 src/{basic => shared}/fdset.h | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename src/{basic => shared}/fdset.c (100%) rename src/{basic => shared}/fdset.h (100%) diff --git a/Makefile.am b/Makefile.am index 3c13acf28d..02329284f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 += \ diff --git a/src/basic/fdset.c b/src/shared/fdset.c similarity index 100% rename from src/basic/fdset.c rename to src/shared/fdset.c diff --git a/src/basic/fdset.h b/src/shared/fdset.h similarity index 100% rename from src/basic/fdset.h rename to src/shared/fdset.h -- 2.25.1