Another halloc:ification of fish. Halloc has been extended to allow registering function calls, this has allowed the creation of halloc-handled arraylists, stringbuffers, etc. More job parsing halloc-ification has reduced the error handling code to only a shadow of it's former self

darcs-hash:20060209155020-ac50b-e119c5293ce2368e252cfc01b98ab7c629fdd678.gz

1 files changed, 11 insertions, 9 deletions

diff --git a/Makefile.in b/Makefile.in
index fad72da0..c57da135 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,14 +59,16 @@ INIT_DIR_INSTALL = init/fish_interactive.fish init/fish_function.fish init/fish_
 # Set to 1 if we have gettext
 HAVE_GETTEXT=@HAVE_GETTEXT@
 
+CORE_OBJS := util.o common.o halloc.o halloc_util.o 
+
 # All objects used by fish, that are compiled from an ordinary .c file
 # using an ordinary .h file.
-COMMON_OBJS := function.o builtin.o common.o complete.o env.o exec.o	\
+COMMON_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 util.o wildcard.o wgetopt.o wutil.o input.o	\
+	sanity.o tokenizer.o wildcard.o wgetopt.o wutil.o input.o	\
 	output.o intern.o env_universal.o env_universal_common.o			\
 	input_common.o event.o signal.o io.o translate.o parse_util.o		\
-	halloc.o
+	$(CORE_OBJS)
 
 # builtin_help.h exists, but builtin_help.c is autogenerated
 COMMON_OBJS_WITH_HEADER := builtin_help.o
@@ -80,21 +82,21 @@ FISH_OBJS := $(COMMON_OBJS) $(COMMON_OBJS_WITH_CODE)	\
 	$(COMMON_OBJS_WITH_HEADER) main.o
 
 # All objects that the system needs to build fish_pager
-FISH_PAGER_OBJS := fish_pager.o common.o output.o util.o wutil.o		\
+FISH_PAGER_OBJS := fish_pager.o output.o wutil.o		\
 	tokenizer.o input_common.o env_universal.o env_universal_common.o	\
-	translate.o halloc.o
+	translate.o $(CORE_OBJS)
 
 # All objects that the system needs to build fish_tests
 FISH_TESTS_OBJS := $(COMMON_OBJS) $(COMMON_OBJS_WITH_CODE)	\
 	$(COMMON_OBJS_WITH_HEADER) fish_tests.o
 
 # All objects that the system needs to build fishd
-FISHD_OBJS := fishd.o env_universal_common.o common.o util.o wutil.o	\
-	doc_src/fishd.o halloc.o
+FISHD_OBJS := fishd.o env_universal_common.o wutil.o	\
+	doc_src/fishd.o $(CORE_OBJS)
 
 # All objects needed to build mimedb
-MIME_OBJS := mimedb.o xdgmimealias.o xdgmime.o xdgmimeglob.o	\
-	xdgmimeint.o xdgmimemagic.o xdgmimeparent.o wutil.o halloc.o
+MIME_OBJS := mimedb.o xdgmimealias.o xdgmime.o xdgmimeglob.o		\
+	xdgmimeint.o xdgmimemagic.o xdgmimeparent.o wutil.o
 
 #
 # Files containing documentation for builtins. Should be listed