From 8621399d78b26bdd4287113fc3c41d750cebca8b Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 9 Nov 2013 19:43:32 +0800
Subject: configure/Makefile: respect $LIBS, remove some egregarious lies

 - expunge LIBS_COMMON, it doesn't get used anywhere
 - don't reset LIBS to empty
 - move the gettext test as every binary depends on it
 - only include one set of libraries
---
 Makefile.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index a8a24070..2b161607 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,7 +62,7 @@ optbindirs = @optbindirs@
 
 MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DBINDIR=L\"$(bindir)\" -DDOCDIR=L\"$(docdir)\"
 CXXFLAGS = @CXXFLAGS@ $(MACROS) $(EXTRA_CXXFLAGS)
-LDFLAGS = @LIBS@ @LDFLAGS@
+LDFLAGS = @LDFLAGS@
 LDFLAGS_FISH = ${LDFLAGS} @LIBS_FISH@ @LDFLAGS_FISH@
 LDFLAGS_FISH_INDENT = ${LDFLAGS} @LIBS_FISH_INDENT@
 LDFLAGS_FISH_PAGER = ${LDFLAGS} @LIBS_FISH_PAGER@
@@ -771,8 +771,6 @@ fish_tests: $(FISH_TESTS_OBJS)
 #
 # Build the mimedb program.
 #
-# mimedb does not need any libraries, so we don't use LDFLAGS here.
-#
 
 mimedb: $(MIME_OBJS)
 	$(CXX) $(CXXFLAGS) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@
-- 
cgit v1.2.3