diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-15 01:56:36 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-15 01:56:36 -0400 |
| commit | be6cdcb499515a8dc200440f9c0f95d16edbaa2d (patch) | |
| tree | 9b7626a8a5341707648aa97f173954d0e94ca8d4 /src/libsystemd | |
| parent | 3e439de4e3773f26c7efc8d84a57cf2530883739 (diff) | |
| parent | ca23ffae30b2cd8e2ac7f54f77a6ff8c59e3876f (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
# Conflicts:
# build-aux/Makefile.each.tail/50-sd.mk
# build-aux/Makefile.each.tail/70-man.mk
# src/grp-resolve/libbasic-dns/Makefile
# src/grp-system/libcore/Makefile
# tools/notsd-move
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/Makefile | 1 | ||||
| -rw-r--r-- | src/libsystemd/src/Makefile | 1 | ||||
| -rw-r--r-- | src/libsystemd/src/test.mk | 3 |
3 files changed, 0 insertions, 5 deletions
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile index 77fa162d58..7ee4688791 100644 --- a/src/libsystemd/Makefile +++ b/src/libsystemd/Makefile @@ -44,7 +44,6 @@ EXTRA_DIST += \ $(libsystemd_journal_internal_la_CFLAGS) libsystemd_la_LDFLAGS = \ - $(AM_LDFLAGS) \ -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \ -Wl,--version-script=$(srcdir)/libsystemd.sym diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile index 61430ba68d..4554061f93 100644 --- a/src/libsystemd/src/Makefile +++ b/src/libsystemd/src/Makefile @@ -150,7 +150,6 @@ gperf_txt_sources += \ # using _CFLAGS = in the conditional below would suppress AM_CFLAGS libsystemd_journal_internal_la_CFLAGS = \ - $(AM_CFLAGS) libsystemd_journal_internal_la_LIBADD = diff --git a/src/libsystemd/src/test.mk b/src/libsystemd/src/test.mk index 24ddf29958..e75904d554 100644 --- a/src/libsystemd/src/test.mk +++ b/src/libsystemd/src/test.mk @@ -30,7 +30,6 @@ test_bus_marshal_LDADD = \ $(DBUS_LIBS) test_bus_marshal_CFLAGS = \ - $(AM_CFLAGS) \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) @@ -50,7 +49,6 @@ test_bus_cleanup_SOURCES = \ src/libsystemd/sd-bus/test-bus-cleanup.c test_bus_cleanup_CFLAGS = \ - $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) test_bus_cleanup_LDADD = \ @@ -83,7 +81,6 @@ test_bus_gvariant_LDADD = \ $(GLIB_LIBS) test_bus_gvariant_CFLAGS = \ - $(AM_CFLAGS) \ $(GLIB_CFLAGS) test_bus_creds_SOURCES = \ |