summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-01 17:53:09 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-01 17:53:09 -0400
commit534754b0800a464247496f8c49948381797d9afb (patch)
treea0d89e719fb53e2bcdf2f9ed4cb91f56ccc74e0c
parent5abbec416484b36048b9011d0ba0eb7888715765 (diff)
work on libshared
-rw-r--r--src/libshared/Makefile30
1 files changed, 21 insertions, 9 deletions
diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index eb155c1ed9..5a4c868193 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -138,14 +138,26 @@ libshared_la_LIBADD = \
$(SECCOMP_LIBS)
$(eval $(value automake2autothing))
-std.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)))
+at.depdirs +=
+AM_CPPFLAGS += $(libbasic.CPPFLAGS)
+AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
+AM_CPPFLAGS += -I$(topsrcdir)/src/journal
+
+AM_CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+AM_CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\"
+AM_CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\"
+AM_CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\"
+AM_CPPFLAGS += -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\"
+AM_CPPFLAGS += -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\"
+AM_CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\"
+
+AM_CPPFLAGS += -DSYSTEMD_FSCK_PATH=\"$(rootlibexecdir)/systemd-fsck\"
+
+AM_CPPFLAGS += -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\"
+
+AM_CPPFLAGS += -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\"
+AM_CPPFLAGS += -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\"
+
+AM_CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\"
include $(topsrcdir)/build-aux/Makefile.tail.mk