diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2013-11-06 13:14:52 -0800 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-11-06 13:14:52 -0800 |
| commit | 5d84e86d89e532d1a6979e2ed8528a05a7b7de9a (patch) | |
| tree | 88d2b2e0f47dcbeca95598d7e16f9985d920a9cc /Makefile.in | |
| parent | 964c7e6f3be262ac4c6b0285edcd4a685fb5bc97 (diff) | |
| parent | 6d542b8bb0ea96424af6eaf952ee89fc846f622a (diff) | |
Merge branch 'master' into ast
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in index 23e24b38..aa66ac1f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,3 @@ - # Copyright (C) 2005-2006 Axel Liljencrantz # # This program is free software; you can redistribute it and/or modify @@ -61,7 +60,7 @@ optbindirs = @optbindirs@ # Various flags # -MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DBINDIR=L\"$(bindir)\" +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_FISH = ${LDFLAGS} @LIBS_FISH@ @LDFLAGS_FISH@ @@ -233,7 +232,7 @@ TESTS_DIR_FILES := $(TEST_IN) $(TEST_IN:.in=.out) $(TEST_IN:.in=.err) \ # Files in ./share/completions/ # -COMPLETIONS_DIR_FILES := $(wildcard share/completions/*.fish) +COMPLETIONS_DIR_FILES := $(wildcard share/completions/*.fish) share/completions/..fish # @@ -742,7 +741,7 @@ uninstall-translations: # fish: $(FISH_OBJS) fish.o - $(CXX) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@ + $(CXX) $(CXXFLAGS) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@ # @@ -750,7 +749,7 @@ fish: $(FISH_OBJS) fish.o # fish_pager: $(FISH_PAGER_OBJS) - $(CXX) $(FISH_PAGER_OBJS) $(LDFLAGS_FISH_PAGER) -o $@ + $(CXX) $(CXXFLAGS) $(FISH_PAGER_OBJS) $(LDFLAGS_FISH_PAGER) -o $@ # @@ -758,7 +757,7 @@ fish_pager: $(FISH_PAGER_OBJS) # fishd: $(FISHD_OBJS) - $(CXX) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@ + $(CXX) $(CXXFLAGS) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@ # @@ -766,7 +765,7 @@ fishd: $(FISHD_OBJS) # fish_tests: $(FISH_TESTS_OBJS) - $(CXX) $(FISH_TESTS_OBJS) $(LDFLAGS_FISH) -o $@ + $(CXX) $(CXXFLAGS) $(FISH_TESTS_OBJS) $(LDFLAGS_FISH) -o $@ # @@ -776,7 +775,7 @@ fish_tests: $(FISH_TESTS_OBJS) # mimedb: $(MIME_OBJS) - $(CXX) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@ + $(CXX) $(CXXFLAGS) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@ # @@ -784,7 +783,7 @@ mimedb: $(MIME_OBJS) # fish_indent: $(FISH_INDENT_OBJS) - $(CXX) $(FISH_INDENT_OBJS) $(LDFLAGS_FISH_INDENT) -o $@ + $(CXX) $(CXXFLAGS) $(FISH_INDENT_OBJS) $(LDFLAGS_FISH_INDENT) -o $@ # @@ -792,7 +791,7 @@ fish_indent: $(FISH_INDENT_OBJS) # key_reader: key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o - $(CXX) key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o $(LDFLAGS_FISH) -o $@ + $(CXX) $(CXXFLAGS) key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o $(LDFLAGS_FISH) -o $@ # |