diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2013-11-24 23:21:00 -0800 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-11-24 23:21:00 -0800 |
| commit | 34540babdb6cc527a53003dcb5a13c961bf6ddc7 (patch) | |
| tree | 2ceea618983a029e1634cd4bd389d626d3d74d3f /Makefile.in | |
| parent | 5d84e86d89e532d1a6979e2ed8528a05a7b7de9a (diff) | |
| parent | 9f6223311e7ae6a9d6d21e33bf0fa67822da6fb6 (diff) | |
Merge branch 'master' into ast
Conflicts:
complete.cpp
fish_tests.cpp
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 aa66ac1f..7ef3a967 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 $@ |