diff options
| author |  David Adam <zanchey@ucc.gu.uwa.edu.au> | 2013-11-09 19:43:32 +0800 |
|---|---|---|
| committer | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2013-11-09 19:43:32 +0800 |
| commit | 8621399d78b26bdd4287113fc3c41d750cebca8b (patch) | |
| tree | d4d53ed12e6c03afbd4bf7257f7a90b316fb6382 /Makefile.in | |
| parent | 664016741091eec61dca4acdb0f83b97db544cb4 (diff) | |
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
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 4 |
1 files changed, 1 insertions, 3 deletions
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 $@ |