--- a/src/Makefile.in.in	Mon Aug 13 10:25:39 2007 +0200
+++ b/src/Makefile.in.in	Mon Aug 13 10:26:29 2007 +0200
@@ -70,6 +70,7 @@
 start_flags=@start_flags@
 LD=@ld@
 lib_gcc=@lib_gcc@
+#libmcheck=@libmcheck@
 
 #define NOT_C_CODE
 #include "config.h"
@@ -120,7 +121,7 @@
 OFFIX_O = @OFFIX_O@
 
 x_objs=balloon_help.o balloon-x.o console-x.o device-x.o event-Xt.o frame-x.o\
- glyphs-x.o objects-x.o redisplay-x.o xgccache.o xselect.o imgproc.o
+ glyphs-x.o objects-x.o redisplay-x.o xgccache.o xselect.o 
 
 #ifdef AIX4
 LIBI18N = -li18n
@@ -178,7 +179,7 @@
  event-stream.o extents.o faces.o\
  fileio.o $(LOCK_OBJ) filemode.o floatfns.o fns.o font-lock.o\
  frame.o general.o getloadavg.o glyphs.o\
- $(gui_objs) hash.o indent.o insdel.o intl.o\
+ $(gui_objs) hash.o imgproc.o indent.o insdel.o intl.o\
  keymap.o $(RTC_patch_objs) line-number.o lread.o lstream.o\
  macros.o marker.o md5.o minibuf.o objects.o opaque.o\
  print.o process.o profile.o pure.o\
@@ -194,7 +195,7 @@
 rallocobjs = ralloc.o
 #endif
 
-malloclib =
+malloclib = $(libmcheck)
 #ifndef SYSTEM_MALLOC
 # ifdef GNU_MALLOC  /* GNU malloc */
 #  ifdef ERROR_CHECK_MALLOC
@@ -289,7 +290,7 @@
 mo_file = ${mo_dir}emacs.mo
 #endif
 
-LOADPATH =  EMACSLOADPATH="${lispdir}:${blddir}"
+LOADPATH =  EMACSBOOTSTRAPLOADPATH="${lispdir}:${blddir}"
 DUMPENV = $(LOADPATH)
 
 release: temacs ${libsrc}DOC $(mo_file) ${other_files}
@@ -298,18 +299,18 @@
 #else
 #ifdef HAVE_SHM
 	-if [ -w ${srcdir}/../lisp ]; then \
-	  w=`pwd`; cd ${srcdir} && $${w}/temacs -nl -batch -l inc-vers; \
+	  w=`pwd`; cd ${srcdir} && $${w}/temacs -nl -batch -l ${srcdir}/../lisp/inc-vers; \
 	else true; fi
 	@touch SATISFIED
-	-$(DUMPENV) ./temacs -nl -batch -l loadup.el dump
+	-$(DUMPENV) ./temacs -nl -batch -l ${srcdir}/../lisp/loadup.el dump
 	@if test ! -f SATISFIED; then $(RECURSIVE_MAKE) $@; fi
 	@$(RM) SATISFIED
 #else /* ! defined (HAVE_SHM) */
 	-if [ -w ${srcdir}/../lisp ]; then \
-	  w=`pwd`; cd ${srcdir} && $${w}/temacs -batch -l inc-vers; \
+	  w=`pwd`; cd ${srcdir} && $${w}/temacs -batch -l ${srcdir}/../lisp/inc-vers; \
 	else true; fi
 	@touch SATISFIED
-	-$(DUMPENV) ./temacs -batch -l loadup.el dump
+	-$(DUMPENV) ./temacs -batch -l ${srcdir}/../lisp/loadup.el dump
 	@if test ! -f SATISFIED; then $(RECURSIVE_MAKE) $@; fi
 	@$(RM) SATISFIED
 #endif /* ! defined (HAVE_SHM) */
@@ -318,18 +319,26 @@
 
 xemacs: temacs ${libsrc}DOC $(mo_file) ${other_files} update-elc.stamp
 	@$(RM) $@ && touch SATISFIED
-	-$(DUMPENV) ./temacs -batch -l loadup.el dump
+	-$(DUMPENV) ./temacs -batch -l ${srcdir}/../lisp/loadup.el dump
 	@if test -f $@;        then if test -f SATISFIED; then \
 		./xemacs -batch -vanilla -f list-load-path-shadows; fi; \
 		$(RM) SATISFIED; exit 0; fi; \
 	if test -f SATISFIED; then $(RM) SATISFIED; exit 1; fi; \
 	$(RECURSIVE_MAKE) $@;
 
+fastdump: temacs 
+	@$(RM) xemacs && touch SATISFIED
+	-$(DUMPENV) ./temacs -batch -l loadup.el dump
+	@if test -f xemacs;        then if test -f SATISFIED; then \
+		./xemacs -batch -vanilla -f list-load-path-shadows; fi; \
+		$(RM) SATISFIED; exit 0; fi; \
+	if test -f SATISFIED; then $(RM) SATISFIED; exit 1; fi;
+
 FRC.update-elc.stamp :
 
 update-elc.stamp : temacs FRC.update-elc.stamp
 	@touch NOBYTECOMPILE
-	${DUMPENV} ./temacs -batch -l update-elc.el
+	${DUMPENV} ./temacs -batch -l ${srcdir}/../lisp/update-elc.el
 	@if test ! -f $@ -o -f NOBYTECOMPILE; then touch $@; fi; \
 	 $(RM) NOBYTECOMPILE
 
@@ -350,14 +359,14 @@
 
 ${libsrc}DOC: temacs update-elc.stamp
 	$(RM) ${libsrc}DOC; \
-	${DUMPENV} ./temacs -batch -l make-docfile.el -- \
+	${DUMPENV} ./temacs -batch -l ${srcdir}/../lisp/make-docfile.el -- \
 		-o ${libsrc}DOC -d ${srcdir} -i ${libsrc}../site-packages \
 		${obj_src} ${mallocdocsrc} ${rallocdocsrc}
 
 dump_elcs: dump-elcs
 
 dump-elcs: temacs
-	-${DUMPENV} ./temacs -batch -l update-elc.el
+	-${DUMPENV} ./temacs -batch -l ${srcdir}/../lisp/update-elc.el
 
 all-elc all-elcs:
 	cd .. && $(RECURSIVE_MAKE) all-elc
@@ -418,7 +427,7 @@
 .PHONY : run-temacs
 
 run-temacs: temacs
-	./temacs -batch -l loadup.el run-temacs
+	./temacs -batch -l ${srcdir}/../lisp/loadup.el run-temacs
 
 ## Debugging targets:
 ##
@@ -448,7 +457,7 @@
 	ignore POLL; \
 	check -access; \
 	suppress rui; \
-	runargs -batch -l loadup.el run-temacs -q; \
+	runargs -batch -l ${srcdir}/../lisp/loadup.el run-temacs -q; \
 	run' rtcmacs
 
 ## Purify
@@ -459,7 +468,7 @@
 	$(PURIFY_PROG) $(PURIFY_FLAGS) $(LD) $(temacs_link_args) -lpthread
 
 run-puremacs: puremacs
-	./puremacs -batch -l loadup.el run-temacs
+	./puremacs -batch -l ${srcdir}/../lisp/loadup.el run-temacs
 
 ## Quantify
 #ifdef  QUANTIFY
@@ -1964,6 +1973,29 @@
 glyphs.o: specifier.h
 glyphs.o: toolbar.h
 glyphs.o: window.h
+glyphs-msw.o: bitmaps.h
+glyphs-msw.o: blocktype.h
+glyphs-msw.o: buffer.h
+glyphs-msw.o: bufslots.h
+glyphs-msw.o: config.h
+glyphs-msw.o: conslots.h
+glyphs-msw.o: console-msw.h
+glyphs-msw.o: console.h
+glyphs-msw.o: device.h
+glyphs-msw.o: dynarr.h
+glyphs-msw.o: frame.h
+glyphs-msw.o: frameslots.h
+glyphs-msw.o: glyphs-msw.h
+glyphs-msw.o: glyphs.h
+glyphs-msw.o: insdel.h
+glyphs-msw.o: objects-msw.h
+glyphs-msw.o: objects.h
+glyphs-msw.o: opaque.h
+glyphs-msw.o: scrollbar.h
+glyphs-msw.o: specifier.h
+glyphs-msw.o: sysfile.h
+glyphs-msw.o: toolbar.h
+glyphs-msw.o: imgproc.h
 gmalloc.o: config.h
 gmalloc.o: getpagesize.h
 gui-x.o: $(LWLIB_SRCDIR)/lwlib.h