From 53317eac470eb80382ba6b6841455615d2e08d5f Mon Sep 17 00:00:00 2001 From: marschap Date: Sat, 25 Nov 2006 10:54:01 +0000 Subject: [PATCH] allow compiling with LDFLAG "--as-needed" (Robert Buchholz) --- clients/lcdexec/Makefile.am | 2 +- clients/lcdproc/Makefile.am | 2 +- clients/lcdvc/Makefile.am | 2 +- server/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clients/lcdexec/Makefile.am b/clients/lcdexec/Makefile.am index 3cfb08f..51d3f41 100644 --- a/clients/lcdexec/Makefile.am +++ b/clients/lcdexec/Makefile.am @@ -6,7 +6,7 @@ bin_PROGRAMS = lcdexec lcdexec_SOURCES = lcdexec.c menu.c menu.h -lcdexec_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a +lcdexec_LDADD = ../../shared/libLCDstuff.a @ldap_libs@ AM_CPPFLAGS = -I$(top_srcdir) -DSYSCONFDIR=\"$(sysconfdir)\" diff --git a/clients/lcdproc/Makefile.am b/clients/lcdproc/Makefile.am index 5da515b..20d8a7c 100644 --- a/clients/lcdproc/Makefile.am +++ b/clients/lcdproc/Makefile.am @@ -6,7 +6,7 @@ bin_PROGRAMS = lcdproc lcdproc_SOURCES = main.c main.h mode.c mode.h batt.c batt.h chrono.c chrono.h cpu.c cpu.h cpu_smp.c cpu_smp.h disk.c disk.h load.c load.h mem.c mem.h eyebox.c eyebox.h machine.h machine_Linux.c machine_OpenBSD.c machine_FreeBSD.c machine_NetBSD.c machine_Darwin.c machine_SunOS.c util.c util.h iface.c iface.h -lcdproc_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a +lcdproc_LDADD = ../../shared/libLCDstuff.a @ldap_libs@ if DARWIN AM_LDFLAGS = -framework CoreFoundation -framework IOKit diff --git a/clients/lcdvc/Makefile.am b/clients/lcdvc/Makefile.am index 88afed2..211debd 100644 --- a/clients/lcdvc/Makefile.am +++ b/clients/lcdvc/Makefile.am @@ -6,7 +6,7 @@ bin_PROGRAMS = lcdvc lcdvc_SOURCES = lcdvc.c lcdvc.h lcd_link.c lcd_link.h vc_link.c vc_link.h -lcdvc_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a +lcdvc_LDADD = ../../shared/libLCDstuff.a @ldap_libs@ if DARWIN AM_LDFLAGS = -framework CoreFoundation -framework IOKit diff --git a/server/Makefile.am b/server/Makefile.am index 8684b55..2c84639 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -6,7 +6,7 @@ sbin_PROGRAMS=LCDd LCDd_SOURCES= client.c client.h clients.c clients.h input.c input.h main.c main.h menuitem.c menuitem.h menu.c menu.h menuscreens.c menuscreens.h parse.c parse.h render.c render.h screen.c screen.h screenlist.c screenlist.h serverscreens.c serverscreens.h sock.c sock.h widget.c widget.h drivers.c drivers.h driver.c driver.h -LDADD = @ldap_libs@ ../shared/libLCDstuff.a commands/libLCDcommands.a +LDADD = ../shared/libLCDstuff.a commands/libLCDcommands.a @ldap_libs@ if !DARWIN AM_LDFLAGS = -rdynamic -uget_args