diff options
Diffstat (limited to 'src/libshared')
| -rw-r--r-- | src/libshared/Makefile | 14 | ||||
| -rw-r--r-- | src/libshared/bus-util.h | 6 | ||||
| -rw-r--r-- | src/libshared/efivars.c | 2 | ||||
| -rw-r--r-- | src/libshared/efivars.h | 2 | ||||
| -rw-r--r-- | src/libshared/gpt.h | 2 | ||||
| -rw-r--r-- | src/libshared/ptyfwd.h | 2 |
6 files changed, 21 insertions, 7 deletions
diff --git a/src/libshared/Makefile b/src/libshared/Makefile index 0986c817f5..ebaa1a2e33 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -20,6 +20,9 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/automake.head.mk + noinst_LTLIBRARIES += \ libshared.la @@ -134,3 +137,14 @@ libshared_la_LIBADD = \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) +am_out_files += libshared.la +CPPFLAGS += -I$(topsrcdir)/src/libsystemd/include +CPPFLAGS += -I$(topoutdir)/src/libsystemd/include +CPPFLAGS += -I$(topsrcdir)/src/libbasic +CPPFLAGS += -I$(topoutdir)/src/libbasic +CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" +CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ +$(outdir)/libshared.la: \ + $(patsubst src/shared/%.c,$(outdir)/%.lo,$(filter %.c,$(libshared_la_SOURCES))) + +include $(topsrcdir)/automake.tail.mk diff --git a/src/libshared/bus-util.h b/src/libshared/bus-util.h index 204da55682..77474522be 100644 --- a/src/libshared/bus-util.h +++ b/src/libshared/bus-util.h @@ -24,9 +24,9 @@ #include <stdint.h> #include <sys/types.h> -#include "sd-bus-vtable.h" -#include "sd-bus.h" -#include "sd-event.h" +#include <systemd/sd-bus-vtable.h> +#include <systemd/sd-bus.h> +#include <systemd/sd-event.h> #include "hashmap.h" #include "install.h" diff --git a/src/libshared/efivars.c b/src/libshared/efivars.c index 8631a5a5d9..5073c61740 100644 --- a/src/libshared/efivars.c +++ b/src/libshared/efivars.c @@ -27,7 +27,7 @@ #include <sys/stat.h> #include <unistd.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "dirent-util.h" diff --git a/src/libshared/efivars.h b/src/libshared/efivars.h index b61d14c4ec..243151f922 100644 --- a/src/libshared/efivars.h +++ b/src/libshared/efivars.h @@ -23,7 +23,7 @@ #include <stddef.h> #include <stdint.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "time-util.h" diff --git a/src/libshared/gpt.h b/src/libshared/gpt.h index 52ab29ed5f..9b8f59abee 100644 --- a/src/libshared/gpt.h +++ b/src/libshared/gpt.h @@ -21,7 +21,7 @@ #include <endian.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> /* We only support root disk discovery for x86, x86-64, Itanium and ARM for * now, since EFI for anything else doesn't really exist, and we only diff --git a/src/libshared/ptyfwd.h b/src/libshared/ptyfwd.h index a046eb4e5e..83c1f60970 100644 --- a/src/libshared/ptyfwd.h +++ b/src/libshared/ptyfwd.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "macro.h" |