diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 17:23:29 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 17:23:29 -0400 |
| commit | 5abbec416484b36048b9011d0ba0eb7888715765 (patch) | |
| tree | 7e49cbc49818ccf9b0f4449185efedfff355ebc8 /src/libshared | |
| parent | bcf1acd2a33706c296339f5627eb4070fdda2ecd (diff) | |
| parent | 3c809f112da0458a7d80c903543b430e08279385 (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# build-aux/Makefile.once.head/20-systemd.mk
# build-aux/Makefile.once.tail/20-systemd.mk
# config.mk.in
# src/libbasic/Makefile
# src/libshared/Makefile
# src/libsystemd/libsystemd-internal/Makefile
Diffstat (limited to 'src/libshared')
| -rw-r--r-- | src/libshared/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libshared/Makefile b/src/libshared/Makefile index 3c260f5ae6..eb155c1ed9 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -137,6 +137,7 @@ libshared_la_LIBADD = \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) +$(eval $(value automake2autothing)) std.out_files += libshared.la CPPFLAGS += -I$(topsrcdir)/src/libsystemd/include CPPFLAGS += -I$(topoutdir)/src/libsystemd/include @@ -147,6 +148,4 @@ CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ $(outdir)/libshared.la: \ $(patsubst src/shared/%.c,$(outdir)/%.lo,$(filter %.c,$(libshared_la_SOURCES))) -$(call amtarget2dir,src/shared,libshared.la) - include $(topsrcdir)/build-aux/Makefile.tail.mk |