diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2015-07-25 12:31:57 -0700 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2015-07-25 12:31:57 -0700 |
commit | a91e8887cd88e442f2b0876427991c440583fbc2 (patch) | |
tree | 573d35489feee2e3bb1dfd7c60f8b4eecb9544c8 | |
parent | d3a0372e896ee4d1ed5313b98ad4680589843976 (diff) | |
parent | b4f53143b0e05fd3061cdf2e65e17a6a2904090b (diff) |
Migrate source files into src/ directory
This change moves source files into a src/ directory,
and puts object files into an obj/ directory. The Makefile
and xcode project are updated accordingly.
Fixes #1866
-rw-r--r-- | Makefile.in | 473 | ||||
-rw-r--r-- | fish.xcodeproj/project.pbxproj | 3 | ||||
-rw-r--r-- | src/autoload.cpp (renamed from autoload.cpp) | 0 | ||||
-rw-r--r-- | src/autoload.h (renamed from autoload.h) | 0 | ||||
-rw-r--r-- | src/builtin.cpp (renamed from builtin.cpp) | 0 | ||||
-rw-r--r-- | src/builtin.h (renamed from builtin.h) | 0 | ||||
-rw-r--r-- | src/builtin_commandline.cpp (renamed from builtin_commandline.cpp) | 0 | ||||
-rw-r--r-- | src/builtin_complete.cpp (renamed from builtin_complete.cpp) | 0 | ||||
-rw-r--r-- | src/builtin_jobs.cpp (renamed from builtin_jobs.cpp) | 0 | ||||
-rw-r--r-- | src/builtin_printf.cpp (renamed from builtin_printf.cpp) | 0 | ||||
-rw-r--r-- | src/builtin_set.cpp (renamed from builtin_set.cpp) | 0 | ||||
-rw-r--r-- | src/builtin_set_color.cpp (renamed from builtin_set_color.cpp) | 0 | ||||
-rw-r--r-- | src/builtin_test.cpp (renamed from builtin_test.cpp) | 0 | ||||
-rw-r--r-- | src/builtin_ulimit.cpp (renamed from builtin_ulimit.cpp) | 0 | ||||
-rw-r--r-- | src/color.cpp (renamed from color.cpp) | 0 | ||||
-rw-r--r-- | src/color.h (renamed from color.h) | 0 | ||||
-rw-r--r-- | src/common.cpp (renamed from common.cpp) | 0 | ||||
-rw-r--r-- | src/common.h (renamed from common.h) | 0 | ||||
-rw-r--r-- | src/complete.cpp (renamed from complete.cpp) | 0 | ||||
-rw-r--r-- | src/complete.h (renamed from complete.h) | 0 | ||||
-rw-r--r-- | src/env.cpp (renamed from env.cpp) | 0 | ||||
-rw-r--r-- | src/env.h (renamed from env.h) | 0 | ||||
-rw-r--r-- | src/env_universal_common.cpp (renamed from env_universal_common.cpp) | 0 | ||||
-rw-r--r-- | src/env_universal_common.h (renamed from env_universal_common.h) | 0 | ||||
-rw-r--r-- | src/event.cpp (renamed from event.cpp) | 0 | ||||
-rw-r--r-- | src/event.h (renamed from event.h) | 0 | ||||
-rw-r--r-- | src/exec.cpp (renamed from exec.cpp) | 0 | ||||
-rw-r--r-- | src/exec.h (renamed from exec.h) | 0 | ||||
-rw-r--r-- | src/expand.cpp (renamed from expand.cpp) | 0 | ||||
-rw-r--r-- | src/expand.h (renamed from expand.h) | 0 | ||||
-rw-r--r-- | src/fallback.cpp (renamed from fallback.cpp) | 0 | ||||
-rw-r--r-- | src/fallback.h (renamed from fallback.h) | 0 | ||||
-rw-r--r-- | src/fish.cpp (renamed from fish.cpp) | 0 | ||||
-rw-r--r-- | src/fish_indent.cpp (renamed from fish_indent.cpp) | 0 | ||||
-rw-r--r-- | src/fish_tests.cpp (renamed from fish_tests.cpp) | 0 | ||||
-rw-r--r-- | src/fish_version.cpp (renamed from fish_version.cpp) | 0 | ||||
-rw-r--r-- | src/fish_version.h (renamed from fish_version.h) | 0 | ||||
-rw-r--r-- | src/function.cpp (renamed from function.cpp) | 0 | ||||
-rw-r--r-- | src/function.h (renamed from function.h) | 0 | ||||
-rw-r--r-- | src/highlight.cpp (renamed from highlight.cpp) | 0 | ||||
-rw-r--r-- | src/highlight.h (renamed from highlight.h) | 0 | ||||
-rw-r--r-- | src/history.cpp (renamed from history.cpp) | 0 | ||||
-rw-r--r-- | src/history.h (renamed from history.h) | 0 | ||||
-rw-r--r-- | src/input.cpp (renamed from input.cpp) | 0 | ||||
-rw-r--r-- | src/input.h (renamed from input.h) | 0 | ||||
-rw-r--r-- | src/input_common.cpp (renamed from input_common.cpp) | 0 | ||||
-rw-r--r-- | src/input_common.h (renamed from input_common.h) | 0 | ||||
-rw-r--r-- | src/intern.cpp (renamed from intern.cpp) | 0 | ||||
-rw-r--r-- | src/intern.h (renamed from intern.h) | 0 | ||||
-rw-r--r-- | src/io.cpp (renamed from io.cpp) | 0 | ||||
-rw-r--r-- | src/io.h (renamed from io.h) | 0 | ||||
-rw-r--r-- | src/iothread.cpp (renamed from iothread.cpp) | 0 | ||||
-rw-r--r-- | src/iothread.h (renamed from iothread.h) | 0 | ||||
-rw-r--r-- | src/key_reader.cpp (renamed from key_reader.cpp) | 0 | ||||
-rw-r--r-- | src/kill.cpp (renamed from kill.cpp) | 0 | ||||
-rw-r--r-- | src/kill.h (renamed from kill.h) | 0 | ||||
-rw-r--r-- | src/lru.h (renamed from lru.h) | 0 | ||||
-rw-r--r-- | src/output.cpp (renamed from output.cpp) | 0 | ||||
-rw-r--r-- | src/output.h (renamed from output.h) | 0 | ||||
-rw-r--r-- | src/pager.cpp (renamed from pager.cpp) | 0 | ||||
-rw-r--r-- | src/pager.h (renamed from pager.h) | 0 | ||||
-rw-r--r-- | src/parse_constants.h (renamed from parse_constants.h) | 0 | ||||
-rw-r--r-- | src/parse_execution.cpp (renamed from parse_execution.cpp) | 0 | ||||
-rw-r--r-- | src/parse_execution.h (renamed from parse_execution.h) | 0 | ||||
-rw-r--r-- | src/parse_productions.cpp (renamed from parse_productions.cpp) | 0 | ||||
-rw-r--r-- | src/parse_productions.h (renamed from parse_productions.h) | 0 | ||||
-rw-r--r-- | src/parse_tree.cpp (renamed from parse_tree.cpp) | 0 | ||||
-rw-r--r-- | src/parse_tree.h (renamed from parse_tree.h) | 0 | ||||
-rw-r--r-- | src/parse_util.cpp (renamed from parse_util.cpp) | 0 | ||||
-rw-r--r-- | src/parse_util.h (renamed from parse_util.h) | 0 | ||||
-rw-r--r-- | src/parser.cpp (renamed from parser.cpp) | 0 | ||||
-rw-r--r-- | src/parser.h (renamed from parser.h) | 0 | ||||
-rw-r--r-- | src/parser_keywords.cpp (renamed from parser_keywords.cpp) | 0 | ||||
-rw-r--r-- | src/parser_keywords.h (renamed from parser_keywords.h) | 0 | ||||
-rw-r--r-- | src/path.cpp (renamed from path.cpp) | 0 | ||||
-rw-r--r-- | src/path.h (renamed from path.h) | 0 | ||||
-rw-r--r-- | src/postfork.cpp (renamed from postfork.cpp) | 0 | ||||
-rw-r--r-- | src/postfork.h (renamed from postfork.h) | 0 | ||||
-rw-r--r-- | src/print_help.cpp (renamed from print_help.cpp) | 0 | ||||
-rw-r--r-- | src/print_help.h (renamed from print_help.h) | 0 | ||||
-rw-r--r-- | src/proc.cpp (renamed from proc.cpp) | 0 | ||||
-rw-r--r-- | src/proc.h (renamed from proc.h) | 0 | ||||
-rw-r--r-- | src/reader.cpp (renamed from reader.cpp) | 0 | ||||
-rw-r--r-- | src/reader.h (renamed from reader.h) | 0 | ||||
-rw-r--r-- | src/sanity.cpp (renamed from sanity.cpp) | 0 | ||||
-rw-r--r-- | src/sanity.h (renamed from sanity.h) | 0 | ||||
-rw-r--r-- | src/screen.cpp (renamed from screen.cpp) | 0 | ||||
-rw-r--r-- | src/screen.h (renamed from screen.h) | 0 | ||||
-rw-r--r-- | src/signal.cpp (renamed from signal.cpp) | 0 | ||||
-rw-r--r-- | src/signal.h (renamed from signal.h) | 0 | ||||
-rw-r--r-- | src/tokenizer.cpp (renamed from tokenizer.cpp) | 0 | ||||
-rw-r--r-- | src/tokenizer.h (renamed from tokenizer.h) | 0 | ||||
-rw-r--r-- | src/utf8.cpp (renamed from utf8.cpp) | 0 | ||||
-rw-r--r-- | src/utf8.h (renamed from utf8.h) | 0 | ||||
-rw-r--r-- | src/util.cpp (renamed from util.cpp) | 0 | ||||
-rw-r--r-- | src/util.h (renamed from util.h) | 0 | ||||
-rw-r--r-- | src/wcstringutil.cpp (renamed from wcstringutil.cpp) | 0 | ||||
-rw-r--r-- | src/wcstringutil.h (renamed from wcstringutil.h) | 0 | ||||
-rw-r--r-- | src/wgetopt.cpp (renamed from wgetopt.cpp) | 0 | ||||
-rw-r--r-- | src/wgetopt.h (renamed from wgetopt.h) | 0 | ||||
-rw-r--r-- | src/wildcard.cpp (renamed from wildcard.cpp) | 0 | ||||
-rw-r--r-- | src/wildcard.h (renamed from wildcard.h) | 0 | ||||
-rw-r--r-- | src/wutil.cpp (renamed from wutil.cpp) | 0 | ||||
-rw-r--r-- | src/wutil.h (renamed from wutil.h) | 0 |
104 files changed, 280 insertions, 196 deletions
diff --git a/Makefile.in b/Makefile.in index 695878c4..8cce25c5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -54,7 +54,7 @@ localedir = @localedir@ # MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DBINDIR=L\"$(bindir)\" -DDOCDIR=L\"$(docdir)\" -CXXFLAGS = @CXXFLAGS@ $(MACROS) $(EXTRA_CXXFLAGS) +CXXFLAGS = @CXXFLAGS@ -iquote. -iquote./src/ $(MACROS) $(EXTRA_CXXFLAGS) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -73,42 +73,37 @@ HAVE_GETTEXT=@HAVE_GETTEXT@ HAVE_DOXYGEN=@HAVE_DOXYGEN@ # -#Additional .cpp files used by common.o. These also have a corresponding -#.h file. -# - -COMMON_FILES := util.cpp fallback.cpp - - -# # All objects that the system needs to build fish, except fish.o # -FISH_OBJS := function.o builtin.o complete.o env.o exec.o expand.o \ - highlight.o history.o kill.o parser.o proc.o reader.o sanity.o \ - tokenizer.o wildcard.o wgetopt.o wutil.o input.o output.o intern.o \ - env_universal_common.o input_common.o event.o \ - signal.o io.o parse_util.o common.o screen.o path.o autoload.o \ - parser_keywords.o iothread.o color.o postfork.o \ - builtin_test.o parse_tree.o parse_productions.o parse_execution.o \ - pager.o utf8.o fish_version.o wcstringutil.o +FISH_OBJS := obj/function.o obj/builtin.o obj/complete.o obj/env.o obj/exec.o \ + obj/expand.o obj/highlight.o obj/history.o obj/kill.o obj/parser.o \ + obj/proc.o obj/reader.o obj/sanity.o obj/tokenizer.o obj/wildcard.o \ + obj/wgetopt.o obj/wutil.o obj/input.o obj/output.o obj/intern.o \ + obj/env_universal_common.o obj/input_common.o obj/event.o obj/signal.o \ + obj/io.o obj/parse_util.o obj/common.o obj/screen.o obj/path.o \ + obj/autoload.o obj/parser_keywords.o obj/iothread.o obj/color.o \ + obj/postfork.o obj/builtin_test.o obj/parse_tree.o obj/parse_productions.o \ + obj/parse_execution.o obj/pager.o obj/utf8.o obj/fish_version.o \ + obj/wcstringutil.o -FISH_INDENT_OBJS := fish_indent.o print_help.o $(FISH_OBJS) +FISH_INDENT_OBJS := obj/fish_indent.o obj/print_help.o $(FISH_OBJS) # # Additional files used by builtin.o # -BUILTIN_FILES := builtin_set.cpp builtin_commandline.cpp \ - builtin_ulimit.cpp builtin_complete.cpp builtin_jobs.cpp \ - builtin_set_color.cpp builtin_printf.cpp +BUILTIN_FILES := src/builtin_set.cpp src/builtin_commandline.cpp \ + src/builtin_ulimit.cpp src/builtin_complete.cpp \ + src/builtin_jobs.cpp src/builtin_set_color.cpp \ + src/builtin_printf.cpp # # All objects that the system needs to build fish_tests # -FISH_TESTS_OBJS := $(FISH_OBJS) fish_tests.o +FISH_TESTS_OBJS := $(FISH_OBJS) obj/fish_tests.o # @@ -218,7 +213,7 @@ all: $(PROGRAMS) $(user_doc) $(share_man) $(TRANSLATIONS) fish.pc FISH-BUILD-VERSION-FILE: FORCE @./build_tools/git_version_gen.sh -include FISH-BUILD-VERSION-FILE -CPPFLAGS += -DFISH_BUILD_VERSION=\"$(FISH_BUILD_VERSION)\" +CXXFLAGS += -DFISH_BUILD_VERSION=\"$(FISH_BUILD_VERSION)\" .PHONY: FORCE fish_version.o: FISH-BUILD-VERSION-FILE @@ -471,8 +466,6 @@ messages.pot: *.cpp *.h share/completions/*.fish share/functions/*.fish builtin.o: $(BUILTIN_FILES) -common.o: $(COMMON_FILES) - # # Generate the internal help functions by making doxygen create @@ -762,11 +755,23 @@ uninstall-translations: # # +# How basic files get compiled +# +obj/%.o: src/%.cpp | obj + $(CXX) $(CXXFLAGS) -c $< -o $@ + +# +# obj directory +# +obj: + mkdir obj + +# # Build the fish program. # -fish: $(FISH_OBJS) fish.o - $(CXX) $(CXXFLAGS) $(LDFLAGS_FISH) $(FISH_OBJS) fish.o $(LIBS) -o $@ +fish: $(FISH_OBJS) obj/fish.o + $(CXX) $(CXXFLAGS) $(LDFLAGS_FISH) $(FISH_OBJS) obj/fish.o $(LIBS) -o $@ # @@ -797,7 +802,7 @@ key_reader: $(FISH_OBJS) key_reader.o # Update dependencies # depend: - makedepend -fMakefile.in -Y *.cpp + makedepend -fMakefile.in -Y src/*.cpp ./config.status .PHONY: depend @@ -824,7 +829,7 @@ distclean: clean # deleted we won't be able to regenerate them clean: - rm -f *.o doc.h doc.tmp doc_src/*.doxygen doc_src/*.cpp doc_src/*.o doc_src/commands.hdr + rm -f obj/*.o *.o doc.h doc.tmp doc_src/*.doxygen doc_src/*.cpp doc_src/*.o doc_src/commands.hdr rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt rm -f $(PROGRAMS) fish_tests key_reader rm -f command_list.txt command_list_toc.txt toc.txt @@ -835,174 +840,252 @@ clean: rm -rf doc user_doc share/man; \ fi rm -f po/*.gmo + rm -rf obj .PHONY: clean # DO NOT DELETE THIS LINE -- make depend depends on it. -autoload.o: config.h autoload.h common.h util.h lru.h wutil.h signal.h env.h -autoload.o: exec.h proc.h io.h parse_tree.h tokenizer.h parse_constants.h -builtin.o: config.h signal.h fallback.h util.h wutil.h common.h builtin.h -builtin.o: io.h function.h event.h env.h complete.h proc.h parse_tree.h -builtin.o: tokenizer.h parse_constants.h parser.h reader.h highlight.h -builtin.o: color.h wgetopt.h sanity.h wildcard.h expand.h input_common.h -builtin.o: input.h intern.h exec.h parse_util.h autoload.h lru.h -builtin.o: parser_keywords.h path.h history.h wcstringutil.h builtin_set.cpp -builtin.o: builtin_commandline.cpp builtin_complete.cpp builtin_ulimit.cpp -builtin.o: builtin_jobs.cpp builtin_set_color.cpp output.h screen.h -builtin.o: builtin_printf.cpp -builtin_commandline.o: config.h signal.h fallback.h util.h wutil.h common.h -builtin_commandline.o: builtin.h io.h wgetopt.h reader.h complete.h -builtin_commandline.o: highlight.h env.h color.h parse_constants.h proc.h -builtin_commandline.o: parse_tree.h tokenizer.h parser.h event.h function.h -builtin_commandline.o: input_common.h input.h parse_util.h autoload.h lru.h -builtin_complete.o: config.h signal.h fallback.h util.h wutil.h common.h -builtin_complete.o: builtin.h io.h complete.h wgetopt.h parser.h proc.h -builtin_complete.o: parse_tree.h tokenizer.h parse_constants.h event.h -builtin_complete.o: function.h env.h reader.h highlight.h color.h -builtin_jobs.o: config.h fallback.h signal.h util.h wutil.h common.h -builtin_jobs.o: builtin.h io.h proc.h parse_tree.h tokenizer.h -builtin_jobs.o: parse_constants.h parser.h event.h function.h env.h wgetopt.h -builtin_printf.o: common.h util.h -builtin_set.o: config.h signal.h fallback.h util.h wutil.h common.h builtin.h -builtin_set.o: io.h env.h expand.h parse_constants.h wgetopt.h proc.h -builtin_set.o: parse_tree.h tokenizer.h parser.h event.h function.h -builtin_set_color.o: config.h builtin.h util.h io.h common.h color.h output.h -builtin_set_color.o: fallback.h signal.h screen.h highlight.h env.h -builtin_test.o: config.h common.h util.h builtin.h io.h wutil.h proc.h -builtin_test.o: signal.h parse_tree.h tokenizer.h parse_constants.h -builtin_ulimit.o: config.h fallback.h signal.h util.h builtin.h io.h common.h -builtin_ulimit.o: wgetopt.h -color.o: color.h config.h common.h util.h fallback.h signal.h -common.o: config.h fallback.h signal.h util.h wutil.h common.h expand.h -common.o: parse_constants.h proc.h io.h parse_tree.h tokenizer.h wildcard.h -common.o: complete.h parser.h event.h function.h env.h util.cpp fallback.cpp -complete.o: config.h signal.h fallback.h util.h tokenizer.h common.h -complete.o: wildcard.h expand.h parse_constants.h complete.h proc.h io.h -complete.o: parse_tree.h parser.h event.h function.h env.h builtin.h exec.h -complete.o: reader.h highlight.h color.h history.h wutil.h intern.h -complete.o: parse_util.h autoload.h lru.h parser_keywords.h path.h iothread.h -env.o: config.h signal.h fallback.h util.h wutil.h common.h proc.h io.h -env.o: parse_tree.h tokenizer.h parse_constants.h env.h sanity.h expand.h -env.o: history.h reader.h complete.h highlight.h color.h parser.h event.h -env.o: function.h env_universal_common.h input.h input_common.h path.h -env.o: fish_version.h -env_universal_common.o: config.h env_universal_common.h wutil.h common.h -env_universal_common.o: util.h env.h fallback.h signal.h utf8.h path.h -env_universal_common.o: iothread.h -event.o: config.h signal.h fallback.h util.h wutil.h common.h function.h -event.o: event.h env.h input_common.h proc.h io.h parse_tree.h tokenizer.h -event.o: parse_constants.h parser.h -exec.o: config.h signal.h fallback.h util.h iothread.h postfork.h common.h -exec.o: proc.h io.h parse_tree.h tokenizer.h parse_constants.h wutil.h exec.h -exec.o: parser.h event.h function.h env.h builtin.h wildcard.h expand.h -exec.o: complete.h sanity.h parse_util.h autoload.h lru.h -expand.o: config.h signal.h fallback.h util.h common.h wutil.h env.h proc.h -expand.o: io.h parse_tree.h tokenizer.h parse_constants.h parser.h event.h -expand.o: function.h expand.h wildcard.h complete.h exec.h iothread.h -expand.o: parse_util.h autoload.h lru.h -fallback.o: config.h fallback.h signal.h util.h -fish.o: config.h signal.h fallback.h util.h common.h reader.h io.h complete.h -fish.o: highlight.h env.h color.h parse_constants.h builtin.h function.h -fish.o: event.h wutil.h sanity.h proc.h parse_tree.h tokenizer.h parser.h -fish.o: expand.h intern.h exec.h output.h screen.h history.h path.h input.h -fish.o: input_common.h fish_version.h -fish_indent.o: config.h wutil.h common.h util.h output.h fallback.h signal.h -fish_indent.o: screen.h highlight.h env.h color.h input.h input_common.h -fish_indent.o: parse_tree.h tokenizer.h parse_constants.h print_help.h -fish_indent.o: fish_version.h -fish_tests.o: config.h signal.h fallback.h util.h common.h proc.h io.h -fish_tests.o: parse_tree.h tokenizer.h parse_constants.h reader.h complete.h -fish_tests.o: highlight.h env.h color.h builtin.h function.h event.h -fish_tests.o: autoload.h lru.h wutil.h expand.h parser.h output.h screen.h -fish_tests.o: exec.h path.h history.h iothread.h postfork.h parse_util.h -fish_tests.o: pager.h input.h input_common.h utf8.h env_universal_common.h -fish_tests.o: wcstringutil.h -fish_version.o: fish_version.h -function.o: config.h signal.h wutil.h common.h util.h fallback.h function.h -function.o: event.h env.h proc.h io.h parse_tree.h tokenizer.h -function.o: parse_constants.h parser.h intern.h reader.h complete.h -function.o: highlight.h color.h parse_util.h autoload.h lru.h -function.o: parser_keywords.h expand.h -highlight.o: config.h signal.h fallback.h util.h wutil.h common.h highlight.h -highlight.o: env.h color.h tokenizer.h proc.h io.h parse_tree.h -highlight.o: parse_constants.h parser.h event.h function.h parse_util.h -highlight.o: autoload.h lru.h parser_keywords.h builtin.h expand.h sanity.h -highlight.o: complete.h output.h screen.h wildcard.h path.h history.h -history.o: config.h fallback.h signal.h util.h sanity.h tokenizer.h common.h -history.o: reader.h io.h complete.h highlight.h env.h color.h -history.o: parse_constants.h parse_tree.h wutil.h history.h intern.h path.h -history.o: autoload.h lru.h iothread.h -input.o: config.h signal.h fallback.h util.h wutil.h common.h reader.h io.h -input.o: complete.h highlight.h env.h color.h parse_constants.h proc.h -input.o: parse_tree.h tokenizer.h sanity.h input_common.h input.h parser.h -input.o: event.h function.h expand.h output.h screen.h intern.h -input_common.o: config.h fallback.h signal.h util.h common.h wutil.h -input_common.o: input_common.h env_universal_common.h env.h iothread.h -intern.o: config.h fallback.h signal.h util.h wutil.h common.h intern.h -io.o: config.h fallback.h signal.h util.h wutil.h common.h exec.h proc.h io.h -io.o: parse_tree.h tokenizer.h parse_constants.h -iothread.o: config.h iothread.h common.h util.h signal.h -key_reader.o: config.h common.h util.h fallback.h signal.h input_common.h -kill.o: config.h signal.h fallback.h util.h wutil.h common.h kill.h proc.h -kill.o: io.h parse_tree.h tokenizer.h parse_constants.h sanity.h env.h exec.h -kill.o: path.h -output.o: config.h signal.h fallback.h util.h wutil.h common.h expand.h -output.o: parse_constants.h output.h screen.h highlight.h env.h color.h -pager.o: config.h pager.h complete.h util.h common.h screen.h highlight.h -pager.o: env.h color.h reader.h io.h parse_constants.h input_common.h wutil.h -parse_execution.o: parse_execution.h config.h util.h parse_tree.h common.h -parse_execution.o: tokenizer.h parse_constants.h proc.h signal.h io.h -parse_execution.o: parse_util.h autoload.h lru.h complete.h wildcard.h -parse_execution.o: expand.h builtin.h parser.h event.h function.h env.h -parse_execution.o: reader.h highlight.h color.h wutil.h exec.h path.h -parse_productions.o: parse_productions.h parse_tree.h config.h util.h -parse_productions.o: common.h tokenizer.h parse_constants.h -parse_tree.o: parse_productions.h parse_tree.h config.h util.h common.h -parse_tree.o: tokenizer.h parse_constants.h fallback.h signal.h wutil.h -parse_tree.o: proc.h io.h expand.h -parse_util.o: config.h fallback.h signal.h util.h wutil.h common.h -parse_util.o: tokenizer.h parse_util.h autoload.h lru.h parse_tree.h -parse_util.o: parse_constants.h expand.h intern.h exec.h proc.h io.h env.h -parse_util.o: wildcard.h complete.h parser.h event.h function.h builtin.h -parser.o: config.h fallback.h signal.h util.h common.h wutil.h proc.h io.h -parser.o: parse_tree.h tokenizer.h parse_constants.h parser.h event.h -parser.o: function.h env.h parser_keywords.h exec.h wildcard.h expand.h -parser.o: complete.h builtin.h reader.h highlight.h color.h sanity.h intern.h -parser.o: parse_util.h autoload.h lru.h path.h parse_execution.h -parser_keywords.o: config.h fallback.h signal.h common.h util.h -parser_keywords.o: parser_keywords.h -path.o: config.h fallback.h signal.h util.h common.h env.h wutil.h path.h -path.o: expand.h parse_constants.h -postfork.o: signal.h postfork.h config.h common.h util.h proc.h io.h -postfork.o: parse_tree.h tokenizer.h parse_constants.h wutil.h iothread.h -postfork.o: exec.h -print_help.o: print_help.h -proc.o: config.h signal.h fallback.h util.h wutil.h common.h proc.h io.h -proc.o: parse_tree.h tokenizer.h parse_constants.h reader.h complete.h -proc.o: highlight.h env.h color.h sanity.h parser.h event.h function.h -proc.o: output.h screen.h -reader.o: config.h signal.h fallback.h util.h wutil.h common.h highlight.h -reader.o: env.h color.h reader.h io.h complete.h parse_constants.h proc.h -reader.o: parse_tree.h tokenizer.h parser.h event.h function.h history.h -reader.o: sanity.h exec.h expand.h kill.h input_common.h input.h output.h -reader.o: screen.h iothread.h intern.h path.h parse_util.h autoload.h lru.h -reader.o: parser_keywords.h pager.h -sanity.o: config.h signal.h fallback.h util.h common.h sanity.h proc.h io.h -sanity.o: parse_tree.h tokenizer.h parse_constants.h history.h wutil.h -sanity.o: reader.h complete.h highlight.h env.h color.h kill.h -screen.o: config.h fallback.h signal.h common.h util.h wutil.h output.h -screen.o: screen.h highlight.h env.h color.h pager.h complete.h reader.h io.h -screen.o: parse_constants.h -signal.o: config.h signal.h common.h util.h fallback.h wutil.h event.h -signal.o: reader.h io.h complete.h highlight.h env.h color.h -signal.o: parse_constants.h proc.h parse_tree.h tokenizer.h -tokenizer.o: config.h fallback.h signal.h util.h wutil.h common.h tokenizer.h -utf8.o: utf8.h -util.o: config.h fallback.h signal.h util.h common.h wutil.h -wcstringutil.o: config.h wcstringutil.h common.h util.h -wgetopt.o: config.h wgetopt.h wutil.h common.h util.h fallback.h signal.h -wildcard.o: config.h fallback.h signal.h util.h wutil.h common.h complete.h -wildcard.o: wildcard.h expand.h parse_constants.h reader.h io.h highlight.h -wildcard.o: env.h color.h exec.h proc.h parse_tree.h tokenizer.h -wutil.o: config.h fallback.h signal.h util.h common.h wutil.h +src/autoload.o: config.h src/autoload.h src/common.h src/util.h src/lru.h +src/autoload.o: src/wutil.h src/signal.h src/env.h src/exec.h src/proc.h +src/autoload.o: src/io.h src/parse_tree.h src/tokenizer.h +src/autoload.o: src/parse_constants.h +src/builtin.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h +src/builtin.o: src/common.h src/builtin.h src/io.h src/function.h src/event.h +src/builtin.o: src/env.h src/complete.h src/proc.h src/parse_tree.h +src/builtin.o: src/tokenizer.h src/parse_constants.h src/parser.h +src/builtin.o: src/reader.h src/highlight.h src/color.h src/wgetopt.h +src/builtin.o: src/sanity.h src/wildcard.h src/expand.h src/input_common.h +src/builtin.o: src/input.h src/intern.h src/exec.h src/parse_util.h +src/builtin.o: src/autoload.h src/lru.h src/parser_keywords.h src/path.h +src/builtin.o: src/history.h src/wcstringutil.h src/builtin_set.cpp +src/builtin.o: src/builtin_commandline.cpp src/builtin_complete.cpp +src/builtin.o: src/builtin_ulimit.cpp src/builtin_jobs.cpp +src/builtin.o: src/builtin_set_color.cpp src/output.h src/screen.h +src/builtin.o: src/builtin_printf.cpp +src/builtin_commandline.o: config.h src/signal.h src/fallback.h src/util.h +src/builtin_commandline.o: src/wutil.h src/common.h src/builtin.h src/io.h +src/builtin_commandline.o: src/wgetopt.h src/reader.h src/complete.h +src/builtin_commandline.o: src/highlight.h src/env.h src/color.h +src/builtin_commandline.o: src/parse_constants.h src/proc.h src/parse_tree.h +src/builtin_commandline.o: src/tokenizer.h src/parser.h src/event.h +src/builtin_commandline.o: src/function.h src/input_common.h src/input.h +src/builtin_commandline.o: src/parse_util.h src/autoload.h src/lru.h +src/builtin_complete.o: config.h src/signal.h src/fallback.h src/util.h +src/builtin_complete.o: src/wutil.h src/common.h src/builtin.h src/io.h +src/builtin_complete.o: src/complete.h src/wgetopt.h src/parser.h src/proc.h +src/builtin_complete.o: src/parse_tree.h src/tokenizer.h +src/builtin_complete.o: src/parse_constants.h src/event.h src/function.h +src/builtin_complete.o: src/env.h src/reader.h src/highlight.h src/color.h +src/builtin_jobs.o: config.h src/fallback.h src/signal.h src/util.h +src/builtin_jobs.o: src/wutil.h src/common.h src/builtin.h src/io.h +src/builtin_jobs.o: src/proc.h src/parse_tree.h src/tokenizer.h +src/builtin_jobs.o: src/parse_constants.h src/parser.h src/event.h +src/builtin_jobs.o: src/function.h src/env.h src/wgetopt.h +src/builtin_printf.o: src/common.h src/util.h +src/builtin_set.o: config.h src/signal.h src/fallback.h src/util.h +src/builtin_set.o: src/wutil.h src/common.h src/builtin.h src/io.h src/env.h +src/builtin_set.o: src/expand.h src/parse_constants.h src/wgetopt.h +src/builtin_set.o: src/proc.h src/parse_tree.h src/tokenizer.h src/parser.h +src/builtin_set.o: src/event.h src/function.h +src/builtin_set_color.o: config.h src/builtin.h src/util.h src/io.h +src/builtin_set_color.o: src/common.h src/color.h src/output.h src/fallback.h +src/builtin_set_color.o: src/signal.h src/screen.h src/highlight.h src/env.h +src/builtin_test.o: config.h src/common.h src/util.h src/builtin.h src/io.h +src/builtin_test.o: src/wutil.h src/proc.h src/signal.h src/parse_tree.h +src/builtin_test.o: src/tokenizer.h src/parse_constants.h +src/builtin_ulimit.o: config.h src/fallback.h src/signal.h src/util.h +src/builtin_ulimit.o: src/builtin.h src/io.h src/common.h src/wgetopt.h +src/color.o: src/color.h config.h src/common.h src/util.h src/fallback.h +src/color.o: src/signal.h +src/common.o: config.h src/fallback.h src/signal.h src/util.h src/wutil.h +src/common.o: src/common.h src/expand.h src/parse_constants.h src/proc.h +src/common.o: src/io.h src/parse_tree.h src/tokenizer.h src/wildcard.h +src/common.o: src/complete.h src/parser.h src/event.h src/function.h +src/common.o: src/env.h src/util.cpp src/fallback.cpp +src/complete.o: config.h src/signal.h src/fallback.h src/util.h +src/complete.o: src/tokenizer.h src/common.h src/wildcard.h src/expand.h +src/complete.o: src/parse_constants.h src/complete.h src/proc.h src/io.h +src/complete.o: src/parse_tree.h src/parser.h src/event.h src/function.h +src/complete.o: src/env.h src/builtin.h src/exec.h src/reader.h +src/complete.o: src/highlight.h src/color.h src/history.h src/wutil.h +src/complete.o: src/intern.h src/parse_util.h src/autoload.h src/lru.h +src/complete.o: src/parser_keywords.h src/path.h src/iothread.h +src/env.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h +src/env.o: src/common.h src/proc.h src/io.h src/parse_tree.h src/tokenizer.h +src/env.o: src/parse_constants.h src/env.h src/sanity.h src/expand.h +src/env.o: src/history.h src/reader.h src/complete.h src/highlight.h +src/env.o: src/color.h src/parser.h src/event.h src/function.h +src/env.o: src/env_universal_common.h src/input.h src/input_common.h +src/env.o: src/path.h src/fish_version.h +src/env_universal_common.o: config.h src/env_universal_common.h src/wutil.h +src/env_universal_common.o: src/common.h src/util.h src/env.h src/fallback.h +src/env_universal_common.o: src/signal.h src/utf8.h src/path.h src/iothread.h +src/event.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h +src/event.o: src/common.h src/function.h src/event.h src/env.h +src/event.o: src/input_common.h src/proc.h src/io.h src/parse_tree.h +src/event.o: src/tokenizer.h src/parse_constants.h src/parser.h +src/exec.o: config.h src/signal.h src/fallback.h src/util.h src/iothread.h +src/exec.o: src/postfork.h src/common.h src/proc.h src/io.h src/parse_tree.h +src/exec.o: src/tokenizer.h src/parse_constants.h src/wutil.h src/exec.h +src/exec.o: src/parser.h src/event.h src/function.h src/env.h src/builtin.h +src/exec.o: src/wildcard.h src/expand.h src/complete.h src/sanity.h +src/exec.o: src/parse_util.h src/autoload.h src/lru.h +src/expand.o: config.h src/signal.h src/fallback.h src/util.h src/common.h +src/expand.o: src/wutil.h src/env.h src/proc.h src/io.h src/parse_tree.h +src/expand.o: src/tokenizer.h src/parse_constants.h src/parser.h src/event.h +src/expand.o: src/function.h src/expand.h src/wildcard.h src/complete.h +src/expand.o: src/exec.h src/iothread.h src/parse_util.h src/autoload.h +src/expand.o: src/lru.h +src/fallback.o: config.h src/fallback.h src/signal.h src/util.h +src/fish.o: config.h src/signal.h src/fallback.h src/util.h src/common.h +src/fish.o: src/reader.h src/io.h src/complete.h src/highlight.h src/env.h +src/fish.o: src/color.h src/parse_constants.h src/builtin.h src/function.h +src/fish.o: src/event.h src/wutil.h src/sanity.h src/proc.h src/parse_tree.h +src/fish.o: src/tokenizer.h src/parser.h src/expand.h src/intern.h src/exec.h +src/fish.o: src/output.h src/screen.h src/history.h src/path.h src/input.h +src/fish.o: src/input_common.h src/fish_version.h +src/fish_indent.o: config.h src/wutil.h src/common.h src/util.h src/output.h +src/fish_indent.o: src/fallback.h src/signal.h src/screen.h src/highlight.h +src/fish_indent.o: src/env.h src/color.h src/input.h src/input_common.h +src/fish_indent.o: src/parse_tree.h src/tokenizer.h src/parse_constants.h +src/fish_indent.o: src/print_help.h src/fish_version.h +src/fish_tests.o: config.h src/signal.h src/fallback.h src/util.h +src/fish_tests.o: src/common.h src/proc.h src/io.h src/parse_tree.h +src/fish_tests.o: src/tokenizer.h src/parse_constants.h src/reader.h +src/fish_tests.o: src/complete.h src/highlight.h src/env.h src/color.h +src/fish_tests.o: src/builtin.h src/function.h src/event.h src/autoload.h +src/fish_tests.o: src/lru.h src/wutil.h src/expand.h src/parser.h +src/fish_tests.o: src/output.h src/screen.h src/exec.h src/path.h +src/fish_tests.o: src/history.h src/iothread.h src/postfork.h +src/fish_tests.o: src/parse_util.h src/pager.h src/input.h src/input_common.h +src/fish_tests.o: src/utf8.h src/env_universal_common.h src/wcstringutil.h +src/fish_version.o: src/fish_version.h +src/function.o: config.h src/signal.h src/wutil.h src/common.h src/util.h +src/function.o: src/fallback.h src/function.h src/event.h src/env.h +src/function.o: src/proc.h src/io.h src/parse_tree.h src/tokenizer.h +src/function.o: src/parse_constants.h src/parser.h src/intern.h src/reader.h +src/function.o: src/complete.h src/highlight.h src/color.h src/parse_util.h +src/function.o: src/autoload.h src/lru.h src/parser_keywords.h src/expand.h +src/highlight.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h +src/highlight.o: src/common.h src/highlight.h src/env.h src/color.h +src/highlight.o: src/tokenizer.h src/proc.h src/io.h src/parse_tree.h +src/highlight.o: src/parse_constants.h src/parser.h src/event.h +src/highlight.o: src/function.h src/parse_util.h src/autoload.h src/lru.h +src/highlight.o: src/parser_keywords.h src/builtin.h src/expand.h +src/highlight.o: src/sanity.h src/complete.h src/output.h src/screen.h +src/highlight.o: src/wildcard.h src/path.h src/history.h +src/history.o: config.h src/fallback.h src/signal.h src/util.h src/sanity.h +src/history.o: src/tokenizer.h src/common.h src/reader.h src/io.h +src/history.o: src/complete.h src/highlight.h src/env.h src/color.h +src/history.o: src/parse_constants.h src/parse_tree.h src/wutil.h +src/history.o: src/history.h src/intern.h src/path.h src/autoload.h src/lru.h +src/history.o: src/iothread.h +src/input.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h +src/input.o: src/common.h src/reader.h src/io.h src/complete.h +src/input.o: src/highlight.h src/env.h src/color.h src/parse_constants.h +src/input.o: src/proc.h src/parse_tree.h src/tokenizer.h src/sanity.h +src/input.o: src/input_common.h src/input.h src/parser.h src/event.h +src/input.o: src/function.h src/expand.h src/output.h src/screen.h +src/input.o: src/intern.h +src/input_common.o: config.h src/fallback.h src/signal.h src/util.h +src/input_common.o: src/common.h src/wutil.h src/input_common.h +src/input_common.o: src/env_universal_common.h src/env.h src/iothread.h +src/intern.o: config.h src/fallback.h src/signal.h src/util.h src/wutil.h +src/intern.o: src/common.h src/intern.h +src/io.o: config.h src/fallback.h src/signal.h src/util.h src/wutil.h +src/io.o: src/common.h src/exec.h src/proc.h src/io.h src/parse_tree.h +src/io.o: src/tokenizer.h src/parse_constants.h +src/iothread.o: config.h src/iothread.h src/common.h src/util.h src/signal.h +src/key_reader.o: config.h src/common.h src/util.h src/fallback.h +src/key_reader.o: src/signal.h src/input_common.h +src/kill.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h +src/kill.o: src/common.h src/kill.h src/proc.h src/io.h src/parse_tree.h +src/kill.o: src/tokenizer.h src/parse_constants.h src/sanity.h src/env.h +src/kill.o: src/exec.h src/path.h +src/output.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h +src/output.o: src/common.h src/expand.h src/parse_constants.h src/output.h +src/output.o: src/screen.h src/highlight.h src/env.h src/color.h +src/pager.o: config.h src/pager.h src/complete.h src/util.h src/common.h +src/pager.o: src/screen.h src/highlight.h src/env.h src/color.h src/reader.h +src/pager.o: src/io.h src/parse_constants.h src/input_common.h src/wutil.h +src/parse_execution.o: src/parse_execution.h config.h src/util.h +src/parse_execution.o: src/parse_tree.h src/common.h src/tokenizer.h +src/parse_execution.o: src/parse_constants.h src/proc.h src/signal.h src/io.h +src/parse_execution.o: src/parse_util.h src/autoload.h src/lru.h +src/parse_execution.o: src/complete.h src/wildcard.h src/expand.h +src/parse_execution.o: src/builtin.h src/parser.h src/event.h src/function.h +src/parse_execution.o: src/env.h src/reader.h src/highlight.h src/color.h +src/parse_execution.o: src/wutil.h src/exec.h src/path.h +src/parse_productions.o: src/parse_productions.h src/parse_tree.h config.h +src/parse_productions.o: src/util.h src/common.h src/tokenizer.h +src/parse_productions.o: src/parse_constants.h +src/parse_tree.o: src/parse_productions.h src/parse_tree.h config.h +src/parse_tree.o: src/util.h src/common.h src/tokenizer.h +src/parse_tree.o: src/parse_constants.h src/fallback.h src/signal.h +src/parse_tree.o: src/wutil.h src/proc.h src/io.h src/expand.h +src/parse_util.o: config.h src/fallback.h src/signal.h src/util.h src/wutil.h +src/parse_util.o: src/common.h src/tokenizer.h src/parse_util.h +src/parse_util.o: src/autoload.h src/lru.h src/parse_tree.h +src/parse_util.o: src/parse_constants.h src/expand.h src/intern.h src/exec.h +src/parse_util.o: src/proc.h src/io.h src/env.h src/wildcard.h src/complete.h +src/parse_util.o: src/parser.h src/event.h src/function.h src/builtin.h +src/parser.o: config.h src/fallback.h src/signal.h src/util.h src/common.h +src/parser.o: src/wutil.h src/proc.h src/io.h src/parse_tree.h +src/parser.o: src/tokenizer.h src/parse_constants.h src/parser.h src/event.h +src/parser.o: src/function.h src/env.h src/parser_keywords.h src/exec.h +src/parser.o: src/wildcard.h src/expand.h src/complete.h src/builtin.h +src/parser.o: src/reader.h src/highlight.h src/color.h src/sanity.h +src/parser.o: src/intern.h src/parse_util.h src/autoload.h src/lru.h +src/parser.o: src/path.h src/parse_execution.h +src/parser_keywords.o: config.h src/fallback.h src/signal.h src/common.h +src/parser_keywords.o: src/util.h src/parser_keywords.h +src/path.o: config.h src/fallback.h src/signal.h src/util.h src/common.h +src/path.o: src/env.h src/wutil.h src/path.h src/expand.h +src/path.o: src/parse_constants.h +src/postfork.o: src/signal.h src/postfork.h config.h src/common.h src/util.h +src/postfork.o: src/proc.h src/io.h src/parse_tree.h src/tokenizer.h +src/postfork.o: src/parse_constants.h src/wutil.h src/iothread.h src/exec.h +src/print_help.o: src/print_help.h +src/proc.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h +src/proc.o: src/common.h src/proc.h src/io.h src/parse_tree.h src/tokenizer.h +src/proc.o: src/parse_constants.h src/reader.h src/complete.h src/highlight.h +src/proc.o: src/env.h src/color.h src/sanity.h src/parser.h src/event.h +src/proc.o: src/function.h src/output.h src/screen.h +src/reader.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h +src/reader.o: src/common.h src/highlight.h src/env.h src/color.h src/reader.h +src/reader.o: src/io.h src/complete.h src/parse_constants.h src/proc.h +src/reader.o: src/parse_tree.h src/tokenizer.h src/parser.h src/event.h +src/reader.o: src/function.h src/history.h src/sanity.h src/exec.h +src/reader.o: src/expand.h src/kill.h src/input_common.h src/input.h +src/reader.o: src/output.h src/screen.h src/iothread.h src/intern.h +src/reader.o: src/path.h src/parse_util.h src/autoload.h src/lru.h +src/reader.o: src/parser_keywords.h src/pager.h +src/sanity.o: config.h src/signal.h src/fallback.h src/util.h src/common.h +src/sanity.o: src/sanity.h src/proc.h src/io.h src/parse_tree.h +src/sanity.o: src/tokenizer.h src/parse_constants.h src/history.h src/wutil.h +src/sanity.o: src/reader.h src/complete.h src/highlight.h src/env.h +src/sanity.o: src/color.h src/kill.h +src/screen.o: config.h src/fallback.h src/signal.h src/common.h src/util.h +src/screen.o: src/wutil.h src/output.h src/screen.h src/highlight.h src/env.h +src/screen.o: src/color.h src/pager.h src/complete.h src/reader.h src/io.h +src/screen.o: src/parse_constants.h +src/signal.o: config.h src/signal.h src/common.h src/util.h src/fallback.h +src/signal.o: src/wutil.h src/event.h src/reader.h src/io.h src/complete.h +src/signal.o: src/highlight.h src/env.h src/color.h src/parse_constants.h +src/signal.o: src/proc.h src/parse_tree.h src/tokenizer.h +src/tokenizer.o: config.h src/fallback.h src/signal.h src/util.h src/wutil.h +src/tokenizer.o: src/common.h src/tokenizer.h +src/utf8.o: src/utf8.h +src/util.o: config.h src/fallback.h src/signal.h src/util.h src/common.h +src/util.o: src/wutil.h +src/wcstringutil.o: config.h src/wcstringutil.h src/common.h src/util.h +src/wgetopt.o: config.h src/wgetopt.h src/wutil.h src/common.h src/util.h +src/wgetopt.o: src/fallback.h src/signal.h +src/wildcard.o: config.h src/fallback.h src/signal.h src/util.h src/wutil.h +src/wildcard.o: src/common.h src/complete.h src/wildcard.h src/expand.h +src/wildcard.o: src/parse_constants.h src/reader.h src/io.h src/highlight.h +src/wildcard.o: src/env.h src/color.h src/exec.h src/proc.h src/parse_tree.h +src/wildcard.o: src/tokenizer.h +src/wutil.o: config.h src/fallback.h src/signal.h src/util.h src/common.h +src/wutil.o: src/wutil.h diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj index 9fac7d80..0f9ac933 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -361,7 +361,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 4E142D731B56B5D7008783C8 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = osx/config.h; sourceTree = "<group>"; }; + 4E142D731B56B5D7008783C8 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../osx/config.h; sourceTree = "<group>"; }; D00769421990137800CA4627 /* fish_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = fish_tests; sourceTree = BUILT_PRODUCTS_DIR; }; D00F63F019137E9D00FCCDEC /* fish_version.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fish_version.cpp; sourceTree = "<group>"; }; D01A2D23169B730A00767098 /* man1 */ = {isa = PBXFileReference; lastKnownFileType = text; name = man1; path = pages_for_manpath/man1; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -675,6 +675,7 @@ D0A0856113B3ACEE0099B651 /* wutil.cpp */, ); name = Sources; + path = src; sourceTree = "<group>"; }; D0D02AAB15985C14008E62BD /* Resources */ = { diff --git a/autoload.cpp b/src/autoload.cpp index c883f8bf..c883f8bf 100644 --- a/autoload.cpp +++ b/src/autoload.cpp diff --git a/autoload.h b/src/autoload.h index b4338538..b4338538 100644 --- a/autoload.h +++ b/src/autoload.h diff --git a/builtin.cpp b/src/builtin.cpp index 59778862..59778862 100644 --- a/builtin.cpp +++ b/src/builtin.cpp diff --git a/builtin.h b/src/builtin.h index 3472995c..3472995c 100644 --- a/builtin.h +++ b/src/builtin.h diff --git a/builtin_commandline.cpp b/src/builtin_commandline.cpp index 01bc123a..01bc123a 100644 --- a/builtin_commandline.cpp +++ b/src/builtin_commandline.cpp diff --git a/builtin_complete.cpp b/src/builtin_complete.cpp index b11ad7bf..b11ad7bf 100644 --- a/builtin_complete.cpp +++ b/src/builtin_complete.cpp diff --git a/builtin_jobs.cpp b/src/builtin_jobs.cpp index 02bf94f2..02bf94f2 100644 --- a/builtin_jobs.cpp +++ b/src/builtin_jobs.cpp diff --git a/builtin_printf.cpp b/src/builtin_printf.cpp index 916166b0..916166b0 100644 --- a/builtin_printf.cpp +++ b/src/builtin_printf.cpp diff --git a/builtin_set.cpp b/src/builtin_set.cpp index b1b6b0ea..b1b6b0ea 100644 --- a/builtin_set.cpp +++ b/src/builtin_set.cpp diff --git a/builtin_set_color.cpp b/src/builtin_set_color.cpp index 36ad7080..36ad7080 100644 --- a/builtin_set_color.cpp +++ b/src/builtin_set_color.cpp diff --git a/builtin_test.cpp b/src/builtin_test.cpp index 23369628..23369628 100644 --- a/builtin_test.cpp +++ b/src/builtin_test.cpp diff --git a/builtin_ulimit.cpp b/src/builtin_ulimit.cpp index 23524543..23524543 100644 --- a/builtin_ulimit.cpp +++ b/src/builtin_ulimit.cpp diff --git a/color.cpp b/src/color.cpp index 5b19b900..5b19b900 100644 --- a/color.cpp +++ b/src/color.cpp diff --git a/common.cpp b/src/common.cpp index 473f3502..473f3502 100644 --- a/common.cpp +++ b/src/common.cpp diff --git a/complete.cpp b/src/complete.cpp index 1f3cc656..1f3cc656 100644 --- a/complete.cpp +++ b/src/complete.cpp diff --git a/complete.h b/src/complete.h index 99dcbf6a..99dcbf6a 100644 --- a/complete.h +++ b/src/complete.h diff --git a/env_universal_common.cpp b/src/env_universal_common.cpp index b493de21..b493de21 100644 --- a/env_universal_common.cpp +++ b/src/env_universal_common.cpp diff --git a/env_universal_common.h b/src/env_universal_common.h index fcf5b631..fcf5b631 100644 --- a/env_universal_common.h +++ b/src/env_universal_common.h diff --git a/event.cpp b/src/event.cpp index 14def5f4..14def5f4 100644 --- a/event.cpp +++ b/src/event.cpp diff --git a/expand.cpp b/src/expand.cpp index 1d541a24..1d541a24 100644 --- a/expand.cpp +++ b/src/expand.cpp diff --git a/fallback.cpp b/src/fallback.cpp index 44019814..44019814 100644 --- a/fallback.cpp +++ b/src/fallback.cpp diff --git a/fallback.h b/src/fallback.h index 7d3afa13..7d3afa13 100644 --- a/fallback.h +++ b/src/fallback.h diff --git a/fish_indent.cpp b/src/fish_indent.cpp index 22934e9e..22934e9e 100644 --- a/fish_indent.cpp +++ b/src/fish_indent.cpp diff --git a/fish_tests.cpp b/src/fish_tests.cpp index c0b4a9f4..c0b4a9f4 100644 --- a/fish_tests.cpp +++ b/src/fish_tests.cpp diff --git a/fish_version.cpp b/src/fish_version.cpp index e434c3c8..e434c3c8 100644 --- a/fish_version.cpp +++ b/src/fish_version.cpp diff --git a/fish_version.h b/src/fish_version.h index 61938c16..61938c16 100644 --- a/fish_version.h +++ b/src/fish_version.h diff --git a/function.cpp b/src/function.cpp index fb8dbf6a..fb8dbf6a 100644 --- a/function.cpp +++ b/src/function.cpp diff --git a/function.h b/src/function.h index ac56bd46..ac56bd46 100644 --- a/function.h +++ b/src/function.h diff --git a/highlight.cpp b/src/highlight.cpp index ef57519e..ef57519e 100644 --- a/highlight.cpp +++ b/src/highlight.cpp diff --git a/highlight.h b/src/highlight.h index d4f61e95..d4f61e95 100644 --- a/highlight.h +++ b/src/highlight.h diff --git a/history.cpp b/src/history.cpp index 9bed7b05..9bed7b05 100644 --- a/history.cpp +++ b/src/history.cpp diff --git a/history.h b/src/history.h index 4bbdf788..4bbdf788 100644 --- a/history.h +++ b/src/history.h diff --git a/input.cpp b/src/input.cpp index 4dfe80cd..4dfe80cd 100644 --- a/input.cpp +++ b/src/input.cpp diff --git a/input_common.cpp b/src/input_common.cpp index b748ca22..b748ca22 100644 --- a/input_common.cpp +++ b/src/input_common.cpp diff --git a/input_common.h b/src/input_common.h index 46430af4..46430af4 100644 --- a/input_common.h +++ b/src/input_common.h diff --git a/intern.cpp b/src/intern.cpp index 56dec21a..56dec21a 100644 --- a/intern.cpp +++ b/src/intern.cpp diff --git a/iothread.cpp b/src/iothread.cpp index 920d2aae..920d2aae 100644 --- a/iothread.cpp +++ b/src/iothread.cpp diff --git a/iothread.h b/src/iothread.h index bdec2195..bdec2195 100644 --- a/iothread.h +++ b/src/iothread.h diff --git a/key_reader.cpp b/src/key_reader.cpp index 382f4b22..382f4b22 100644 --- a/key_reader.cpp +++ b/src/key_reader.cpp diff --git a/output.cpp b/src/output.cpp index 5a0d221b..5a0d221b 100644 --- a/output.cpp +++ b/src/output.cpp diff --git a/pager.cpp b/src/pager.cpp index b2a4e4da..b2a4e4da 100644 --- a/pager.cpp +++ b/src/pager.cpp diff --git a/parse_constants.h b/src/parse_constants.h index 552085f8..552085f8 100644 --- a/parse_constants.h +++ b/src/parse_constants.h diff --git a/parse_execution.cpp b/src/parse_execution.cpp index e190ed8a..e190ed8a 100644 --- a/parse_execution.cpp +++ b/src/parse_execution.cpp diff --git a/parse_execution.h b/src/parse_execution.h index 6a3d6db7..6a3d6db7 100644 --- a/parse_execution.h +++ b/src/parse_execution.h diff --git a/parse_productions.cpp b/src/parse_productions.cpp index c1b378ec..c1b378ec 100644 --- a/parse_productions.cpp +++ b/src/parse_productions.cpp diff --git a/parse_productions.h b/src/parse_productions.h index df3ae9c9..df3ae9c9 100644 --- a/parse_productions.h +++ b/src/parse_productions.h diff --git a/parse_tree.cpp b/src/parse_tree.cpp index ed3025ed..ed3025ed 100644 --- a/parse_tree.cpp +++ b/src/parse_tree.cpp diff --git a/parse_tree.h b/src/parse_tree.h index 84114c5f..84114c5f 100644 --- a/parse_tree.h +++ b/src/parse_tree.h diff --git a/parse_util.cpp b/src/parse_util.cpp index 9aac4a6a..9aac4a6a 100644 --- a/parse_util.cpp +++ b/src/parse_util.cpp diff --git a/parse_util.h b/src/parse_util.h index 28286ed8..28286ed8 100644 --- a/parse_util.h +++ b/src/parse_util.h diff --git a/parser.cpp b/src/parser.cpp index ec8f2253..ec8f2253 100644 --- a/parser.cpp +++ b/src/parser.cpp diff --git a/parser_keywords.cpp b/src/parser_keywords.cpp index eb47f87f..eb47f87f 100644 --- a/parser_keywords.cpp +++ b/src/parser_keywords.cpp diff --git a/parser_keywords.h b/src/parser_keywords.h index 6794b294..6794b294 100644 --- a/parser_keywords.h +++ b/src/parser_keywords.h diff --git a/postfork.cpp b/src/postfork.cpp index f47c2e1e..f47c2e1e 100644 --- a/postfork.cpp +++ b/src/postfork.cpp diff --git a/postfork.h b/src/postfork.h index 439cedff..439cedff 100644 --- a/postfork.h +++ b/src/postfork.h diff --git a/print_help.cpp b/src/print_help.cpp index 06bed30c..06bed30c 100644 --- a/print_help.cpp +++ b/src/print_help.cpp diff --git a/print_help.h b/src/print_help.h index 005800b1..005800b1 100644 --- a/print_help.h +++ b/src/print_help.h diff --git a/reader.cpp b/src/reader.cpp index 5e386dc7..5e386dc7 100644 --- a/reader.cpp +++ b/src/reader.cpp diff --git a/sanity.cpp b/src/sanity.cpp index f8976941..f8976941 100644 --- a/sanity.cpp +++ b/src/sanity.cpp diff --git a/screen.cpp b/src/screen.cpp index 8eb514af..8eb514af 100644 --- a/screen.cpp +++ b/src/screen.cpp diff --git a/signal.cpp b/src/signal.cpp index 8e62f788..8e62f788 100644 --- a/signal.cpp +++ b/src/signal.cpp diff --git a/tokenizer.cpp b/src/tokenizer.cpp index c491bd0e..c491bd0e 100644 --- a/tokenizer.cpp +++ b/src/tokenizer.cpp diff --git a/tokenizer.h b/src/tokenizer.h index 954957cc..954957cc 100644 --- a/tokenizer.h +++ b/src/tokenizer.h diff --git a/wcstringutil.cpp b/src/wcstringutil.cpp index 51ec1a1c..51ec1a1c 100644 --- a/wcstringutil.cpp +++ b/src/wcstringutil.cpp diff --git a/wcstringutil.h b/src/wcstringutil.h index 73ca7ac6..73ca7ac6 100644 --- a/wcstringutil.h +++ b/src/wcstringutil.h diff --git a/wgetopt.cpp b/src/wgetopt.cpp index 2d2117f6..2d2117f6 100644 --- a/wgetopt.cpp +++ b/src/wgetopt.cpp diff --git a/wgetopt.h b/src/wgetopt.h index 5a03ba33..5a03ba33 100644 --- a/wgetopt.h +++ b/src/wgetopt.h diff --git a/wildcard.cpp b/src/wildcard.cpp index 24769e80..24769e80 100644 --- a/wildcard.cpp +++ b/src/wildcard.cpp diff --git a/wildcard.h b/src/wildcard.h index 8c542221..8c542221 100644 --- a/wildcard.h +++ b/src/wildcard.h diff --git a/wutil.cpp b/src/wutil.cpp index 2faec257..2faec257 100644 --- a/wutil.cpp +++ b/src/wutil.cpp |