[systemd-commits] Makefile.am

[Dave Reisner]

 Makefile.am |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 855f6f07fec5106c1c0201dd70ffab6764a0c1a6
Author: Dave Reisner <dreisner at archlinux.org>
Date:   Sun Feb 24 16:39:25 2013 -0500

    build: remove explicit -shared in LDFLAGS
    
    This doesn't need to be passed, as it's handled by libtool. Since the
    default for autoconf is --disable-static, this change is effectively a
    noop. It only matters if you pass --enable-static, in which case the
    static libs for systemd libraries will actually be built.
    
    Nitpicky, but this only affects systemd libs. The override for the
    other libs remains since these libs are always loaded dynamically and
    never compiled staticly.

diff --git a/Makefile.am b/Makefile.am
index f2d3ac7..f0f0ebc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1560,7 +1560,6 @@ libsystemd_daemon_la_CFLAGS = \
 
 libsystemd_daemon_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-shared \
 	-version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
 
@@ -2261,7 +2260,6 @@ libsystemd_id128_la_CFLAGS = \
 
 libsystemd_id128_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-shared \
 	-version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
@@ -2452,7 +2450,6 @@ libsystemd_journal_la_CFLAGS = \
 
 libsystemd_journal_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-shared \
 	-version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
 
@@ -3254,7 +3251,6 @@ libsystemd_login_la_CFLAGS = \
 
 libsystemd_login_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-shared \
 	-version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym