X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.in.in;h=8a02b11485a182541df7dcc99bba77e5f4fa8bbe;hb=f8b0dcc32dce11bef09e2fbcde040aecd1f86fd1;hp=47d726c6d28c12a1829a56bffdc5692b74522d57;hpb=976b002b16336930724ae22476014583ad022e7d;p=chise%2Fxemacs-chise.git-

diff --git a/src/Makefile.in.in b/src/Makefile.in.in
index 47d726c..8a02b11 100644
--- a/src/Makefile.in.in
+++ b/src/Makefile.in.in
@@ -117,7 +117,7 @@ $(lwlib_libs) :
 	cd ../lwlib && $(RECURSIVE_MAKE)
 
 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 
+ glyphs-x.o objects-x.o redisplay-x.o select-x.o xgccache.o  
 
 #ifdef AIX4
 LIBI18N = -li18n
@@ -176,12 +176,12 @@ objs=\
  event-stream.o extents.o faces.o\
  fileio.o $(LOCK_OBJ) filemode.o floatfns.o fns.o font-lock.o\
  frame.o general.o glyphs.o glyphs-eimage.o glyphs-widget.o\
- gui.o $(gui_objs) hash.o imgproc.o indent.o insdel.o intl.o\
+ gui.o gutter.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\
  rangetab.o redisplay.o redisplay-output.o regex.o\
- search.o $(sheap_obj) signal.o sound.o\
+ search.o select.o $(sheap_obj) signal.o sound.o\
  specifier.o strftime.o symbols.o syntax.o sysdep.o\
  undo.o $(x_objs) widget.o window.o
 
@@ -340,10 +340,21 @@ release: temacs ${libsrc}DOC $(mo_file) ${other_files}
 #endif /* ! defined (CANNOT_DUMP) */
 
 ${PROGNAME}: temacs ${libsrc}DOC $(mo_file) ${other_files} update-elc.stamp
+#ifdef HEAP_IN_DATA
+	@$(RM) $@ $@.exe && touch SATISFIED
+	-${dump_temacs}
+	@if test -f $@;        then if test -f SATISFIED; then \
+		echo "Testing for Lisp shadows ..."; \
+		./${PROGNAME} -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) $@;
+#else
 	@$(RM) $@
 	-${dump_temacs}
 	@echo "Testing for Lisp shadows ..."
 	@./${PROGNAME} -batch -vanilla -f list-load-path-shadows
+#endif
 
 fastdump: temacs 
 	@$(RM) ${PROGNAME} && touch SATISFIED